mirror of
https://github.com/MariaDB/server.git
synced 2025-10-27 05:56:07 +03:00
- WL#3158: IM: Instance configuration extensions;
- WL#3159: IM: --bootstrap and --start-default-instance modes
The following new statements have been added:
- CREATE INSTANCE;
- DROP INSTANCE;
The behaviour of the following statements have been changed:
- SET;
- UNSET;
- FLUSH INSTANCES;
- SHOW INSTANCES;
- SHOW INSTANCE OPTIONS;
BitKeeper/deleted/.del-im_options_set.imtest~b53d9d60e5684833:
Delete: mysql-test/t/im_options_set.imtest
BitKeeper/deleted/.del-im_options_set.result~59278f56be61d921:
Delete: mysql-test/r/im_options_set.result
BitKeeper/deleted/.del-im_options_unset.imtest~768eb186b51d0048:
Delete: mysql-test/t/im_options_unset.imtest
BitKeeper/deleted/.del-im_options_unset.result~20a4790cd3c70a4f:
Delete: mysql-test/r/im_options_unset.result
client/get_password.c:
Change prototype to avoid casting when using C-strings (char *).
include/m_string.h:
Moved LEX_STRING to global header from sql/ to be accessible
from all components (IM for one).
include/my_sys.h:
Added constants for modify_defaults_file().
include/mysql_com.h:
Removed duplicated declarations. my_sys.h should be used instead.
libmysql/get_password.c:
Change prototype to avoid casting when using C-strings (char *).
mysql-test/mysql-test-run.pl:
Added environment variables to be used from tests.
mysql-test/r/im_daemon_life_cycle.result:
Column name has been changed in SHOW INSTANCES.
mysql-test/r/im_life_cycle.result:
1. Column name has been changed in SHOW INSTANCES.
2. Removed redundant SHOW INSTANCE STATUS statements.
mysql-test/r/im_utils.result:
Updated the result file.
mysql-test/t/im_daemon_life_cycle-im.opt:
Set minimal monitoring interval for Instance Manager to speed up testing.
mysql-test/t/im_daemon_life_cycle.imtest:
Get Instance Manager and managed mysqld-instances enough time to start.
mysql-test/t/im_life_cycle.imtest:
1. Polishing;
2. Fixed a test error in 1.1.2.
mysql-test/t/im_utils.imtest:
Get Instance Manager and managed mysqld-instances enough time to start.
mysys/default.c:
Pass the name of the section to the handler function as well.
mysys/default_modify.c:
Added REMOVE_SECTION functionality.
server-tools/instance-manager/IMService.cpp:
Polishing: be more verbose.
server-tools/instance-manager/IMService.h:
Polishing: added copyright.
server-tools/instance-manager/Makefile.am:
Added new files.
server-tools/instance-manager/WindowsService.cpp:
Polishing: according to The Coding Style, TRUE/FALSE must be
used instead of true/false.
server-tools/instance-manager/WindowsService.h:
Polishing: added copyright.
server-tools/instance-manager/command.h:
Polishing: provide a comment for the main operation of "Command" class.
server-tools/instance-manager/commands.cc:
1. Added support for CREATE INSTANCE, DROP INSTANCE statements;
2. Added "deprecated" column in output of SHOW INSTANCE OPTIONS;
3. Modified the behaviour of SET/UNSET, FLUSH INSTANCES statements;
server-tools/instance-manager/commands.h:
1. Added support for CREATE INSTANCE, DROP INSTANCE statements;
2. Added "deprecated" column in output of SHOW INSTANCE OPTIONS;
3. Modified the behaviour of SET/UNSET, FLUSH INSTANCES statements;
server-tools/instance-manager/guardian.cc:
Added operations to retrieve state of managed instances.
server-tools/instance-manager/guardian.h:
Added operations to retrieve state of managed instances.
server-tools/instance-manager/instance.cc:
1. Provided an operation to check validity of instance name.
2. Added an attribute to distiguish mysqld-instances,
whose configuration should be kept backward-compatible.
server-tools/instance-manager/instance.h:
1. Provided an operation to check validity of instance name.
2. Added an attribute to distiguish mysqld-instances,
whose configuration should be kept backward-compatible.
server-tools/instance-manager/instance_map.cc:
1. Used the operation to check validity of instance name;
2. Added operations to manage instances.
server-tools/instance-manager/instance_map.h:
Added operations to manage instances.
server-tools/instance-manager/instance_options.cc:
Changed Instance_options so that it will be possible to manage
options on the fly.
server-tools/instance-manager/instance_options.h:
Changed Instance_options so that it will be possible to manage
options on the fly.
server-tools/instance-manager/listener.cc:
1. Remove reference to the instance of Options;
2. Use new Options naming scheme.
server-tools/instance-manager/listener.h:
Remove reference to the instance of Options;
server-tools/instance-manager/log.cc:
Polishing: use TRUE/FALSE instead of true/false.
server-tools/instance-manager/manager.cc:
Added a common for IM operation to work with configuration file.
server-tools/instance-manager/manager.h:
Added a common for IM operation to work with configuration file.
server-tools/instance-manager/messages.cc:
Added messages for new errors.
server-tools/instance-manager/mysql_connection.cc:
1. Move a constant to common place.
2. Polishing.
server-tools/instance-manager/mysql_manager_error.h:
Added new errors.
server-tools/instance-manager/mysqlmanager.cc:
1. Use error code from Options::load();
2. Eliminate type-casting warning on Windows.
server-tools/instance-manager/options.cc:
Added support for user-management command-line options.
server-tools/instance-manager/options.h:
Added support for user-management command-line options.
server-tools/instance-manager/parse.cc:
1. Added support of new statements:
- CREATE INSTANCE;
- DROP INSTANCE.
2. Modified SET/UNSET.
server-tools/instance-manager/parse.h:
1. Added support of new statements:
- CREATE INSTANCE;
- DROP INSTANCE.
2. Modified SET/UNSET.
server-tools/instance-manager/parse_output.cc:
Sorted out header files.
server-tools/instance-manager/parse_output.h:
Sorted out header files.
server-tools/instance-manager/portability.h:
1. Added constants for Windows.
2. Moved system-dependent defines from instance_options.cc.
server-tools/instance-manager/priv.cc:
Updated version.
server-tools/instance-manager/priv.h:
Added some global constants.
server-tools/instance-manager/protocol.cc:
Replaced NAME_WITH_LENGTH by LEX_STRING.
server-tools/instance-manager/protocol.h:
Replaced NAME_WITH_LENGTH by LEX_STRING.
server-tools/instance-manager/thread_registry.cc:
Polishing: use TRUE/FALSE instead of true/false.
server-tools/instance-manager/user_map.cc:
Added support for managing password database.
server-tools/instance-manager/user_map.h:
Added support for managing password database.
sql/sp.cc:
Replaced LEX_STRING_WITH_INIT by LEX_STRING + struct initialization.
sql/sp_head.cc:
Replaced LEX_STRING_WITH_INIT by LEX_STRING + struct initialization.
sql/spatial.cc:
Removed LEX_STRING_WITH_INIT.
sql/spatial.h:
Removed LEX_STRING_WITH_INIT.
sql/sql_string.h:
Moved STRING_WITH_LEN() macro out from sql (to m_string.h).
sql/sql_trigger.cc:
Moved STRING_WITH_LEN() macro out from sql (to m_string.h).
sql/structs.h:
Removed LEX_STRING_WITH_INIT.
support-files/mysql.server.sh:
Instruct Instance Manager to work in mysqld-safe compatible mode
for backward compatibility.
mysql-test/r/im_cmd_line.result:
Added result file.
mysql-test/r/im_instance_conf.result:
Added result file.
mysql-test/r/im_options.result:
Added result file.
mysql-test/t/im_cmd_line.imtest:
IM command-line options test.
mysql-test/t/im_instance_conf-im.opt:
Set minimal monitoring interval for Instance Manager to speed up testing.
mysql-test/t/im_instance_conf.imtest:
Added a new test case for checking instance-management.
mysql-test/t/im_life_cycle-im.opt:
Set minimal monitoring interval for Instance Manager to speed up testing.
mysql-test/t/im_options.imtest:
Join im_options_set and im_options_unset and add new tests.
mysql-test/t/im_utils-im.opt:
Set minimal monitoring interval for Instance Manager to speed up testing.
server-tools/instance-manager/exit_codes.h:
New file for defining exit codes for user-management mode.
server-tools/instance-manager/user_management_commands.cc:
User-management commands implementation.
server-tools/instance-manager/user_management_commands.h:
User-management command declarations.
509 lines
15 KiB
C++
509 lines
15 KiB
C++
/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
|
|
|
|
#ifndef _spatial_h
|
|
#define _spatial_h
|
|
|
|
#ifdef HAVE_SPATIAL
|
|
|
|
const uint SRID_SIZE= 4;
|
|
const uint SIZEOF_STORED_DOUBLE= 8;
|
|
const uint POINT_DATA_SIZE= SIZEOF_STORED_DOUBLE*2;
|
|
const uint WKB_HEADER_SIZE= 1+4;
|
|
const uint32 GET_SIZE_ERROR= ((uint32) -1);
|
|
|
|
struct st_point_2d
|
|
{
|
|
double x;
|
|
double y;
|
|
};
|
|
|
|
struct st_linear_ring
|
|
{
|
|
uint32 n_points;
|
|
st_point_2d points;
|
|
};
|
|
|
|
/***************************** MBR *******************************/
|
|
|
|
|
|
/*
|
|
It's ok that a lot of the functions are inline as these are only used once
|
|
in MySQL
|
|
*/
|
|
|
|
struct MBR
|
|
{
|
|
double xmin, ymin, xmax, ymax;
|
|
|
|
MBR()
|
|
{
|
|
xmin= ymin= DBL_MAX;
|
|
xmax= ymax= -DBL_MAX;
|
|
}
|
|
|
|
MBR(const double xmin_arg, const double ymin_arg,
|
|
const double xmax_arg, const double ymax_arg)
|
|
:xmin(xmin_arg), ymin(ymin_arg), xmax(xmax_arg), ymax(ymax_arg)
|
|
{}
|
|
|
|
MBR(const st_point_2d &min, const st_point_2d &max)
|
|
:xmin(min.x), ymin(min.y), xmax(max.x), ymax(max.y)
|
|
{}
|
|
|
|
inline void add_xy(double x, double y)
|
|
{
|
|
/* Not using "else" for proper one point MBR calculation */
|
|
if (x < xmin)
|
|
xmin= x;
|
|
if (x > xmax)
|
|
xmax= x;
|
|
if (y < ymin)
|
|
ymin= y;
|
|
if (y > ymax)
|
|
ymax= y;
|
|
}
|
|
void add_xy(const char *px, const char *py)
|
|
{
|
|
double x, y;
|
|
float8get(x, px);
|
|
float8get(y, py);
|
|
add_xy(x,y);
|
|
}
|
|
void add_mbr(const MBR *mbr)
|
|
{
|
|
if (mbr->xmin < xmin)
|
|
xmin= mbr->xmin;
|
|
if (mbr->xmax > xmax)
|
|
xmax= mbr->xmax;
|
|
if (mbr->ymin < ymin)
|
|
ymin= mbr->ymin;
|
|
if (mbr->ymax > ymax)
|
|
ymax= mbr->ymax;
|
|
}
|
|
|
|
int equals(const MBR *mbr)
|
|
{
|
|
/* The following should be safe, even if we compare doubles */
|
|
return ((mbr->xmin == xmin) && (mbr->ymin == ymin) &&
|
|
(mbr->xmax == xmax) && (mbr->ymax == ymax));
|
|
}
|
|
|
|
int disjoint(const MBR *mbr)
|
|
{
|
|
/* The following should be safe, even if we compare doubles */
|
|
return ((mbr->xmin > xmax) || (mbr->ymin > ymax) ||
|
|
(mbr->xmax < xmin) || (mbr->ymax < ymin));
|
|
}
|
|
|
|
int intersects(const MBR *mbr)
|
|
{
|
|
return !disjoint(mbr);
|
|
}
|
|
|
|
int touches(const MBR *mbr)
|
|
{
|
|
/* The following should be safe, even if we compare doubles */
|
|
return ((((mbr->xmin == xmax) || (mbr->xmax == xmin)) &&
|
|
((mbr->ymin >= ymin) && (mbr->ymin <= ymax) ||
|
|
(mbr->ymax >= ymin) && (mbr->ymax <= ymax))) ||
|
|
(((mbr->ymin == ymax) || (mbr->ymax == ymin)) &&
|
|
((mbr->xmin >= xmin) && (mbr->xmin <= xmax) ||
|
|
(mbr->xmax >= xmin) && (mbr->xmax <= xmax))));
|
|
}
|
|
|
|
int within(const MBR *mbr)
|
|
{
|
|
/* The following should be safe, even if we compare doubles */
|
|
return ((mbr->xmin <= xmin) && (mbr->ymin <= ymin) &&
|
|
(mbr->xmax >= xmax) && (mbr->ymax >= ymax));
|
|
}
|
|
|
|
int contains(const MBR *mbr)
|
|
{
|
|
/* The following should be safe, even if we compare doubles */
|
|
return ((mbr->xmin >= xmin) && (mbr->ymin >= ymin) &&
|
|
(mbr->xmax <= xmax) && (mbr->ymax <= ymax));
|
|
}
|
|
|
|
bool inner_point(double x, double y) const
|
|
{
|
|
/* The following should be safe, even if we compare doubles */
|
|
return (xmin<x) && (xmax>x) && (ymin<y) && (ymax>y);
|
|
}
|
|
|
|
int overlaps(const MBR *mbr)
|
|
{
|
|
int lb= mbr->inner_point(xmin, ymin);
|
|
int rb= mbr->inner_point(xmax, ymin);
|
|
int rt= mbr->inner_point(xmax, ymax);
|
|
int lt= mbr->inner_point(xmin, ymax);
|
|
|
|
int a = lb+rb+rt+lt;
|
|
return (a>0) && (a<4) && (!within(mbr));
|
|
}
|
|
};
|
|
|
|
|
|
/***************************** Geometry *******************************/
|
|
|
|
struct Geometry_buffer;
|
|
|
|
class Geometry
|
|
{
|
|
public:
|
|
Geometry() {} /* Remove gcc warning */
|
|
virtual ~Geometry() {} /* Remove gcc warning */
|
|
static void *operator new(size_t size, void *buffer)
|
|
{
|
|
return buffer;
|
|
}
|
|
|
|
static void operator delete(void *ptr, void *buffer)
|
|
{}
|
|
|
|
static void operator delete(void *buffer)
|
|
{}
|
|
|
|
static String bad_geometry_data;
|
|
|
|
enum wkbType
|
|
{
|
|
wkb_point= 1,
|
|
wkb_linestring= 2,
|
|
wkb_polygon= 3,
|
|
wkb_multipoint= 4,
|
|
wkb_multilinestring= 5,
|
|
wkb_multipolygon= 6,
|
|
wkb_geometrycollection= 7,
|
|
wkb_end=7
|
|
};
|
|
enum wkbByteOrder
|
|
{
|
|
wkb_xdr= 0, /* Big Endian */
|
|
wkb_ndr= 1 /* Little Endian */
|
|
};
|
|
|
|
class Class_info
|
|
{
|
|
public:
|
|
LEX_STRING m_name;
|
|
int m_type_id;
|
|
void (*m_create_func)(void *);
|
|
Class_info(const char *name, int type_id, void(*create_func)(void *));
|
|
};
|
|
|
|
virtual const Class_info *get_class_info() const=0;
|
|
virtual uint32 get_data_size() const=0;
|
|
virtual bool init_from_wkt(Gis_read_stream *trs, String *wkb)=0;
|
|
|
|
/* returns the length of the wkb that was read */
|
|
virtual uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo,
|
|
String *res)=0;
|
|
virtual bool get_data_as_wkt(String *txt, const char **end) const=0;
|
|
virtual bool get_mbr(MBR *mbr, const char **end) const=0;
|
|
virtual bool dimension(uint32 *dim, const char **end) const=0;
|
|
virtual int get_x(double *x) const { return -1; }
|
|
virtual int get_y(double *y) const { return -1; }
|
|
virtual int length(double *len) const { return -1; }
|
|
virtual int area(double *ar, const char **end) const { return -1;}
|
|
virtual int is_closed(int *closed) const { return -1; }
|
|
virtual int num_interior_ring(uint32 *n_int_rings) const { return -1; }
|
|
virtual int num_points(uint32 *n_points) const { return -1; }
|
|
virtual int num_geometries(uint32 *num) const { return -1; }
|
|
virtual int start_point(String *point) const { return -1; }
|
|
virtual int end_point(String *point) const { return -1; }
|
|
virtual int exterior_ring(String *ring) const { return -1; }
|
|
virtual int centroid(String *point) const { return -1; }
|
|
virtual int point_n(uint32 num, String *result) const { return -1; }
|
|
virtual int interior_ring_n(uint32 num, String *result) const { return -1; }
|
|
virtual int geometry_n(uint32 num, String *result) const { return -1; }
|
|
|
|
public:
|
|
static Geometry *create_by_typeid(Geometry_buffer *buffer, int type_id)
|
|
{
|
|
Class_info *ci;
|
|
if (!(ci= find_class((int) type_id)))
|
|
return NULL;
|
|
(*ci->m_create_func)((void *)buffer);
|
|
return my_reinterpret_cast(Geometry *)(buffer);
|
|
}
|
|
|
|
static Geometry *construct(Geometry_buffer *buffer,
|
|
const char *data, uint32 data_len);
|
|
static Geometry *create_from_wkt(Geometry_buffer *buffer,
|
|
Gis_read_stream *trs, String *wkt,
|
|
bool init_stream=1);
|
|
static int create_from_wkb(Geometry_buffer *buffer,
|
|
const char *wkb, uint32 len, String *res);
|
|
int as_wkt(String *wkt, const char **end)
|
|
{
|
|
uint32 len= get_class_info()->m_name.length;
|
|
if (wkt->reserve(len + 2, 512))
|
|
return 1;
|
|
wkt->qs_append(get_class_info()->m_name.str, len);
|
|
wkt->qs_append('(');
|
|
if (get_data_as_wkt(wkt, end))
|
|
return 1;
|
|
wkt->qs_append(')');
|
|
return 0;
|
|
}
|
|
|
|
inline void set_data_ptr(const char *data, uint32 data_len)
|
|
{
|
|
m_data= data;
|
|
m_data_end= data + data_len;
|
|
}
|
|
|
|
inline void shift_wkb_header()
|
|
{
|
|
m_data+= WKB_HEADER_SIZE;
|
|
}
|
|
|
|
bool envelope(String *result) const;
|
|
static Class_info *ci_collection[wkb_end+1];
|
|
|
|
protected:
|
|
static Class_info *find_class(int type_id)
|
|
{
|
|
return ((type_id < wkb_point) || (type_id > wkb_end)) ?
|
|
NULL : ci_collection[type_id];
|
|
}
|
|
static Class_info *find_class(const char *name, uint32 len);
|
|
const char *append_points(String *txt, uint32 n_points,
|
|
const char *data, uint32 offset) const;
|
|
bool create_point(String *result, const char *data) const;
|
|
bool create_point(String *result, double x, double y) const;
|
|
const char *get_mbr_for_points(MBR *mbr, const char *data, uint offset)
|
|
const;
|
|
|
|
inline bool no_data(const char *cur_data, uint32 data_amount) const
|
|
{
|
|
return (cur_data + data_amount > m_data_end);
|
|
}
|
|
const char *m_data;
|
|
const char *m_data_end;
|
|
};
|
|
|
|
|
|
/***************************** Point *******************************/
|
|
|
|
class Gis_point: public Geometry
|
|
{
|
|
public:
|
|
Gis_point() {} /* Remove gcc warning */
|
|
virtual ~Gis_point() {} /* Remove gcc warning */
|
|
uint32 get_data_size() const;
|
|
bool init_from_wkt(Gis_read_stream *trs, String *wkb);
|
|
uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res);
|
|
bool get_data_as_wkt(String *txt, const char **end) const;
|
|
bool get_mbr(MBR *mbr, const char **end) const;
|
|
|
|
int get_xy(double *x, double *y) const
|
|
{
|
|
const char *data= m_data;
|
|
if (no_data(data, SIZEOF_STORED_DOUBLE * 2))
|
|
return 1;
|
|
float8get(*x, data);
|
|
float8get(*y, data + SIZEOF_STORED_DOUBLE);
|
|
return 0;
|
|
}
|
|
|
|
int get_x(double *x) const
|
|
{
|
|
if (no_data(m_data, SIZEOF_STORED_DOUBLE))
|
|
return 1;
|
|
float8get(*x, m_data);
|
|
return 0;
|
|
}
|
|
|
|
int get_y(double *y) const
|
|
{
|
|
const char *data= m_data;
|
|
if (no_data(data, SIZEOF_STORED_DOUBLE * 2)) return 1;
|
|
float8get(*y, data + SIZEOF_STORED_DOUBLE);
|
|
return 0;
|
|
}
|
|
|
|
bool dimension(uint32 *dim, const char **end) const
|
|
{
|
|
*dim= 0;
|
|
*end= 0; /* No default end */
|
|
return 0;
|
|
}
|
|
const Class_info *get_class_info() const;
|
|
};
|
|
|
|
|
|
/***************************** LineString *******************************/
|
|
|
|
class Gis_line_string: public Geometry
|
|
{
|
|
public:
|
|
Gis_line_string() {} /* Remove gcc warning */
|
|
virtual ~Gis_line_string() {} /* Remove gcc warning */
|
|
uint32 get_data_size() const;
|
|
bool init_from_wkt(Gis_read_stream *trs, String *wkb);
|
|
uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res);
|
|
bool get_data_as_wkt(String *txt, const char **end) const;
|
|
bool get_mbr(MBR *mbr, const char **end) const;
|
|
int length(double *len) const;
|
|
int is_closed(int *closed) const;
|
|
int num_points(uint32 *n_points) const;
|
|
int start_point(String *point) const;
|
|
int end_point(String *point) const;
|
|
int point_n(uint32 n, String *result) const;
|
|
bool dimension(uint32 *dim, const char **end) const
|
|
{
|
|
*dim= 1;
|
|
*end= 0; /* No default end */
|
|
return 0;
|
|
}
|
|
const Class_info *get_class_info() const;
|
|
};
|
|
|
|
|
|
/***************************** Polygon *******************************/
|
|
|
|
class Gis_polygon: public Geometry
|
|
{
|
|
public:
|
|
Gis_polygon() {} /* Remove gcc warning */
|
|
virtual ~Gis_polygon() {} /* Remove gcc warning */
|
|
uint32 get_data_size() const;
|
|
bool init_from_wkt(Gis_read_stream *trs, String *wkb);
|
|
uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res);
|
|
bool get_data_as_wkt(String *txt, const char **end) const;
|
|
bool get_mbr(MBR *mbr, const char **end) const;
|
|
int area(double *ar, const char **end) const;
|
|
int exterior_ring(String *result) const;
|
|
int num_interior_ring(uint32 *n_int_rings) const;
|
|
int interior_ring_n(uint32 num, String *result) const;
|
|
int centroid_xy(double *x, double *y) const;
|
|
int centroid(String *result) const;
|
|
bool dimension(uint32 *dim, const char **end) const
|
|
{
|
|
*dim= 2;
|
|
*end= 0; /* No default end */
|
|
return 0;
|
|
}
|
|
const Class_info *get_class_info() const;
|
|
};
|
|
|
|
|
|
/***************************** MultiPoint *******************************/
|
|
|
|
class Gis_multi_point: public Geometry
|
|
{
|
|
public:
|
|
Gis_multi_point() {} /* Remove gcc warning */
|
|
virtual ~Gis_multi_point() {} /* Remove gcc warning */
|
|
uint32 get_data_size() const;
|
|
bool init_from_wkt(Gis_read_stream *trs, String *wkb);
|
|
uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res);
|
|
bool get_data_as_wkt(String *txt, const char **end) const;
|
|
bool get_mbr(MBR *mbr, const char **end) const;
|
|
int num_geometries(uint32 *num) const;
|
|
int geometry_n(uint32 num, String *result) const;
|
|
bool dimension(uint32 *dim, const char **end) const
|
|
{
|
|
*dim= 0;
|
|
*end= 0; /* No default end */
|
|
return 0;
|
|
}
|
|
const Class_info *get_class_info() const;
|
|
};
|
|
|
|
|
|
/***************************** MultiLineString *******************************/
|
|
|
|
class Gis_multi_line_string: public Geometry
|
|
{
|
|
public:
|
|
Gis_multi_line_string() {} /* Remove gcc warning */
|
|
virtual ~Gis_multi_line_string() {} /* Remove gcc warning */
|
|
uint32 get_data_size() const;
|
|
bool init_from_wkt(Gis_read_stream *trs, String *wkb);
|
|
uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res);
|
|
bool get_data_as_wkt(String *txt, const char **end) const;
|
|
bool get_mbr(MBR *mbr, const char **end) const;
|
|
int num_geometries(uint32 *num) const;
|
|
int geometry_n(uint32 num, String *result) const;
|
|
int length(double *len) const;
|
|
int is_closed(int *closed) const;
|
|
bool dimension(uint32 *dim, const char **end) const
|
|
{
|
|
*dim= 1;
|
|
*end= 0; /* No default end */
|
|
return 0;
|
|
}
|
|
const Class_info *get_class_info() const;
|
|
};
|
|
|
|
|
|
/***************************** MultiPolygon *******************************/
|
|
|
|
class Gis_multi_polygon: public Geometry
|
|
{
|
|
public:
|
|
Gis_multi_polygon() {} /* Remove gcc warning */
|
|
virtual ~Gis_multi_polygon() {} /* Remove gcc warning */
|
|
uint32 get_data_size() const;
|
|
bool init_from_wkt(Gis_read_stream *trs, String *wkb);
|
|
uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res);
|
|
bool get_data_as_wkt(String *txt, const char **end) const;
|
|
bool get_mbr(MBR *mbr, const char **end) const;
|
|
int num_geometries(uint32 *num) const;
|
|
int geometry_n(uint32 num, String *result) const;
|
|
int area(double *ar, const char **end) const;
|
|
int centroid(String *result) const;
|
|
bool dimension(uint32 *dim, const char **end) const
|
|
{
|
|
*dim= 2;
|
|
*end= 0; /* No default end */
|
|
return 0;
|
|
}
|
|
const Class_info *get_class_info() const;
|
|
};
|
|
|
|
|
|
/*********************** GeometryCollection *******************************/
|
|
|
|
class Gis_geometry_collection: public Geometry
|
|
{
|
|
public:
|
|
Gis_geometry_collection() {} /* Remove gcc warning */
|
|
virtual ~Gis_geometry_collection() {} /* Remove gcc warning */
|
|
uint32 get_data_size() const;
|
|
bool init_from_wkt(Gis_read_stream *trs, String *wkb);
|
|
uint init_from_wkb(const char *wkb, uint len, wkbByteOrder bo, String *res);
|
|
bool get_data_as_wkt(String *txt, const char **end) const;
|
|
bool get_mbr(MBR *mbr, const char **end) const;
|
|
int num_geometries(uint32 *num) const;
|
|
int geometry_n(uint32 num, String *result) const;
|
|
bool dimension(uint32 *dim, const char **end) const;
|
|
const Class_info *get_class_info() const;
|
|
};
|
|
|
|
const int geometry_buffer_size= sizeof(Gis_point);
|
|
struct Geometry_buffer
|
|
{
|
|
void *arr[(geometry_buffer_size - 1)/sizeof(void *) + 1];
|
|
};
|
|
|
|
#endif /*HAVE_SPATAIAL*/
|
|
#endif
|