database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-06-13 13:01:51 +03:00
Code Activity

Optimized GIS functions

Browse Source 
heap/hp_delete.c:
  Added comments
mysql-test/r/gis.result:
  Updated results after name changes (all results line are unchanged)
mysql-test/r/show_check.result:
  Update test results after fix in hp_delete.cc
mysql-test/t/gis.test:
  Changed table names to longer, hopefully non conflicting ones.
  Added missing drop table
mysys/hash.c:
  Inendation cleanup
mysys/tree.c:
  Updated comments
  Decrease tree->allocated on delete (for status)
sql/field.cc:
  Added safety checking for GIS objects
sql/gstream.cc:
  Added copyright message
  Made a lot of speed/space optimizations
  Changed class names to be MySQL compliant
sql/gstream.h:
  Made a lot of speed/space optimizations
  Changed class names to be MySQL compliant
sql/item_create.cc:
  Indentation fixup
sql/item_geofunc.cc:
  Use new gis interface functions and new gis class names.
  Simple optimizations
  Indentation fixups
  Fixed a lot of unlikely but possible errors.
sql/item_geofunc.h:
  Moved SRID_SIZE to spatial.h
sql/spatial.cc:
  Added copyright message
  Made a lot of speed/space optimizations
  Changed class names to be MySQL compliant
sql/spatial.h:
  Made a lot of speed/space optimizations
  Changed class names to be MySQL compliant
  Indentation fixes
  Use bool instead of int as result type for functions that only return 0 or 1
sql/sql_string.cc:
  Simple optimizations
sql/sql_string.h:
  Simple cleanups
sql/structs.h:
  Added LEX_STRING_WITH_INIT (needed by spatial.cc)
This commit is contained in:
unknown
2004-03-04 08:50:37 +02:00
parent f96960f9e1
commit afa6728a9f
17 changed files with 1672 additions and 1607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
heap/hp_delete.c
View File

@ -60,9 +60,11 @@ err:
DBUG_RETURN(my_errno); DBUG_RETURN(my_errno);
} }
/* /*
Remove one key from rb-tree Remove one key from rb-tree
*/ */
int hp_rb_delete_key(HP_INFO *info, register HP_KEYDEF *keyinfo, int hp_rb_delete_key(HP_INFO *info, register HP_KEYDEF *keyinfo,
const byte *record, byte *recpos, int flag) const byte *record, byte *recpos, int flag)
{ {
@ -82,11 +84,25 @@ int hp_rb_delete_key(HP_INFO *info, register HP_KEYDEF *keyinfo,
return res; return res;
} }
/* Remove one key from hash-table */
/* Flag is set if we want's to correct info->current_ptr */ /*
Remove one key from hash-table
SYNPOSIS
hp_delete_key()
info Hash handler
keyinfo key definition of key that we want to delete
record row data to be deleted
recpos Pointer to heap record in memory
flag Is set if we want's to correct info->current_ptr
RETURN
0 ok
# error number
*/
int hp_delete_key(HP_INFO *info, register HP_KEYDEF *keyinfo, int hp_delete_key(HP_INFO *info, register HP_KEYDEF *keyinfo,
const byte *record, byte *recpos, int flag) const byte *record, byte *recpos, int flag)
{ {
ulong blength,pos2,pos_hashnr,lastpos_hashnr; ulong blength,pos2,pos_hashnr,lastpos_hashnr;
HASH_INFO *lastpos,*gpos,*pos,*pos3,*empty,*last_ptr; HASH_INFO *lastpos,*gpos,*pos,*pos3,*empty,*last_ptr;

204
mysql-test/r/gis.result
View File

@ -1,115 +1,115 @@
DROP TABLE IF EXISTS pt, ls, p, mpt, mls, mp, gc, geo; DROP TABLE IF EXISTS t1, gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
CREATE TABLE pt (fid INTEGER NOT NULL PRIMARY KEY, g POINT); CREATE TABLE gis_point (fid INTEGER NOT NULL PRIMARY KEY, g POINT);
CREATE TABLE ls (fid INTEGER NOT NULL PRIMARY KEY, g LINESTRING); CREATE TABLE gis_line (fid INTEGER NOT NULL PRIMARY KEY, g LINESTRING);
CREATE TABLE p (fid INTEGER NOT NULL PRIMARY KEY, g POLYGON); CREATE TABLE gis_polygon (fid INTEGER NOT NULL PRIMARY KEY, g POLYGON);
CREATE TABLE mpt (fid INTEGER NOT NULL PRIMARY KEY, g MULTIPOINT); CREATE TABLE gis_multi_point (fid INTEGER NOT NULL PRIMARY KEY, g MULTIPOINT);
CREATE TABLE mls (fid INTEGER NOT NULL PRIMARY KEY, g MULTILINESTRING); CREATE TABLE gis_multi_line (fid INTEGER NOT NULL PRIMARY KEY, g MULTILINESTRING);
CREATE TABLE mp (fid INTEGER NOT NULL PRIMARY KEY, g MULTIPOLYGON); CREATE TABLE gis_multi_polygon (fid INTEGER NOT NULL PRIMARY KEY, g MULTIPOLYGON);
CREATE TABLE gc (fid INTEGER NOT NULL PRIMARY KEY, g GEOMETRYCOLLECTION); CREATE TABLE gis_geometrycollection (fid INTEGER NOT NULL PRIMARY KEY, g GEOMETRYCOLLECTION);
CREATE TABLE geo (fid INTEGER NOT NULL PRIMARY KEY, g GEOMETRY); CREATE TABLE gis_geometry (fid INTEGER NOT NULL PRIMARY KEY, g GEOMETRY);
SHOW FIELDS FROM pt; SHOW FIELDS FROM gis_point;
Field Type Null Key Default Extra Field Type Null Key Default Extra
fid int(11) PRI 0 fid int(11) PRI 0
g point YES NULL g point YES NULL
SHOW FIELDS FROM ls; SHOW FIELDS FROM gis_line;
Field Type Null Key Default Extra Field Type Null Key Default Extra
fid int(11) PRI 0 fid int(11) PRI 0
g linestring YES NULL g linestring YES NULL
SHOW FIELDS FROM p; SHOW FIELDS FROM gis_polygon;
Field Type Null Key Default Extra Field Type Null Key Default Extra
fid int(11) PRI 0 fid int(11) PRI 0
g polygon YES NULL g polygon YES NULL
SHOW FIELDS FROM mpt; SHOW FIELDS FROM gis_multi_point;
Field Type Null Key Default Extra Field Type Null Key Default Extra
fid int(11) PRI 0 fid int(11) PRI 0
g multipoint YES NULL g multipoint YES NULL
SHOW FIELDS FROM mls; SHOW FIELDS FROM gis_multi_line;
Field Type Null Key Default Extra Field Type Null Key Default Extra
fid int(11) PRI 0 fid int(11) PRI 0
g multilinestring YES NULL g multilinestring YES NULL
SHOW FIELDS FROM mp; SHOW FIELDS FROM gis_multi_polygon;
Field Type Null Key Default Extra Field Type Null Key Default Extra
fid int(11) PRI 0 fid int(11) PRI 0
g multipolygon YES NULL g multipolygon YES NULL
SHOW FIELDS FROM gc; SHOW FIELDS FROM gis_geometrycollection;
Field Type Null Key Default Extra Field Type Null Key Default Extra
fid int(11) PRI 0 fid int(11) PRI 0
g geometrycollection YES NULL g geometrycollection YES NULL
SHOW FIELDS FROM geo; SHOW FIELDS FROM gis_geometry;
Field Type Null Key Default Extra Field Type Null Key Default Extra
fid int(11) PRI 0 fid int(11) PRI 0
g geometry YES NULL g geometry YES NULL
INSERT INTO pt VALUES INSERT INTO gis_point VALUES
(101, PointFromText('POINT(10 10)')), (101, PointFromText('POINT(10 10)')),
(102, PointFromText('POINT(20 10)')), (102, PointFromText('POINT(20 10)')),
(103, PointFromText('POINT(20 20)')), (103, PointFromText('POINT(20 20)')),
(104, PointFromWKB(AsWKB(PointFromText('POINT(10 20)')))); (104, PointFromWKB(AsWKB(PointFromText('POINT(10 20)'))));
INSERT INTO ls VALUES INSERT INTO gis_line VALUES
(105, LineFromText('LINESTRING(0 0,0 10,10 0)')), (105, LineFromText('LINESTRING(0 0,0 10,10 0)')),
(106, LineStringFromText('LINESTRING(10 10,20 10,20 20,10 20,10 10)')), (106, LineStringFromText('LINESTRING(10 10,20 10,20 20,10 20,10 10)')),
(107, LineStringFromWKB(LineString(Point(10, 10), Point(40, 10)))); (107, LineStringFromWKB(LineString(Point(10, 10), Point(40, 10))));
INSERT INTO p VALUES INSERT INTO gis_polygon VALUES
(108, PolygonFromText('POLYGON((10 10,20 10,20 20,10 20,10 10))')), (108, PolygonFromText('POLYGON((10 10,20 10,20 20,10 20,10 10))')),
(109, PolyFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))')), (109, PolyFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))')),
(110, PolyFromWKB(Polygon(LineString(Point(0, 0), Point(30, 0), Point(30, 30), Point(0, 0))))); (110, PolyFromWKB(Polygon(LineString(Point(0, 0), Point(30, 0), Point(30, 30), Point(0, 0)))));
INSERT INTO mpt VALUES INSERT INTO gis_multi_point VALUES
(111, MultiPointFromText('MULTIPOINT(0 0,10 10,10 20,20 20)')), (111, MultiPointFromText('MULTIPOINT(0 0,10 10,10 20,20 20)')),
(112, MPointFromText('MULTIPOINT(1 1,11 11,11 21,21 21)')), (112, MPointFromText('MULTIPOINT(1 1,11 11,11 21,21 21)')),
(113, MPointFromWKB(MultiPoint(Point(3, 6), Point(4, 10)))); (113, MPointFromWKB(MultiPoint(Point(3, 6), Point(4, 10))));
INSERT INTO mls VALUES INSERT INTO gis_multi_line VALUES
(114, MultiLineStringFromText('MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48))')), (114, MultiLineStringFromText('MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48))')),
(115, MLineFromText('MULTILINESTRING((10 48,10 21,10 0))')), (115, MLineFromText('MULTILINESTRING((10 48,10 21,10 0))')),
(116, MLineFromWKB(MultiLineString(LineString(Point(1, 2), Point(3, 5)), LineString(Point(2, 5), Point(5, 8), Point(21, 7))))); (116, MLineFromWKB(MultiLineString(LineString(Point(1, 2), Point(3, 5)), LineString(Point(2, 5), Point(5, 8), Point(21, 7)))));
INSERT INTO mp VALUES INSERT INTO gis_multi_polygon VALUES
(117, MultiPolygonFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), (117, MultiPolygonFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')),
(118, MPolyFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), (118, MPolyFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')),
(119, MPolyFromWKB(MultiPolygon(Polygon(LineString(Point(0, 3), Point(3, 3), Point(3, 0), Point(0, 3)))))); (119, MPolyFromWKB(MultiPolygon(Polygon(LineString(Point(0, 3), Point(3, 3), Point(3, 0), Point(0, 3))))));
INSERT INTO gc VALUES INSERT INTO gis_geometrycollection VALUES
(120, GeomCollFromText('GEOMETRYCOLLECTION(POINT(0 0), LINESTRING(0 0,10 10))')), (120, GeomCollFromText('GEOMETRYCOLLECTION(POINT(0 0), LINESTRING(0 0,10 10))')),
(121, GeometryFromWKB(GeometryCollection(Point(44, 6), LineString(Point(3, 6), Point(7, 9))))); (121, GeometryFromWKB(GeometryCollection(Point(44, 6), LineString(Point(3, 6), Point(7, 9)))));
INSERT into geo SELECT * FROM pt; INSERT into gis_geometry SELECT * FROM gis_point;
INSERT into geo SELECT * FROM ls; INSERT into gis_geometry SELECT * FROM gis_line;
INSERT into geo SELECT * FROM p; INSERT into gis_geometry SELECT * FROM gis_polygon;
INSERT into geo SELECT * FROM mpt; INSERT into gis_geometry SELECT * FROM gis_multi_point;
INSERT into geo SELECT * FROM mls; INSERT into gis_geometry SELECT * FROM gis_multi_line;
INSERT into geo SELECT * FROM mp; INSERT into gis_geometry SELECT * FROM gis_multi_polygon;
INSERT into geo SELECT * FROM gc; INSERT into gis_geometry SELECT * FROM gis_geometrycollection;
SELECT fid, AsText(g) FROM pt; SELECT fid, AsText(g) FROM gis_point;
fid AsText(g) fid AsText(g)
101 POINT(10 10) 101 POINT(10 10)
102 POINT(20 10) 102 POINT(20 10)
103 POINT(20 20) 103 POINT(20 20)
104 POINT(10 20) 104 POINT(10 20)
SELECT fid, AsText(g) FROM ls; SELECT fid, AsText(g) FROM gis_line;
fid AsText(g) fid AsText(g)
105 LINESTRING(0 0,0 10,10 0) 105 LINESTRING(0 0,0 10,10 0)
106 LINESTRING(10 10,20 10,20 20,10 20,10 10) 106 LINESTRING(10 10,20 10,20 20,10 20,10 10)
107 LINESTRING(10 10,40 10) 107 LINESTRING(10 10,40 10)
SELECT fid, AsText(g) FROM p; SELECT fid, AsText(g) FROM gis_polygon;
fid AsText(g) fid AsText(g)
108 POLYGON((10 10,20 10,20 20,10 20,10 10)) 108 POLYGON((10 10,20 10,20 20,10 20,10 10))
109 POLYGON((0 0,50 0,50 50,0 50,0 0),(10 10,20 10,20 20,10 20,10 10)) 109 POLYGON((0 0,50 0,50 50,0 50,0 0),(10 10,20 10,20 20,10 20,10 10))
110 POLYGON((0 0,30 0,30 30,0 0)) 110 POLYGON((0 0,30 0,30 30,0 0))
SELECT fid, AsText(g) FROM mpt; SELECT fid, AsText(g) FROM gis_multi_point;
fid AsText(g) fid AsText(g)
111 MULTIPOINT(0 0,10 10,10 20,20 20) 111 MULTIPOINT(0 0,10 10,10 20,20 20)
112 MULTIPOINT(1 1,11 11,11 21,21 21) 112 MULTIPOINT(1 1,11 11,11 21,21 21)
113 MULTIPOINT(3 6,4 10) 113 MULTIPOINT(3 6,4 10)
SELECT fid, AsText(g) FROM mls; SELECT fid, AsText(g) FROM gis_multi_line;
fid AsText(g) fid AsText(g)
114 MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48)) 114 MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48))
115 MULTILINESTRING((10 48,10 21,10 0)) 115 MULTILINESTRING((10 48,10 21,10 0))
116 MULTILINESTRING((1 2,3 5),(2 5,5 8,21 7)) 116 MULTILINESTRING((1 2,3 5),(2 5,5 8,21 7))
SELECT fid, AsText(g) FROM mp; SELECT fid, AsText(g) FROM gis_multi_polygon;
fid AsText(g) fid AsText(g)
117 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18))) 117 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))
118 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18))) 118 MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))
119 MULTIPOLYGON(((0 3,3 3,3 0,0 3))) 119 MULTIPOLYGON(((0 3,3 3,3 0,0 3)))
SELECT fid, AsText(g) FROM gc; SELECT fid, AsText(g) FROM gis_geometrycollection;
fid AsText(g) fid AsText(g)
120 GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(0 0,10 10)) 120 GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(0 0,10 10))
121 GEOMETRYCOLLECTION(POINT(44 6),LINESTRING(3 6,7 9)) 121 GEOMETRYCOLLECTION(POINT(44 6),LINESTRING(3 6,7 9))
SELECT fid, AsText(g) FROM geo; SELECT fid, AsText(g) FROM gis_geometry;
fid AsText(g) fid AsText(g)
101 POINT(10 10) 101 POINT(10 10)
102 POINT(20 10) 102 POINT(20 10)
@ -132,7 +132,7 @@ fid AsText(g)
119 MULTIPOLYGON(((0 3,3 3,3 0,0 3))) 119 MULTIPOLYGON(((0 3,3 3,3 0,0 3)))
120 GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(0 0,10 10)) 120 GEOMETRYCOLLECTION(POINT(0 0),LINESTRING(0 0,10 10))
121 GEOMETRYCOLLECTION(POINT(44 6),LINESTRING(3 6,7 9)) 121 GEOMETRYCOLLECTION(POINT(44 6),LINESTRING(3 6,7 9))
SELECT fid, Dimension(g) FROM geo; SELECT fid, Dimension(g) FROM gis_geometry;
fid Dimension(g) fid Dimension(g)
101 0 101 0
102 0 102 0
@ -155,7 +155,7 @@ fid Dimension(g)
119 2 119 2
120 1 120 1
121 1 121 1
SELECT fid, GeometryType(g) FROM geo; SELECT fid, GeometryType(g) FROM gis_geometry;
fid GeometryType(g) fid GeometryType(g)
101 POINT 101 POINT
102 POINT 102 POINT
@ -178,7 +178,7 @@ fid GeometryType(g)
119 MULTIPOLYGON 119 MULTIPOLYGON
120 GEOMETRYCOLLECTION 120 GEOMETRYCOLLECTION
121 GEOMETRYCOLLECTION 121 GEOMETRYCOLLECTION
SELECT fid, IsEmpty(g) FROM geo; SELECT fid, IsEmpty(g) FROM gis_geometry;
fid IsEmpty(g) fid IsEmpty(g)
101 0 101 0
102 0 102 0
@ -201,7 +201,7 @@ fid IsEmpty(g)
119 0 119 0
120 0 120 0
121 0 121 0
SELECT fid, AsText(Envelope(g)) FROM geo; SELECT fid, AsText(Envelope(g)) FROM gis_geometry;
fid AsText(Envelope(g)) fid AsText(Envelope(g))
101 POLYGON((10 10,10 10,10 10,10 10,10 10)) 101 POLYGON((10 10,10 10,10 10,10 10,10 10))
102 POLYGON((20 10,20 10,20 10,20 10,20 10)) 102 POLYGON((20 10,20 10,20 10,20 10,20 10))
@ -224,161 +224,165 @@ fid AsText(Envelope(g))
119 POLYGON((0 0,3 0,3 3,0 3,0 0)) 119 POLYGON((0 0,3 0,3 3,0 3,0 0))
120 POLYGON((0 0,10 0,10 10,0 10,0 0)) 120 POLYGON((0 0,10 0,10 10,0 10,0 0))
121 POLYGON((3 6,44 6,44 9,3 9,3 6)) 121 POLYGON((3 6,44 6,44 9,3 9,3 6))
explain extended select Dimension(g), GeometryType(g), IsEmpty(g), AsText(Envelope(g)) from geo; explain extended select Dimension(g), GeometryType(g), IsEmpty(g), AsText(Envelope(g)) from gis_geometry;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE geo ALL NULL NULL NULL NULL 21 1 SIMPLE gis_geometry ALL NULL NULL NULL NULL 21
Warnings: Warnings:
Note 1003 select high_priority dimension(test.geo.g) AS `Dimension(g)`,geometrytype(test.geo.g) AS `GeometryType(g)`,isempty(test.geo.g) AS `IsEmpty(g)`,astext(envelope(test.geo.g)) AS `AsText(Envelope(g))` from test.geo Note 1003 select high_priority dimension(test.gis_geometry.g) AS `Dimension(g)`,geometrytype(test.gis_geometry.g) AS `GeometryType(g)`,isempty(test.gis_geometry.g) AS `IsEmpty(g)`,astext(envelope(test.gis_geometry.g)) AS `AsText(Envelope(g))` from test.gis_geometry
SELECT fid, X(g) FROM pt; SELECT fid, X(g) FROM gis_point;
fid X(g) fid X(g)
101 10 101 10
102 20 102 20
103 20 103 20
104 10 104 10
SELECT fid, Y(g) FROM pt; SELECT fid, Y(g) FROM gis_point;
fid Y(g) fid Y(g)
101 10 101 10
102 10 102 10
103 20 103 20
104 20 104 20
explain extended select X(g),Y(g) FROM pt; explain extended select X(g),Y(g) FROM gis_point;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE pt ALL NULL NULL NULL NULL 4 1 SIMPLE gis_point ALL NULL NULL NULL NULL 4
Warnings: Warnings:
Note 1003 select high_priority x(test.pt.g) AS `X(g)`,y(test.pt.g) AS `Y(g)` from test.pt Note 1003 select high_priority x(test.gis_point.g) AS `X(g)`,y(test.gis_point.g) AS `Y(g)` from test.gis_point
SELECT fid, AsText(StartPoint(g)) FROM ls; SELECT fid, AsText(StartPoint(g)) FROM gis_line;
fid AsText(StartPoint(g)) fid AsText(StartPoint(g))
105 POINT(0 0) 105 POINT(0 0)
106 POINT(10 10) 106 POINT(10 10)
107 POINT(10 10) 107 POINT(10 10)
SELECT fid, AsText(EndPoint(g)) FROM ls; SELECT fid, AsText(EndPoint(g)) FROM gis_line;
fid AsText(EndPoint(g)) fid AsText(EndPoint(g))
105 POINT(10 0) 105 POINT(10 0)
106 POINT(10 10) 106 POINT(10 10)
107 POINT(40 10) 107 POINT(40 10)
SELECT fid, GLength(g) FROM ls; SELECT fid, GLength(g) FROM gis_line;
fid GLength(g) fid GLength(g)
105 24.142135623731 105 24.142135623731
106 40 106 40
107 30 107 30
SELECT fid, NumPoints(g) FROM ls; SELECT fid, NumPoints(g) FROM gis_line;
fid NumPoints(g) fid NumPoints(g)
105 3 105 3
106 5 106 5
107 2 107 2
SELECT fid, AsText(PointN(g, 2)) FROM ls; SELECT fid, AsText(PointN(g, 2)) FROM gis_line;
fid AsText(PointN(g, 2)) fid AsText(PointN(g, 2))
105 POINT(0 10) 105 POINT(0 10)
106 POINT(20 10) 106 POINT(20 10)
107 POINT(40 10) 107 POINT(40 10)
SELECT fid, IsClosed(g) FROM ls; SELECT fid, IsClosed(g) FROM gis_line;
fid IsClosed(g) fid IsClosed(g)
105 0 105 0
106 1 106 1
107 0 107 0
explain extended select AsText(StartPoint(g)),AsText(EndPoint(g)),GLength(g),NumPoints(g),AsText(PointN(g, 2)),IsClosed(g) FROM ls; explain extended select AsText(StartPoint(g)),AsText(EndPoint(g)),GLength(g),NumPoints(g),AsText(PointN(g, 2)),IsClosed(g) FROM gis_line;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE ls ALL NULL NULL NULL NULL 3 1 SIMPLE gis_line ALL NULL NULL NULL NULL 3
Warnings: Warnings:
Note 1003 select high_priority astext(startpoint(test.ls.g)) AS `AsText(StartPoint(g))`,astext(endpoint(test.ls.g)) AS `AsText(EndPoint(g))`,glength(test.ls.g) AS `GLength(g)`,numpoints(test.ls.g) AS `NumPoints(g)`,astext(pointn(test.ls.g,2)) AS `AsText(PointN(g, 2))`,isclosed(test.ls.g) AS `IsClosed(g)` from test.ls Note 1003 select high_priority astext(startpoint(test.gis_line.g)) AS `AsText(StartPoint(g))`,astext(endpoint(test.gis_line.g)) AS `AsText(EndPoint(g))`,glength(test.gis_line.g) AS `GLength(g)`,numpoints(test.gis_line.g) AS `NumPoints(g)`,astext(pointn(test.gis_line.g,2)) AS `AsText(PointN(g, 2))`,isclosed(test.gis_line.g) AS `IsClosed(g)` from test.gis_line
SELECT fid, AsText(Centroid(g)) FROM p; SELECT fid, AsText(Centroid(g)) FROM gis_polygon;
fid AsText(Centroid(g)) fid AsText(Centroid(g))
108 POINT(15 15) 108 POINT(15 15)
109 POINT(25.416666666667 25.416666666667) 109 POINT(25.416666666667 25.416666666667)
110 POINT(20 10) 110 POINT(20 10)
SELECT fid, Area(g) FROM p; SELECT fid, Area(g) FROM gis_polygon;
fid Area(g) fid Area(g)
108 100 108 100
109 2400 109 2400
110 450 110 450
SELECT fid, AsText(ExteriorRing(g)) FROM p; SELECT fid, AsText(ExteriorRing(g)) FROM gis_polygon;
fid AsText(ExteriorRing(g)) fid AsText(ExteriorRing(g))
108 LINESTRING(10 10,20 10,20 20,10 20,10 10) 108 LINESTRING(10 10,20 10,20 20,10 20,10 10)
109 LINESTRING(0 0,50 0,50 50,0 50,0 0) 109 LINESTRING(0 0,50 0,50 50,0 50,0 0)
110 LINESTRING(0 0,30 0,30 30,0 0) 110 LINESTRING(0 0,30 0,30 30,0 0)
SELECT fid, NumInteriorRings(g) FROM p; SELECT fid, NumInteriorRings(g) FROM gis_polygon;
fid NumInteriorRings(g) fid NumInteriorRings(g)
108 0 108 0
109 1 109 1
110 0 110 0
SELECT fid, AsText(InteriorRingN(g, 1)) FROM p; SELECT fid, AsText(InteriorRingN(g, 1)) FROM gis_polygon;
fid AsText(InteriorRingN(g, 1)) fid AsText(InteriorRingN(g, 1))
108 NULL 108 NULL
109 LINESTRING(10 10,20 10,20 20,10 20,10 10) 109 LINESTRING(10 10,20 10,20 20,10 20,10 10)
110 NULL 110 NULL
explain extended select AsText(Centroid(g)),Area(g),AsText(ExteriorRing(g)),NumInteriorRings(g),AsText(InteriorRingN(g, 1)) FROM p; explain extended select AsText(Centroid(g)),Area(g),AsText(ExteriorRing(g)),NumInteriorRings(g),AsText(InteriorRingN(g, 1)) FROM gis_polygon;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE p ALL NULL NULL NULL NULL 3 1 SIMPLE gis_polygon ALL NULL NULL NULL NULL 3
Warnings: Warnings:
Note 1003 select high_priority astext(centroid(test.p.g)) AS `AsText(Centroid(g))`,area(test.p.g) AS `Area(g)`,astext(exteriorring(test.p.g)) AS `AsText(ExteriorRing(g))`,numinteriorrings(test.p.g) AS `NumInteriorRings(g)`,astext(interiorringn(test.p.g,1)) AS `AsText(InteriorRingN(g, 1))` from test.p Note 1003 select high_priority astext(centroid(test.gis_polygon.g)) AS `AsText(Centroid(g))`,area(test.gis_polygon.g) AS `Area(g)`,astext(exteriorring(test.gis_polygon.g)) AS `AsText(ExteriorRing(g))`,numinteriorrings(test.gis_polygon.g) AS `NumInteriorRings(g)`,astext(interiorringn(test.gis_polygon.g,1)) AS `AsText(InteriorRingN(g, 1))` from test.gis_polygon
SELECT fid, IsClosed(g) FROM mls; SELECT fid, IsClosed(g) FROM gis_multi_line;
fid IsClosed(g) fid IsClosed(g)
114 0 114 0
115 0 115 0
116 0 116 0
SELECT fid, AsText(Centroid(g)) FROM mp; SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon;
fid AsText(Centroid(g)) fid AsText(Centroid(g))
117 POINT(55.588527753042 17.426536064114) 117 POINT(55.588527753042 17.426536064114)
118 POINT(55.588527753042 17.426536064114) 118 POINT(55.588527753042 17.426536064114)
119 POINT(2 2) 119 POINT(2 2)
SELECT fid, Area(g) FROM mp; SELECT fid, Area(g) FROM gis_multi_polygon;
fid Area(g) fid Area(g)
117 1684.5 117 1684.5
118 1684.5 118 1684.5
119 4.5 119 4.5
SELECT fid, NumGeometries(g) from mpt; SELECT fid, NumGeometries(g) from gis_multi_point;
fid NumGeometries(g) fid NumGeometries(g)
111 4 111 4
112 4 112 4
113 2 113 2
SELECT fid, NumGeometries(g) from mls; SELECT fid, NumGeometries(g) from gis_multi_line;
fid NumGeometries(g) fid NumGeometries(g)
114 2 114 2
115 1 115 1
116 2 116 2
SELECT fid, NumGeometries(g) from mp; SELECT fid, NumGeometries(g) from gis_multi_polygon;
fid NumGeometries(g) fid NumGeometries(g)
117 2 117 2
118 2 118 2
119 1 119 1
SELECT fid, NumGeometries(g) from gc; SELECT fid, NumGeometries(g) from gis_geometrycollection;
fid NumGeometries(g) fid NumGeometries(g)
120 2 120 2
121 2 121 2
explain extended SELECT fid, NumGeometries(g) from mpt; explain extended SELECT fid, NumGeometries(g) from gis_multi_point;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE mpt ALL NULL NULL NULL NULL 3 1 SIMPLE gis_multi_point ALL NULL NULL NULL NULL 3
Warnings: Warnings:
Note 1003 select high_priority test.mpt.fid AS `fid`,numgeometries(test.mpt.g) AS `NumGeometries(g)` from test.mpt Note 1003 select high_priority test.gis_multi_point.fid AS `fid`,numgeometries(test.gis_multi_point.g) AS `NumGeometries(g)` from test.gis_multi_point
SELECT fid, AsText(GeometryN(g, 2)) from mpt; SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_point;
fid AsText(GeometryN(g, 2)) fid AsText(GeometryN(g, 2))
111 POINT(10 10) 111 POINT(10 10)
112 POINT(11 11) 112 POINT(11 11)
113 POINT(4 10) 113 POINT(4 10)
SELECT fid, AsText(GeometryN(g, 2)) from mls; SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_line;
fid AsText(GeometryN(g, 2)) fid AsText(GeometryN(g, 2))
114 LINESTRING(16 0,16 23,16 48) 114 LINESTRING(16 0,16 23,16 48)
115 NULL 115 NULL
116 LINESTRING(2 5,5 8,21 7) 116 LINESTRING(2 5,5 8,21 7)
SELECT fid, AsText(GeometryN(g, 2)) from mp; SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_polygon;
fid AsText(GeometryN(g, 2)) fid AsText(GeometryN(g, 2))
117 POLYGON((59 18,67 18,67 13,59 13,59 18)) 117 POLYGON((59 18,67 18,67 13,59 13,59 18))
118 POLYGON((59 18,67 18,67 13,59 13,59 18)) 118 POLYGON((59 18,67 18,67 13,59 13,59 18))
119 NULL 119 NULL
SELECT fid, AsText(GeometryN(g, 2)) from gc; SELECT fid, AsText(GeometryN(g, 2)) from gis_geometrycollection;
fid AsText(GeometryN(g, 2)) fid AsText(GeometryN(g, 2))
120 LINESTRING(0 0,10 10) 120 LINESTRING(0 0,10 10)
121 LINESTRING(3 6,7 9) 121 LINESTRING(3 6,7 9)
explain extended SELECT fid, AsText(GeometryN(g, 2)) from mpt; SELECT fid, AsText(GeometryN(g, 1)) from gis_geometrycollection;
fid AsText(GeometryN(g, 1))
120 POINT(0 0)
121 POINT(44 6)
explain extended SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_point;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE mpt ALL NULL NULL NULL NULL 3 1 SIMPLE gis_multi_point ALL NULL NULL NULL NULL 3
Warnings: Warnings:
Note 1003 select high_priority test.mpt.fid AS `fid`,astext(geometryn(test.mpt.g,2)) AS `AsText(GeometryN(g, 2))` from test.mpt Note 1003 select high_priority test.gis_multi_point.fid AS `fid`,astext(geometryn(test.gis_multi_point.g,2)) AS `AsText(GeometryN(g, 2))` from test.gis_multi_point
SELECT g1.fid as first, g2.fid as second, SELECT g1.fid as first, g2.fid as second,
Within(g1.g, g2.g) as w, Contains(g1.g, g2.g) as c, Overlaps(g1.g, g2.g) as o, Within(g1.g, g2.g) as w, Contains(g1.g, g2.g) as c, Overlaps(g1.g, g2.g) as o,
Equals(g1.g, g2.g) as e, Disjoint(g1.g, g2.g) as d, Touches(g1.g, g2.g) as t, Equals(g1.g, g2.g) as e, Disjoint(g1.g, g2.g) as d, Touches(g1.g, g2.g) as t,
Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r
FROM gc g1, gc g2 ORDER BY first, second; FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second;
first second w c o e d t i r first second w c o e d t i r
120 120 1 1 0 1 0 0 1 0 120 120 1 1 0 1 0 0 1 0
120 121 0 0 0 0 0 0 1 0 120 121 0 0 0 0 0 0 1 0
@ -388,46 +392,46 @@ explain extended SELECT g1.fid as first, g2.fid as second,
Within(g1.g, g2.g) as w, Contains(g1.g, g2.g) as c, Overlaps(g1.g, g2.g) as o, Within(g1.g, g2.g) as w, Contains(g1.g, g2.g) as c, Overlaps(g1.g, g2.g) as o,
Equals(g1.g, g2.g) as e, Disjoint(g1.g, g2.g) as d, Touches(g1.g, g2.g) as t, Equals(g1.g, g2.g) as e, Disjoint(g1.g, g2.g) as d, Touches(g1.g, g2.g) as t,
Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r
FROM gc g1, gc g2 ORDER BY first, second; FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second;
id select_type table type possible_keys key key_len ref rows Extra id select_type table type possible_keys key key_len ref rows Extra
1 SIMPLE g1 ALL NULL NULL NULL NULL 2 Using temporary; Using filesort 1 SIMPLE g1 ALL NULL NULL NULL NULL 2 Using temporary; Using filesort
1 SIMPLE g2 ALL NULL NULL NULL NULL 2 1 SIMPLE g2 ALL NULL NULL NULL NULL 2
Warnings: Warnings:
Note 1003 select high_priority test.g1.fid AS `first`,test.g2.fid AS `second`,within(test.g1.g,test.g2.g) AS `w`,contains(test.g1.g,test.g2.g) AS `c`,overlaps(test.g1.g,test.g2.g) AS `o`,equals(test.g1.g,test.g2.g) AS `e`,disjoint(test.g1.g,test.g2.g) AS `d`,touches(test.g1.g,test.g2.g) AS `t`,intersects(test.g1.g,test.g2.g) AS `i`,crosses(test.g1.g,test.g2.g) AS `r` from test.gc g1 join test.gc g2 order by test.g1.fid,test.g2.fid Note 1003 select high_priority test.g1.fid AS `first`,test.g2.fid AS `second`,within(test.g1.g,test.g2.g) AS `w`,contains(test.g1.g,test.g2.g) AS `c`,overlaps(test.g1.g,test.g2.g) AS `o`,equals(test.g1.g,test.g2.g) AS `e`,disjoint(test.g1.g,test.g2.g) AS `d`,touches(test.g1.g,test.g2.g) AS `t`,intersects(test.g1.g,test.g2.g) AS `i`,crosses(test.g1.g,test.g2.g) AS `r` from test.gis_geometrycollection g1 join test.gis_geometrycollection g2 order by test.g1.fid,test.g2.fid
DROP TABLE pt, ls, p, mpt, mls, mp, gc, geo; DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
CREATE TABLE g1 ( CREATE TABLE t1 (
pt point, gp point,
ln linestring, ln linestring,
pg polygon, pg polygon,
mpt multipoint, mp multipoint,
mln multilinestring, mln multilinestring,
mpg multipolygon, mpg multipolygon,
gc geometrycollection, gc geometrycollection,
gm geometry gm geometry
); );
SHOW FIELDS FROM g1; SHOW FIELDS FROM t1;
Field Type Null Key Default Extra Field Type Null Key Default Extra
pt point YES NULL gp point YES NULL
ln linestring YES NULL ln linestring YES NULL
pg polygon YES NULL pg polygon YES NULL
mpt multipoint YES NULL mp multipoint YES NULL
mln multilinestring YES NULL mln multilinestring YES NULL
mpg multipolygon YES NULL mpg multipolygon YES NULL
gc geometrycollection YES NULL gc geometrycollection YES NULL
gm geometry YES NULL gm geometry YES NULL
ALTER TABLE g1 ADD fid INT NOT NULL; ALTER TABLE t1 ADD fid INT NOT NULL;
SHOW FIELDS FROM g1; SHOW FIELDS FROM t1;
Field Type Null Key Default Extra Field Type Null Key Default Extra
pt point YES NULL gp point YES NULL
ln linestring YES NULL ln linestring YES NULL
pg polygon YES NULL pg polygon YES NULL
mpt multipoint YES NULL mp multipoint YES NULL
mln multilinestring YES NULL mln multilinestring YES NULL
mpg multipolygon YES NULL mpg multipolygon YES NULL
gc geometrycollection YES NULL gc geometrycollection YES NULL
gm geometry YES NULL gm geometry YES NULL
fid int(11) 0 fid int(11) 0
DROP TABLE g1; DROP TABLE t1;
SELECT AsText(GeometryFromWKB(AsWKB(GeometryFromText('POINT(1 4)')))); SELECT AsText(GeometryFromWKB(AsWKB(GeometryFromText('POINT(1 4)'))));
AsText(GeometryFromWKB(AsWKB(GeometryFromText('POINT(1 4)')))) AsText(GeometryFromWKB(AsWKB(GeometryFromText('POINT(1 4)'))))
POINT(1 4) POINT(1 4)

8
mysql-test/r/show_check.result
View File

@ -359,9 +359,9 @@ delete from t2 where b=3;
delete from t3 where a=3; delete from t3 where a=3;
show table status; show table status;
Name Type Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Name Type Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
t1 HEAP Fixed 4 5 39904 249415 105 5 NULL NULL NULL NULL latin1_swedish_ci NULL t1 HEAP Fixed 4 5 39904 249415 89 5 NULL NULL NULL NULL latin1_swedish_ci NULL
t2 HEAP Fixed 4 5 39904 249415 39904 5 NULL NULL NULL NULL latin1_swedish_ci NULL t2 HEAP Fixed 4 5 39904 249415 39904 5 NULL NULL NULL NULL latin1_swedish_ci NULL
t3 HEAP Fixed 4 9 33072 248103 22153 9 NULL NULL NULL NULL latin1_swedish_ci NULL t3 HEAP Fixed 4 9 33072 248103 22137 9 NULL NULL NULL NULL latin1_swedish_ci NULL
delete from t1; delete from t1;
delete from t2; delete from t2;
delete from t3; delete from t3;
@ -383,7 +383,7 @@ delete from t2 where b=5;
delete from t3 where a=5; delete from t3 where a=5;
show table status; show table status;
Name Type Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment Name Type Row_format Rows Avg_row_length Data_length Max_data_length Index_length Data_free Auto_increment Create_time Update_time Check_time Collation Checksum Create_options Comment
t1 HEAP Fixed 0 5 39904 249415 21 5 NULL NULL NULL NULL latin1_swedish_ci NULL t1 HEAP Fixed 0 5 39904 249415 5 5 NULL NULL NULL NULL latin1_swedish_ci NULL
t2 HEAP Fixed 0 5 39904 249415 39904 5 NULL NULL NULL NULL latin1_swedish_ci NULL t2 HEAP Fixed 0 5 39904 249415 39904 5 NULL NULL NULL NULL latin1_swedish_ci NULL
t3 HEAP Fixed 0 9 33072 248103 22069 9 NULL NULL NULL NULL latin1_swedish_ci NULL t3 HEAP Fixed 0 9 33072 248103 22053 9 NULL NULL NULL NULL latin1_swedish_ci NULL
drop table t1, t2, t3; drop table t1, t2, t3;

167
mysql-test/t/gis.test
View File

@ -3,154 +3,155 @@
# #
--disable_warnings --disable_warnings
DROP TABLE IF EXISTS pt, ls, p, mpt, mls, mp, gc, geo; DROP TABLE IF EXISTS t1, gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
--enable_warnings --enable_warnings
CREATE TABLE pt (fid INTEGER NOT NULL PRIMARY KEY, g POINT); CREATE TABLE gis_point (fid INTEGER NOT NULL PRIMARY KEY, g POINT);
CREATE TABLE ls (fid INTEGER NOT NULL PRIMARY KEY, g LINESTRING); CREATE TABLE gis_line (fid INTEGER NOT NULL PRIMARY KEY, g LINESTRING);
CREATE TABLE p (fid INTEGER NOT NULL PRIMARY KEY, g POLYGON); CREATE TABLE gis_polygon (fid INTEGER NOT NULL PRIMARY KEY, g POLYGON);
CREATE TABLE mpt (fid INTEGER NOT NULL PRIMARY KEY, g MULTIPOINT); CREATE TABLE gis_multi_point (fid INTEGER NOT NULL PRIMARY KEY, g MULTIPOINT);
CREATE TABLE mls (fid INTEGER NOT NULL PRIMARY KEY, g MULTILINESTRING); CREATE TABLE gis_multi_line (fid INTEGER NOT NULL PRIMARY KEY, g MULTILINESTRING);
CREATE TABLE mp (fid INTEGER NOT NULL PRIMARY KEY, g MULTIPOLYGON); CREATE TABLE gis_multi_polygon (fid INTEGER NOT NULL PRIMARY KEY, g MULTIPOLYGON);
CREATE TABLE gc (fid INTEGER NOT NULL PRIMARY KEY, g GEOMETRYCOLLECTION); CREATE TABLE gis_geometrycollection (fid INTEGER NOT NULL PRIMARY KEY, g GEOMETRYCOLLECTION);
CREATE TABLE geo (fid INTEGER NOT NULL PRIMARY KEY, g GEOMETRY); CREATE TABLE gis_geometry (fid INTEGER NOT NULL PRIMARY KEY, g GEOMETRY);
SHOW FIELDS FROM pt; SHOW FIELDS FROM gis_point;
SHOW FIELDS FROM ls; SHOW FIELDS FROM gis_line;
SHOW FIELDS FROM p; SHOW FIELDS FROM gis_polygon;
SHOW FIELDS FROM mpt; SHOW FIELDS FROM gis_multi_point;
SHOW FIELDS FROM mls; SHOW FIELDS FROM gis_multi_line;
SHOW FIELDS FROM mp; SHOW FIELDS FROM gis_multi_polygon;
SHOW FIELDS FROM gc; SHOW FIELDS FROM gis_geometrycollection;
SHOW FIELDS FROM geo; SHOW FIELDS FROM gis_geometry;
INSERT INTO pt VALUES INSERT INTO gis_point VALUES
(101, PointFromText('POINT(10 10)')), (101, PointFromText('POINT(10 10)')),
(102, PointFromText('POINT(20 10)')), (102, PointFromText('POINT(20 10)')),
(103, PointFromText('POINT(20 20)')), (103, PointFromText('POINT(20 20)')),
(104, PointFromWKB(AsWKB(PointFromText('POINT(10 20)')))); (104, PointFromWKB(AsWKB(PointFromText('POINT(10 20)'))));
INSERT INTO ls VALUES INSERT INTO gis_line VALUES
(105, LineFromText('LINESTRING(0 0,0 10,10 0)')), (105, LineFromText('LINESTRING(0 0,0 10,10 0)')),
(106, LineStringFromText('LINESTRING(10 10,20 10,20 20,10 20,10 10)')), (106, LineStringFromText('LINESTRING(10 10,20 10,20 20,10 20,10 10)')),
(107, LineStringFromWKB(LineString(Point(10, 10), Point(40, 10)))); (107, LineStringFromWKB(LineString(Point(10, 10), Point(40, 10))));
INSERT INTO p VALUES INSERT INTO gis_polygon VALUES
(108, PolygonFromText('POLYGON((10 10,20 10,20 20,10 20,10 10))')), (108, PolygonFromText('POLYGON((10 10,20 10,20 20,10 20,10 10))')),
(109, PolyFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))')), (109, PolyFromText('POLYGON((0 0,50 0,50 50,0 50,0 0), (10 10,20 10,20 20,10 20,10 10))')),
(110, PolyFromWKB(Polygon(LineString(Point(0, 0), Point(30, 0), Point(30, 30), Point(0, 0))))); (110, PolyFromWKB(Polygon(LineString(Point(0, 0), Point(30, 0), Point(30, 30), Point(0, 0)))));
INSERT INTO mpt VALUES INSERT INTO gis_multi_point VALUES
(111, MultiPointFromText('MULTIPOINT(0 0,10 10,10 20,20 20)')), (111, MultiPointFromText('MULTIPOINT(0 0,10 10,10 20,20 20)')),
(112, MPointFromText('MULTIPOINT(1 1,11 11,11 21,21 21)')), (112, MPointFromText('MULTIPOINT(1 1,11 11,11 21,21 21)')),
(113, MPointFromWKB(MultiPoint(Point(3, 6), Point(4, 10)))); (113, MPointFromWKB(MultiPoint(Point(3, 6), Point(4, 10))));
INSERT INTO mls VALUES INSERT INTO gis_multi_line VALUES
(114, MultiLineStringFromText('MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48))')), (114, MultiLineStringFromText('MULTILINESTRING((10 48,10 21,10 0),(16 0,16 23,16 48))')),
(115, MLineFromText('MULTILINESTRING((10 48,10 21,10 0))')), (115, MLineFromText('MULTILINESTRING((10 48,10 21,10 0))')),
(116, MLineFromWKB(MultiLineString(LineString(Point(1, 2), Point(3, 5)), LineString(Point(2, 5), Point(5, 8), Point(21, 7))))); (116, MLineFromWKB(MultiLineString(LineString(Point(1, 2), Point(3, 5)), LineString(Point(2, 5), Point(5, 8), Point(21, 7)))));
INSERT INTO mp VALUES INSERT INTO gis_multi_polygon VALUES
(117, MultiPolygonFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), (117, MultiPolygonFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')),
(118, MPolyFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')), (118, MPolyFromText('MULTIPOLYGON(((28 26,28 0,84 0,84 42,28 26),(52 18,66 23,73 9,48 6,52 18)),((59 18,67 18,67 13,59 13,59 18)))')),
(119, MPolyFromWKB(MultiPolygon(Polygon(LineString(Point(0, 3), Point(3, 3), Point(3, 0), Point(0, 3)))))); (119, MPolyFromWKB(MultiPolygon(Polygon(LineString(Point(0, 3), Point(3, 3), Point(3, 0), Point(0, 3))))));
INSERT INTO gc VALUES INSERT INTO gis_geometrycollection VALUES
(120, GeomCollFromText('GEOMETRYCOLLECTION(POINT(0 0), LINESTRING(0 0,10 10))')), (120, GeomCollFromText('GEOMETRYCOLLECTION(POINT(0 0), LINESTRING(0 0,10 10))')),
(121, GeometryFromWKB(GeometryCollection(Point(44, 6), LineString(Point(3, 6), Point(7, 9))))); (121, GeometryFromWKB(GeometryCollection(Point(44, 6), LineString(Point(3, 6), Point(7, 9)))));
INSERT into geo SELECT * FROM pt; INSERT into gis_geometry SELECT * FROM gis_point;
INSERT into geo SELECT * FROM ls; INSERT into gis_geometry SELECT * FROM gis_line;
INSERT into geo SELECT * FROM p; INSERT into gis_geometry SELECT * FROM gis_polygon;
INSERT into geo SELECT * FROM mpt; INSERT into gis_geometry SELECT * FROM gis_multi_point;
INSERT into geo SELECT * FROM mls; INSERT into gis_geometry SELECT * FROM gis_multi_line;
INSERT into geo SELECT * FROM mp; INSERT into gis_geometry SELECT * FROM gis_multi_polygon;
INSERT into geo SELECT * FROM gc; INSERT into gis_geometry SELECT * FROM gis_geometrycollection;
SELECT fid, AsText(g) FROM pt; SELECT fid, AsText(g) FROM gis_point;
SELECT fid, AsText(g) FROM ls; SELECT fid, AsText(g) FROM gis_line;
SELECT fid, AsText(g) FROM p; SELECT fid, AsText(g) FROM gis_polygon;
SELECT fid, AsText(g) FROM mpt; SELECT fid, AsText(g) FROM gis_multi_point;
SELECT fid, AsText(g) FROM mls; SELECT fid, AsText(g) FROM gis_multi_line;
SELECT fid, AsText(g) FROM mp; SELECT fid, AsText(g) FROM gis_multi_polygon;
SELECT fid, AsText(g) FROM gc; SELECT fid, AsText(g) FROM gis_geometrycollection;
SELECT fid, AsText(g) FROM geo; SELECT fid, AsText(g) FROM gis_geometry;
SELECT fid, Dimension(g) FROM geo; SELECT fid, Dimension(g) FROM gis_geometry;
SELECT fid, GeometryType(g) FROM geo; SELECT fid, GeometryType(g) FROM gis_geometry;
SELECT fid, IsEmpty(g) FROM geo; SELECT fid, IsEmpty(g) FROM gis_geometry;
SELECT fid, AsText(Envelope(g)) FROM geo; SELECT fid, AsText(Envelope(g)) FROM gis_geometry;
explain extended select Dimension(g), GeometryType(g), IsEmpty(g), AsText(Envelope(g)) from geo; explain extended select Dimension(g), GeometryType(g), IsEmpty(g), AsText(Envelope(g)) from gis_geometry;
SELECT fid, X(g) FROM pt; SELECT fid, X(g) FROM gis_point;
SELECT fid, Y(g) FROM pt; SELECT fid, Y(g) FROM gis_point;
explain extended select X(g),Y(g) FROM pt; explain extended select X(g),Y(g) FROM gis_point;
SELECT fid, AsText(StartPoint(g)) FROM ls; SELECT fid, AsText(StartPoint(g)) FROM gis_line;
SELECT fid, AsText(EndPoint(g)) FROM ls; SELECT fid, AsText(EndPoint(g)) FROM gis_line;
SELECT fid, GLength(g) FROM ls; SELECT fid, GLength(g) FROM gis_line;
SELECT fid, NumPoints(g) FROM ls; SELECT fid, NumPoints(g) FROM gis_line;
SELECT fid, AsText(PointN(g, 2)) FROM ls; SELECT fid, AsText(PointN(g, 2)) FROM gis_line;
SELECT fid, IsClosed(g) FROM ls; SELECT fid, IsClosed(g) FROM gis_line;
explain extended select AsText(StartPoint(g)),AsText(EndPoint(g)),GLength(g),NumPoints(g),AsText(PointN(g, 2)),IsClosed(g) FROM ls; explain extended select AsText(StartPoint(g)),AsText(EndPoint(g)),GLength(g),NumPoints(g),AsText(PointN(g, 2)),IsClosed(g) FROM gis_line;
SELECT fid, AsText(Centroid(g)) FROM p; SELECT fid, AsText(Centroid(g)) FROM gis_polygon;
SELECT fid, Area(g) FROM p; SELECT fid, Area(g) FROM gis_polygon;
SELECT fid, AsText(ExteriorRing(g)) FROM p; SELECT fid, AsText(ExteriorRing(g)) FROM gis_polygon;
SELECT fid, NumInteriorRings(g) FROM p; SELECT fid, NumInteriorRings(g) FROM gis_polygon;
SELECT fid, AsText(InteriorRingN(g, 1)) FROM p; SELECT fid, AsText(InteriorRingN(g, 1)) FROM gis_polygon;
explain extended select AsText(Centroid(g)),Area(g),AsText(ExteriorRing(g)),NumInteriorRings(g),AsText(InteriorRingN(g, 1)) FROM p; explain extended select AsText(Centroid(g)),Area(g),AsText(ExteriorRing(g)),NumInteriorRings(g),AsText(InteriorRingN(g, 1)) FROM gis_polygon;
SELECT fid, IsClosed(g) FROM mls; SELECT fid, IsClosed(g) FROM gis_multi_line;
SELECT fid, AsText(Centroid(g)) FROM mp; SELECT fid, AsText(Centroid(g)) FROM gis_multi_polygon;
SELECT fid, Area(g) FROM mp; SELECT fid, Area(g) FROM gis_multi_polygon;
SELECT fid, NumGeometries(g) from mpt; SELECT fid, NumGeometries(g) from gis_multi_point;
SELECT fid, NumGeometries(g) from mls; SELECT fid, NumGeometries(g) from gis_multi_line;
SELECT fid, NumGeometries(g) from mp; SELECT fid, NumGeometries(g) from gis_multi_polygon;
SELECT fid, NumGeometries(g) from gc; SELECT fid, NumGeometries(g) from gis_geometrycollection;
explain extended SELECT fid, NumGeometries(g) from mpt; explain extended SELECT fid, NumGeometries(g) from gis_multi_point;
SELECT fid, AsText(GeometryN(g, 2)) from mpt; SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_point;
SELECT fid, AsText(GeometryN(g, 2)) from mls; SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_line;
SELECT fid, AsText(GeometryN(g, 2)) from mp; SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_polygon;
SELECT fid, AsText(GeometryN(g, 2)) from gc; SELECT fid, AsText(GeometryN(g, 2)) from gis_geometrycollection;
explain extended SELECT fid, AsText(GeometryN(g, 2)) from mpt; SELECT fid, AsText(GeometryN(g, 1)) from gis_geometrycollection;
explain extended SELECT fid, AsText(GeometryN(g, 2)) from gis_multi_point;
SELECT g1.fid as first, g2.fid as second, SELECT g1.fid as first, g2.fid as second,
Within(g1.g, g2.g) as w, Contains(g1.g, g2.g) as c, Overlaps(g1.g, g2.g) as o, Within(g1.g, g2.g) as w, Contains(g1.g, g2.g) as c, Overlaps(g1.g, g2.g) as o,
Equals(g1.g, g2.g) as e, Disjoint(g1.g, g2.g) as d, Touches(g1.g, g2.g) as t, Equals(g1.g, g2.g) as e, Disjoint(g1.g, g2.g) as d, Touches(g1.g, g2.g) as t,
Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r
FROM gc g1, gc g2 ORDER BY first, second; FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second;
explain extended SELECT g1.fid as first, g2.fid as second, explain extended SELECT g1.fid as first, g2.fid as second,
Within(g1.g, g2.g) as w, Contains(g1.g, g2.g) as c, Overlaps(g1.g, g2.g) as o, Within(g1.g, g2.g) as w, Contains(g1.g, g2.g) as c, Overlaps(g1.g, g2.g) as o,
Equals(g1.g, g2.g) as e, Disjoint(g1.g, g2.g) as d, Touches(g1.g, g2.g) as t, Equals(g1.g, g2.g) as e, Disjoint(g1.g, g2.g) as d, Touches(g1.g, g2.g) as t,
Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r
FROM gc g1, gc g2 ORDER BY first, second; FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second;
DROP TABLE pt, ls, p, mpt, mls, mp, gc, geo; DROP TABLE gis_point, gis_line, gis_polygon, gis_multi_point, gis_multi_line, gis_multi_polygon, gis_geometrycollection, gis_geometry;
# #
# Check that ALTER TABLE doesn't loose geometry type # Check that ALTER TABLE doesn't loose geometry type
# #
CREATE TABLE g1 ( CREATE TABLE t1 (
pt point, gp point,
ln linestring, ln linestring,
pg polygon, pg polygon,
mpt multipoint, mp multipoint,
mln multilinestring, mln multilinestring,
mpg multipolygon, mpg multipolygon,
gc geometrycollection, gc geometrycollection,
gm geometry gm geometry
); );
SHOW FIELDS FROM g1; SHOW FIELDS FROM t1;
ALTER TABLE g1 ADD fid INT NOT NULL; ALTER TABLE t1 ADD fid INT NOT NULL;
SHOW FIELDS FROM g1; SHOW FIELDS FROM t1;
DROP TABLE g1; DROP TABLE t1;
SELECT AsText(GeometryFromWKB(AsWKB(GeometryFromText('POINT(1 4)')))); SELECT AsText(GeometryFromWKB(AsWKB(GeometryFromText('POINT(1 4)'))));
explain extended SELECT AsText(GeometryFromWKB(AsWKB(GeometryFromText('POINT(1 4)')))); explain extended SELECT AsText(GeometryFromWKB(AsWKB(GeometryFromText('POINT(1 4)'))));

6
mysys/hash.c
View File

@ -215,9 +215,9 @@ static int hashcmp(HASH *hash,HASH_LINK *pos,const byte *key,uint length)
{ {
uint rec_keylength; uint rec_keylength;
byte *rec_key= (byte*) hash_key(hash,pos->data,&rec_keylength,1); byte *rec_key= (byte*) hash_key(hash,pos->data,&rec_keylength,1);
return (length && length != rec_keylength) || return ((length && length != rec_keylength) ||
my_strnncoll(hash->charset, (uchar*) rec_key, rec_keylength, my_strnncoll(hash->charset, (uchar*) rec_key, rec_keylength,
(uchar*) key, length); (uchar*) key, length));
} }

21
mysys/tree.c
View File

@ -170,8 +170,8 @@ void delete_tree(TREE* tree)
void reset_tree(TREE* tree) void reset_tree(TREE* tree)
{ {
/* do not free mem_root, just mark blocks as free */
free_tree(tree, MYF(MY_MARK_BLOCKS_FREE)); free_tree(tree, MYF(MY_MARK_BLOCKS_FREE));
/* do not my_free() mem_root if applicable, just mark blocks as free */
} }
@ -188,10 +188,14 @@ static void delete_tree_element(TREE *tree, TREE_ELEMENT *element)
} }
} }
/* Code for insert, search and delete of elements */
/* parent[0] = & parent[-1][0]->left ||
parent[0] = & parent[-1][0]->right */
/*
insert, search and delete of elements
The following should be true:
parent[0] = & parent[-1][0]->left ||
parent[0] = & parent[-1][0]->right
*/
TREE_ELEMENT *tree_insert(TREE *tree, void *key, uint key_size, TREE_ELEMENT *tree_insert(TREE *tree, void *key, uint key_size,
void* custom_arg) void* custom_arg)
@ -232,8 +236,7 @@ TREE_ELEMENT *tree_insert(TREE *tree, void *key, uint key_size,
if (tree->with_delete) if (tree->with_delete)
element=(TREE_ELEMENT *) my_malloc(alloc_size, MYF(MY_WME)); element=(TREE_ELEMENT *) my_malloc(alloc_size, MYF(MY_WME));
else else
element=(TREE_ELEMENT *) element=(TREE_ELEMENT *) alloc_root(&tree->mem_root,alloc_size);
alloc_root(&tree->mem_root,alloc_size);
if (!element) if (!element)
return(NULL); return(NULL);
**parent=element; **parent=element;
@ -251,9 +254,9 @@ TREE_ELEMENT *tree_insert(TREE *tree, void *key, uint key_size,
} }
else else
memcpy((byte*) element+tree->offset_to_key,key,(size_t) key_size); memcpy((byte*) element+tree->offset_to_key,key,(size_t) key_size);
element->count=1; /* May give warning in purify */ element->count=1; /* May give warning in purify */
tree->elements_in_tree++; tree->elements_in_tree++;
rb_insert(tree,parent,element); /* rebalance tree */ rb_insert(tree,parent,element); /* rebalance tree */
} }
else else
{ {
@ -320,6 +323,8 @@ int tree_delete(TREE *tree, void *key, void *custom_arg)
rb_delete_fixup(tree,parent); rb_delete_fixup(tree,parent);
if (tree->free) if (tree->free)
(*tree->free)(ELEMENT_KEY(tree,element), free_free, tree->custom_arg); (*tree->free)(ELEMENT_KEY(tree,element), free_free, tree->custom_arg);
/* This doesn't include key_size, but better than nothing */
tree->allocated-= sizeof(TREE_ELEMENT)+tree->size_of_element;
my_free((gptr) element,MYF(0)); my_free((gptr) element,MYF(0));
tree->elements_in_tree--; tree->elements_in_tree--;
return 0; return 0;

70
sql/field.cc
View File

@ -4715,18 +4715,26 @@ void Field_blob::get_key_image(char *buff,uint length,
#ifdef HAVE_SPATIAL #ifdef HAVE_SPATIAL
if (type == itMBR) if (type == itMBR)
{ {
if (!blob_length) const char *dummy;
return;
get_ptr(&blob);
MBR mbr; MBR mbr;
Geometry gobj; Geometry gobj;
if (blob_length < SRID_SIZE)
{
bzero(buff, SIZEOF_STORED_DOUBLE*4);
return;
}
get_ptr(&blob);
gobj.create_from_wkb(blob + SRID_SIZE, blob_length - SRID_SIZE); gobj.create_from_wkb(blob + SRID_SIZE, blob_length - SRID_SIZE);
gobj.get_mbr(&mbr); if (gobj.get_mbr(&mbr, &dummy))
float8store(buff, mbr.xmin); bzero(buff, SIZEOF_STORED_DOUBLE*4);
float8store(buff+8, mbr.xmax); else
float8store(buff+16, mbr.ymin); {
float8store(buff+24, mbr.ymax); float8store(buff, mbr.xmin);
float8store(buff+8, mbr.xmax);
float8store(buff+16, mbr.ymin);
float8store(buff+24, mbr.ymax);
}
return; return;
} }
#endif /*HAVE_SPATIAL*/ #endif /*HAVE_SPATIAL*/
@ -4939,6 +4947,7 @@ uint Field_blob::max_packed_col_length(uint max_length)
return (max_length > 255 ? 2 : 1)+max_length; return (max_length > 255 ? 2 : 1)+max_length;
} }
#ifdef HAVE_SPATIAL #ifdef HAVE_SPATIAL
void Field_geom::get_key_image(char *buff, uint length, CHARSET_INFO *cs, void Field_geom::get_key_image(char *buff, uint length, CHARSET_INFO *cs,
@ -4947,17 +4956,26 @@ void Field_geom::get_key_image(char *buff, uint length, CHARSET_INFO *cs,
length-= HA_KEY_BLOB_LENGTH; length-= HA_KEY_BLOB_LENGTH;
ulong blob_length= get_length(ptr); ulong blob_length= get_length(ptr);
char *blob; char *blob;
get_ptr(&blob); const char *dummy;
MBR mbr; MBR mbr;
if (blob_length < SRID_SIZE)
{
bzero(buff, SIZEOF_STORED_DOUBLE*4);
return;
}
get_ptr(&blob);
Geometry gobj; Geometry gobj;
gobj.create_from_wkb(blob + SRID_SIZE, blob_length - SRID_SIZE); gobj.create_from_wkb(blob + SRID_SIZE, blob_length - SRID_SIZE);
gobj.get_mbr(&mbr); if (gobj.get_mbr(&mbr, &dummy))
float8store(buff, mbr.xmin); bzero(buff, SIZEOF_STORED_DOUBLE*4);
float8store(buff + 8, mbr.xmax); else
float8store(buff + 16, mbr.ymin); {
float8store(buff + 24, mbr.ymax); float8store(buff, mbr.xmin);
return; float8store(buff + 8, mbr.xmax);
float8store(buff + 16, mbr.ymin);
float8store(buff + 24, mbr.ymax);
}
} }
@ -5001,16 +5019,16 @@ void Field_geom::sql_type(String &res) const
int Field_geom::store(const char *from, uint length, CHARSET_INFO *cs) int Field_geom::store(const char *from, uint length, CHARSET_INFO *cs)
{ {
if (!length) if (!length)
{
bzero(ptr, Field_blob::pack_length()); bzero(ptr, Field_blob::pack_length());
}
else else
{ {
// Should check given WKB // Check given WKB
if (length < 4 + 1 + 4 + 8 + 8) // SRID + WKB_HEADER + X + Y uint32 wkb_type;
return 1; if (length < SRID_SIZE + WKB_HEADER_SIZE + SIZEOF_STORED_DOUBLE*2)
uint32 wkb_type= uint4korr(from + 5); goto err;
if (wkb_type < 1 || wkb_type > 7) wkb_type= uint4korr(from + WKB_HEADER_SIZE);
if (wkb_type < (uint32) Geometry::wkbPoint ||
wkb_type > (uint32) Geometry::wkb_end)
return 1; return 1;
Field_blob::store_length(length); Field_blob::store_length(length);
if (table->copy_blobs || length <= MAX_FIELD_WIDTH) if (table->copy_blobs || length <= MAX_FIELD_WIDTH)
@ -5021,6 +5039,10 @@ int Field_geom::store(const char *from, uint length, CHARSET_INFO *cs)
bmove(ptr + packlength, (char*) &from, sizeof(char*)); bmove(ptr + packlength, (char*) &from, sizeof(char*));
} }
return 0; return 0;
err:
bzero(ptr, Field_blob::pack_length());
return 1;
} }
#endif /*HAVE_SPATIAL*/ #endif /*HAVE_SPATIAL*/

198
sql/gstream.cc
View File

@ -1,139 +1,115 @@
/* Copyright (C) 2004 MySQL 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 */
/*
Functions to read and parse geometrical data.
NOTE: These functions assumes that the string is end \0 terminated!
*/
#include "mysql_priv.h" #include "mysql_priv.h"
int GTextReadStream::get_next_toc_type() const enum Gis_read_stream::enum_tok_types Gis_read_stream::get_next_toc_type()
{ {
const char *cur = m_cur; skip_space();
while ((*cur)&&(strchr(" \t\r\n",*cur))) if (!*m_cur)
{
cur++;
}
if (!(*cur))
{
return eostream; return eostream;
} if (my_isvar_start(&my_charset_bin, *m_cur))
if (((*cur>='a') && (*cur<='z')) || ((*cur>='A') && (*cur<='Z')) ||
(*cur=='_'))
{
return word; return word;
} if ((*m_cur >= '0' && *m_cur <= '9') || *m_cur == '-' || *m_cur == '+')
if (((*cur>='0') && (*cur<='9')) || (*cur=='-') || (*cur=='+') ||
(*cur=='.'))
{
return numeric; return numeric;
} if (*m_cur == '(')
if (*cur == '(')
{
return l_bra; return l_bra;
} if (*m_cur == ')')
if (*cur == ')')
{
return r_bra; return r_bra;
} if (*m_cur == ',')
if (*cur == ',')
{
return comma; return comma;
}
return unknown; return unknown;
} }
const char *GTextReadStream::get_next_word(int *word_len)
bool Gis_read_stream::get_next_word(LEX_STRING *res)
{ {
const char *cur = m_cur; skip_space();
while ((*cur)&&(strchr(" \t\r\n",*cur))) res->str= (char*) m_cur;
{ /* The following will also test for \0 */
cur++; if (!my_isvar_start(&my_charset_bin, *m_cur))
}
m_last_text_position = cur;
if (!(*cur))
{
return 0;
}
const char *wd_start = cur;
if (((*cur<'a') || (*cur>'z')) && ((*cur<'A') || (*cur>'Z')) && (*cur!='_'))
{
return NULL;
}
++cur;
while (((*cur>='a') && (*cur<='z')) || ((*cur>='A') && (*cur<='Z')) ||
(*cur=='_') || ((*cur>='0') && (*cur<='9')))
{
++cur;
}
*word_len = cur - wd_start;
m_cur = cur;
return wd_start;
}
int GTextReadStream::get_next_number(double *d)
{
const char *cur = m_cur;
while ((*cur)&&(strchr(" \t\r\n",*cur)))
{
cur++;
}
m_last_text_position = cur;
if (!(*cur))
{
set_error_msg("Numeric constant expected");
return 1; return 1;
}
if (((*cur<'0') || (*cur>'9')) && (*cur!='-') && (*cur!='+') && (*cur!='.')) /*
{ We can't combine the following increment with my_isvar() because
set_error_msg("Numeric constant expected"); my_isvar() is a macro that would cause side effects
return 1; */
} m_cur++;
while (my_isvar(&my_charset_bin, *m_cur))
char *endptr; m_cur++;
*d = my_strtod(cur, &endptr);
if (endptr)
{
m_cur = endptr;
}
res->length= (uint32) (m_cur - res->str);
return 0; return 0;
} }
char GTextReadStream::get_next_symbol()
/*
Read a floating point number
NOTE: Number must start with a digit or sign. It can't start with a decimal
point
*/
bool Gis_read_stream::get_next_number(double *d)
{ {
const char *cur = m_cur; char *endptr;
while ((*cur)&&(strchr(" \t\r\n",*cur)))
skip_space();
/* The following will also test for end \0 */
if ((*m_cur < '0' || *m_cur > '9') && *m_cur != '-' && *m_cur != '+')
{ {
cur++; set_error_msg("Numeric constant expected");
} return 1;
if (!(*cur))
{
return 0;
} }
m_cur = cur + 1; *d = my_strtod(m_cur, &endptr);
m_last_text_position = cur; if (endptr)
m_cur = endptr;
return *cur; return 0;
} }
void GTextReadStream::set_error_msg(const char *msg)
bool Gis_read_stream::check_next_symbol(char symbol)
{ {
size_t len = strlen(msg); skip_space();
m_err_msg = (char *)my_realloc(m_err_msg, len + 1, MYF(MY_ALLOW_ZERO_PTR)); if (*m_cur != symbol)
{
char buff[32];
strmov(buff, "'?' expected");
buff[2]= symbol;
set_error_msg(buff);
return 1;
}
m_cur++;
return 0;
}
/*
Remember error message.
*/
void Gis_read_stream::set_error_msg(const char *msg)
{
size_t len= strlen(msg); // ok in this context
m_err_msg= (char *) my_realloc(m_err_msg, len + 1, MYF(MY_ALLOW_ZERO_PTR));
memcpy(m_err_msg, msg, len + 1); memcpy(m_err_msg, msg, len + 1);
} }

40
sql/gstream.h
View File

@ -15,10 +15,10 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
class GTextReadStream class Gis_read_stream
{ {
public: public:
enum TokTypes enum enum_tok_types
{ {
unknown, unknown,
eostream, eostream,
@ -29,41 +29,47 @@ public:
comma comma
}; };
GTextReadStream(const char *buffer, int size) Gis_read_stream(const char *buffer, int size)
:m_cur(buffer), m_limit(buffer + size), m_last_text_position(buffer), :m_cur(buffer), m_limit(buffer + size), m_err_msg(NULL)
m_err_msg(NULL)
{} {}
GTextReadStream(): m_cur(NULL), m_limit(NULL), m_err_msg(NULL) Gis_read_stream(): m_cur(NullS), m_limit(NullS), m_err_msg(NullS)
{} {}
~Gis_read_stream()
~GTextReadStream()
{ {
my_free(m_err_msg, MYF(MY_ALLOW_ZERO_PTR)); my_free(m_err_msg, MYF(MY_ALLOW_ZERO_PTR));
} }
int get_next_toc_type() const; enum enum_tok_types get_next_toc_type();
const char *get_next_word(int *word_len); bool get_next_word(LEX_STRING *);
int get_next_number(double *d); bool get_next_number(double *);
char get_next_symbol(); bool check_next_symbol(char);
const char *get_last_text_position() const inline void skip_space()
{ {
return m_last_text_position; while (my_isspace(&my_charset_latin1, *m_cur))
m_cur++;
}
/* Skip next character, if match. Return 1 if no match */
inline bool skip_char(char skip)
{
skip_space();
if (*m_cur != skip)
return 1; /* Didn't find char */
m_cur++;
return 0;
} }
void set_error_msg(const char *msg); void set_error_msg(const char *msg);
// caller should free this pointer // caller should free this pointer
char *get_error_msg() char *get_error_msg()
{ {
char *err_msg = m_err_msg; char *err_msg = m_err_msg;
m_err_msg = NULL; m_err_msg= NullS;
return err_msg; return err_msg;
} }
protected: protected:
const char *m_cur; const char *m_cur;
const char *m_limit; const char *m_limit;
const char *m_last_text_position;
char *m_err_msg; char *m_err_msg;
}; };

1
sql/item_create.cc
View File

@ -455,6 +455,7 @@ Item *create_func_cast(Item *a, Cast_target cast_type, int len,
{ {
Item *res; Item *res;
LINT_INIT(res); LINT_INIT(res);
switch (cast_type) { switch (cast_type) {
case ITEM_CAST_BINARY: res= new Item_func_binary(a); break; case ITEM_CAST_BINARY: res= new Item_func_binary(a); break;
case ITEM_CAST_SIGNED_INT: res= new Item_func_signed(a); break; case ITEM_CAST_SIGNED_INT: res= new Item_func_signed(a); break;

226
sql/item_geofunc.cc
View File

@ -27,18 +27,17 @@
#include "sql_acl.h" #include "sql_acl.h"
#include <m_ctype.h> #include <m_ctype.h>
String *Item_func_geometry_from_text::val_str(String *str) String *Item_func_geometry_from_text::val_str(String *str)
{ {
Geometry geom; Geometry geom;
String arg_val; String arg_val;
String *wkt= args[0]->val_str(&arg_val); String *wkt= args[0]->val_str(&arg_val);
GTextReadStream trs(wkt->ptr(), wkt->length()); Gis_read_stream trs(wkt->c_ptr(), wkt->length());
uint32 srid; uint32 srid= 0;
if ((arg_count == 2) && !args[1]->null_value) if ((arg_count == 2) && !args[1]->null_value)
srid= (uint32)args[1]->val_int(); srid= (uint32)args[1]->val_int();
else
srid= 0;
if (str->reserve(SRID_SIZE, 512)) if (str->reserve(SRID_SIZE, 512))
return 0; return 0;
@ -61,22 +60,19 @@ String *Item_func_geometry_from_wkb::val_str(String *str)
String arg_val; String arg_val;
String *wkb= args[0]->val_str(&arg_val); String *wkb= args[0]->val_str(&arg_val);
Geometry geom; Geometry geom;
uint32 srid; uint32 srid= 0;
if ((arg_count == 2) && !args[1]->null_value) if ((arg_count == 2) && !args[1]->null_value)
srid= (uint32)args[1]->val_int(); srid= (uint32)args[1]->val_int();
else
srid= 0;
if (str->reserve(SRID_SIZE, 512)) if (str->reserve(SRID_SIZE, 512))
return 0; return 0;
str->length(0); str->length(0);
str->q_append(srid); str->q_append(srid);
if ((null_value= (args[0]->null_value || if ((null_value= (args[0]->null_value ||
geom.create_from_wkb(wkb->ptr(), wkb->length())))) geom.create_from_wkb(wkb->ptr(), wkb->length()))) ||
str->append(*wkb))
return 0; return 0;
str->append(*wkb);
return str; return str;
} }
@ -92,6 +88,7 @@ String *Item_func_as_wkt::val_str(String *str)
String arg_val; String arg_val;
String *swkb= args[0]->val_str(&arg_val); String *swkb= args[0]->val_str(&arg_val);
Geometry geom; Geometry geom;
const char *dummy;
if ((null_value= (args[0]->null_value || if ((null_value= (args[0]->null_value ||
geom.create_from_wkb(swkb->ptr() + SRID_SIZE, geom.create_from_wkb(swkb->ptr() + SRID_SIZE,
@ -99,18 +96,19 @@ String *Item_func_as_wkt::val_str(String *str)
return 0; return 0;
str->length(0); str->length(0);
if ((null_value= geom.as_wkt(str, &dummy)))
if ((null_value= geom.as_wkt(str)))
return 0; return 0;
return str; return str;
} }
void Item_func_as_wkt::fix_length_and_dec() void Item_func_as_wkt::fix_length_and_dec()
{ {
max_length=MAX_BLOB_WIDTH; max_length=MAX_BLOB_WIDTH;
} }
String *Item_func_as_wkb::val_str(String *str) String *Item_func_as_wkb::val_str(String *str)
{ {
String arg_val; String arg_val;
@ -127,11 +125,13 @@ String *Item_func_as_wkb::val_str(String *str)
return str; return str;
} }
void Item_func_as_wkb::fix_length_and_dec() void Item_func_as_wkb::fix_length_and_dec()
{ {
max_length= MAX_BLOB_WIDTH; max_length= MAX_BLOB_WIDTH;
} }
String *Item_func_geometry_type::val_str(String *str) String *Item_func_geometry_type::val_str(String *str)
{ {
String *swkb= args[0]->val_str(str); String *swkb= args[0]->val_str(str);
@ -141,9 +141,10 @@ String *Item_func_geometry_type::val_str(String *str)
geom.create_from_wkb(swkb->ptr() + SRID_SIZE, geom.create_from_wkb(swkb->ptr() + SRID_SIZE,
swkb->length() - SRID_SIZE)))) swkb->length() - SRID_SIZE))))
return 0; return 0;
str->copy(geom.get_class_info()->m_name, /* String will not move */
strlen(geom.get_class_info()->m_name), str->set(geom.get_class_info()->m_name.str,
default_charset()); geom.get_class_info()->m_name.length,
default_charset());
return str; return str;
} }
@ -153,13 +154,14 @@ String *Item_func_envelope::val_str(String *str)
String arg_val; String arg_val;
String *swkb= args[0]->val_str(&arg_val); String *swkb= args[0]->val_str(&arg_val);
Geometry geom; Geometry geom;
uint32 srid;
if ((null_value= args[0]->null_value || if ((null_value= args[0]->null_value ||
geom.create_from_wkb(swkb->ptr() + SRID_SIZE, geom.create_from_wkb(swkb->ptr() + SRID_SIZE,
swkb->length() - SRID_SIZE))) swkb->length() - SRID_SIZE)))
return 0; return 0;
uint32 srid= uint4korr(swkb->ptr()); srid= uint4korr(swkb->ptr());
str->length(0); str->length(0);
if (str->reserve(SRID_SIZE, 512)) if (str->reserve(SRID_SIZE, 512))
return 0; return 0;
@ -173,20 +175,21 @@ String *Item_func_centroid::val_str(String *str)
String arg_val; String arg_val;
String *swkb= args[0]->val_str(&arg_val); String *swkb= args[0]->val_str(&arg_val);
Geometry geom; Geometry geom;
uint32 srid;
if ((null_value= args[0]->null_value || if ((null_value= args[0]->null_value ||
geom.create_from_wkb(swkb->ptr() + SRID_SIZE, geom.create_from_wkb(swkb->ptr() + SRID_SIZE,
swkb->length() - SRID_SIZE) || swkb->length() - SRID_SIZE) ||
!GEOM_METHOD_PRESENT(geom, centroid))) !GEOM_METHOD_PRESENT(geom, centroid)))
return 0; return 0;
if (str->reserve(SRID_SIZE, 512)) if (str->reserve(SRID_SIZE, 512))
return 0; return 0;
str->length(0); str->length(0);
uint32 srid= uint4korr(swkb->ptr()); srid= uint4korr(swkb->ptr());
str->q_append(srid); str->q_append(srid);
return (null_value= geom.centroid(str)) ? 0 : str; return (null_value= test(geom.centroid(str))) ? 0 : str;
} }
@ -199,42 +202,42 @@ String *Item_func_spatial_decomp::val_str(String *str)
String arg_val; String arg_val;
String *swkb= args[0]->val_str(&arg_val); String *swkb= args[0]->val_str(&arg_val);
Geometry geom; Geometry geom;
uint32 srid;
if ((null_value= (args[0]->null_value || if ((null_value= (args[0]->null_value ||
geom.create_from_wkb(swkb->ptr() + SRID_SIZE, geom.create_from_wkb(swkb->ptr() + SRID_SIZE,
swkb->length() - SRID_SIZE)))) swkb->length() - SRID_SIZE))))
return 0; return 0;
null_value= 1; srid= uint4korr(swkb->ptr());
if (str->reserve(SRID_SIZE, 512)) if (str->reserve(SRID_SIZE, 512))
return 0; goto err;
str->length(0); str->length(0);
uint32 srid= uint4korr(swkb->ptr());
str->q_append(srid); str->q_append(srid);
switch(decomp_func) switch (decomp_func) {
{
case SP_STARTPOINT: case SP_STARTPOINT:
if (!GEOM_METHOD_PRESENT(geom,start_point) || geom.start_point(str)) if (!GEOM_METHOD_PRESENT(geom,start_point) || geom.start_point(str))
goto ret; goto err;
break; break;
case SP_ENDPOINT: case SP_ENDPOINT:
if (!GEOM_METHOD_PRESENT(geom,end_point) || geom.end_point(str)) if (!GEOM_METHOD_PRESENT(geom,end_point) || geom.end_point(str))
goto ret; goto err;
break; break;
case SP_EXTERIORRING: case SP_EXTERIORRING:
if (!GEOM_METHOD_PRESENT(geom,exterior_ring) || geom.exterior_ring(str)) if (!GEOM_METHOD_PRESENT(geom,exterior_ring) || geom.exterior_ring(str))
goto ret; goto err;
break; break;
default: default:
goto ret; goto err;
} }
null_value= 0; return str;
ret: err:
return null_value ? 0 : str; null_value= 1;
return 0;
} }
@ -244,43 +247,44 @@ String *Item_func_spatial_decomp_n::val_str(String *str)
String *swkb= args[0]->val_str(&arg_val); String *swkb= args[0]->val_str(&arg_val);
long n= (long) args[1]->val_int(); long n= (long) args[1]->val_int();
Geometry geom; Geometry geom;
uint32 srid;
if ((null_value= (args[0]->null_value || args[1]->null_value || if ((null_value= (args[0]->null_value || args[1]->null_value ||
geom.create_from_wkb(swkb->ptr() + SRID_SIZE, geom.create_from_wkb(swkb->ptr() + SRID_SIZE,
swkb->length() - SRID_SIZE)))) swkb->length() - SRID_SIZE))))
return 0; return 0;
null_value= 1;
if (str->reserve(SRID_SIZE, 512)) if (str->reserve(SRID_SIZE, 512))
return 0; goto err;
srid= uint4korr(swkb->ptr());
str->length(0); str->length(0);
uint32 srid= uint4korr(swkb->ptr());
str->q_append(srid); str->q_append(srid);
switch(decomp_func_n) switch (decomp_func_n)
{ {
case SP_POINTN: case SP_POINTN:
if (!GEOM_METHOD_PRESENT(geom,point_n) || geom.point_n(n,str)) if (!GEOM_METHOD_PRESENT(geom,point_n) || geom.point_n(n,str))
goto ret; goto err;
break; break;
case SP_GEOMETRYN: case SP_GEOMETRYN:
if (!GEOM_METHOD_PRESENT(geom,geometry_n) || geom.geometry_n(n,str)) if (!GEOM_METHOD_PRESENT(geom,geometry_n) || geom.geometry_n(n,str))
goto ret; goto err;
break; break;
case SP_INTERIORRINGN: case SP_INTERIORRINGN:
if (!GEOM_METHOD_PRESENT(geom,interior_ring_n) || if (!GEOM_METHOD_PRESENT(geom,interior_ring_n) ||
geom.interior_ring_n(n,str)) geom.interior_ring_n(n,str))
goto ret; goto err;
break; break;
default: default:
goto ret; goto err;
} }
null_value= 0; return str;
ret: err:
return null_value ? 0 : str; null_value=1;
return 0;
} }
@ -299,9 +303,9 @@ String *Item_func_point::val_str(String *str)
double x= args[0]->val(); double x= args[0]->val();
double y= args[1]->val(); double y= args[1]->val();
if ( (null_value= (args[0]->null_value || if ((null_value= (args[0]->null_value ||
args[1]->null_value || args[1]->null_value ||
str->realloc(1 + 4 + 8 + 8)))) str->realloc(1 + 4 + SIZEOF_STORED_DOUBLE*2))))
return 0; return 0;
str->length(0); str->length(0);
@ -328,11 +332,9 @@ String *Item_func_spatial_collection::val_str(String *str)
String arg_value; String arg_value;
uint i; uint i;
null_value= 1;
str->length(0); str->length(0);
if (str->reserve(1 + 4 + 4, 512)) if (str->reserve(1 + 4 + 4, 512))
return 0; goto err;
str->q_append((char) Geometry::wkbNDR); str->q_append((char) Geometry::wkbNDR);
str->q_append((uint32) coll_type); str->q_append((uint32) coll_type);
@ -342,19 +344,16 @@ String *Item_func_spatial_collection::val_str(String *str)
{ {
String *res= args[i]->val_str(&arg_value); String *res= args[i]->val_str(&arg_value);
if (args[i]->null_value) if (args[i]->null_value)
goto ret; goto err;
if ( coll_type == Geometry::wkbGeometryCollection ) if (coll_type == Geometry::wkbGeometryCollection)
{ {
/* /*
In the case of GeometryCollection we don't need In the case of GeometryCollection we don't need any checkings
any checkings for item types, so just copy them for item types, so just copy them into target collection
into target collection
*/ */
if ((null_value= str->reserve(res->length(), 512))) if (str->append(res->ptr(), res->length(), (uint32) 512))
goto ret; goto err;
str->q_append(res->ptr(), res->length());
} }
else else
{ {
@ -363,86 +362,75 @@ String *Item_func_spatial_collection::val_str(String *str)
const char *data= res->ptr() + 1; const char *data= res->ptr() + 1;
/* /*
In the case of named collection we must to In the case of named collection we must to check that items
check that items are of specific type, let's are of specific type, let's do this checking now
do this checking now
*/ */
if (len < 5) if (len < 5)
goto ret; goto err;
wkb_type= (Geometry::wkbType) uint4korr(data); wkb_type= (Geometry::wkbType) uint4korr(data);
data+= 4; data+= 4;
len-= 5; len-= 5;
if (wkb_type != item_type) if (wkb_type != item_type)
goto ret; goto err;
switch (coll_type) { switch (coll_type) {
case Geometry::wkbMultiPoint: case Geometry::wkbMultiPoint:
case Geometry::wkbMultiLineString: case Geometry::wkbMultiLineString:
case Geometry::wkbMultiPolygon: case Geometry::wkbMultiPolygon:
if (len < WKB_HEADER_SIZE) if (len < WKB_HEADER_SIZE ||
goto ret; str->append(data-WKB_HEADER_SIZE, len+WKB_HEADER_SIZE, 512))
goto err;
data-= WKB_HEADER_SIZE;
len+= WKB_HEADER_SIZE;
if (str->reserve(len, 512))
goto ret;
str->q_append(data, len);
break; break;
case Geometry::wkbLineString: case Geometry::wkbLineString:
if (str->reserve(POINT_DATA_SIZE, 512)) if (str->append(data, POINT_DATA_SIZE, 512))
goto ret; goto err;
str->q_append(data, POINT_DATA_SIZE);
break; break;
case Geometry::wkbPolygon: case Geometry::wkbPolygon:
{ {
uint32 n_points; uint32 n_points;
double x1, y1, x2, y2; double x1, y1, x2, y2;
const char *org_data= data;
if (len < 4 + 2 * POINT_DATA_SIZE) if (len < 4 + 2 * POINT_DATA_SIZE)
goto ret; goto err;
uint32 llen= len;
const char *ldata= data;
n_points= uint4korr(data); n_points= uint4korr(data);
data+= 4; data+= 4;
float8get(x1, data); float8get(x1, data);
data+= 8; data+= SIZEOF_STORED_DOUBLE;
float8get(y1, data); float8get(y1, data);
data+= 8; data+= SIZEOF_STORED_DOUBLE;
data+= (n_points - 2) * POINT_DATA_SIZE; data+= (n_points - 2) * POINT_DATA_SIZE;
float8get(x2, data); float8get(x2, data);
float8get(y2, data + 8); float8get(y2, data + SIZEOF_STORED_DOUBLE);
if ((x1 != x2) || (y1 != y2)) if ((x1 != x2) || (y1 != y2) ||
goto ret; str->append(org_data, len, 512))
goto err;
if (str->reserve(llen, 512))
goto ret;
str->q_append(ldata, llen);
} }
break; break;
default: default:
goto ret; goto err;
} }
} }
} }
if (str->length() > current_thd->variables.max_allowed_packet) if (str->length() > current_thd->variables.max_allowed_packet)
goto ret; goto err;
null_value = 0; null_value = 0;
return str;
ret: err:
return null_value ? 0 : str; null_value= 1;
return 0;
} }
/* /*
Functions for spatial relations Functions for spatial relations
*/ */
@ -453,6 +441,7 @@ longlong Item_func_spatial_rel::val_int()
String *res2= args[1]->val_str(&tmp_value2); String *res2= args[1]->val_str(&tmp_value2);
Geometry g1, g2; Geometry g1, g2;
MBR mbr1, mbr2; MBR mbr1, mbr2;
const char *dummy;
if ((null_value= (args[0]->null_value || if ((null_value= (args[0]->null_value ||
args[1]->null_value || args[1]->null_value ||
@ -460,12 +449,11 @@ longlong Item_func_spatial_rel::val_int()
res1->length() - SRID_SIZE) || res1->length() - SRID_SIZE) ||
g2.create_from_wkb(res2->ptr() + SRID_SIZE, g2.create_from_wkb(res2->ptr() + SRID_SIZE,
res2->length() - SRID_SIZE) || res2->length() - SRID_SIZE) ||
g1.get_mbr(&mbr1) || g1.get_mbr(&mbr1, &dummy) ||
g2.get_mbr(&mbr2)))) g2.get_mbr(&mbr2, &dummy))))
return 0; return 0;
switch (spatial_rel) switch (spatial_rel) {
{
case SP_CONTAINS_FUNC: case SP_CONTAINS_FUNC:
return mbr1.contains(&mbr2); return mbr1.contains(&mbr2);
case SP_WITHIN_FUNC: case SP_WITHIN_FUNC:
@ -490,6 +478,7 @@ longlong Item_func_spatial_rel::val_int()
return 0; return 0;
} }
longlong Item_func_isempty::val_int() longlong Item_func_isempty::val_int()
{ {
String tmp; String tmp;
@ -497,23 +486,25 @@ longlong Item_func_isempty::val_int()
return args[0]->null_value ? 1 : 0; return args[0]->null_value ? 1 : 0;
} }
longlong Item_func_issimple::val_int() longlong Item_func_issimple::val_int()
{ {
String tmp; String tmp;
String *wkb=args[0]->val_str(&tmp); String *wkb=args[0]->val_str(&tmp);
if ((null_value= (!wkb || args[0]->null_value ))) if ((null_value= (!wkb || args[0]->null_value)))
return 0; return 0;
/* TODO: Ramil or Holyfoot, add real IsSimple calculation */ /* TODO: Ramil or Holyfoot, add real IsSimple calculation */
return 0; return 0;
} }
longlong Item_func_isclosed::val_int() longlong Item_func_isclosed::val_int()
{ {
String tmp; String tmp;
String *swkb= args[0]->val_str(&tmp); String *swkb= args[0]->val_str(&tmp);
Geometry geom; Geometry geom;
int isclosed; int isclosed= 0; // In case of error
null_value= (!swkb || null_value= (!swkb ||
args[0]->null_value || args[0]->null_value ||
@ -529,23 +520,26 @@ longlong Item_func_isclosed::val_int()
Numerical functions Numerical functions
*/ */
longlong Item_func_dimension::val_int() longlong Item_func_dimension::val_int()
{ {
uint32 dim; uint32 dim= 0; // In case of error
String *swkb= args[0]->val_str(&value); String *swkb= args[0]->val_str(&value);
Geometry geom; Geometry geom;
const char *dummy;
null_value= (!swkb || null_value= (!swkb ||
args[0]->null_value || args[0]->null_value ||
geom.create_from_wkb(swkb->ptr() + SRID_SIZE, geom.create_from_wkb(swkb->ptr() + SRID_SIZE,
swkb->length() - SRID_SIZE) || swkb->length() - SRID_SIZE) ||
geom.dimension(&dim)); geom.dimension(&dim, &dummy));
return (longlong) dim; return (longlong) dim;
} }
longlong Item_func_numinteriorring::val_int() longlong Item_func_numinteriorring::val_int()
{ {
uint32 num; uint32 num= 0; // In case of error
String *swkb= args[0]->val_str(&value); String *swkb= args[0]->val_str(&value);
Geometry geom; Geometry geom;
@ -557,9 +551,10 @@ longlong Item_func_numinteriorring::val_int()
return (longlong) num; return (longlong) num;
} }
longlong Item_func_numgeometries::val_int() longlong Item_func_numgeometries::val_int()
{ {
uint32 num= 0; uint32 num= 0; // In case of errors
String *swkb= args[0]->val_str(&value); String *swkb= args[0]->val_str(&value);
Geometry geom; Geometry geom;
@ -571,9 +566,10 @@ longlong Item_func_numgeometries::val_int()
return (longlong) num; return (longlong) num;
} }
longlong Item_func_numpoints::val_int() longlong Item_func_numpoints::val_int()
{ {
uint32 num; uint32 num= 0; // In case of errors
String *swkb= args[0]->val_str(&value); String *swkb= args[0]->val_str(&value);
Geometry geom; Geometry geom;
@ -586,9 +582,10 @@ longlong Item_func_numpoints::val_int()
return (longlong) num; return (longlong) num;
} }
double Item_func_x::val() double Item_func_x::val()
{ {
double res; double res= 0.0; // In case of errors
String *swkb= args[0]->val_str(&value); String *swkb= args[0]->val_str(&value);
Geometry geom; Geometry geom;
@ -600,9 +597,10 @@ double Item_func_x::val()
return res; return res;
} }
double Item_func_y::val() double Item_func_y::val()
{ {
double res; double res= 0; // In case of errors
String *swkb= args[0]->val_str(&value); String *swkb= args[0]->val_str(&value);
Geometry geom; Geometry geom;
@ -614,23 +612,25 @@ double Item_func_y::val()
return res; return res;
} }
double Item_func_area::val() double Item_func_area::val()
{ {
double res; double res= 0; // In case of errors
String *swkb= args[0]->val_str(&value); String *swkb= args[0]->val_str(&value);
Geometry geom; Geometry geom;
const char *dummy;
null_value= (!swkb || null_value= (!swkb ||
geom.create_from_wkb(swkb->ptr() + SRID_SIZE, geom.create_from_wkb(swkb->ptr() + SRID_SIZE,
swkb->length() - SRID_SIZE) || swkb->length() - SRID_SIZE) ||
!GEOM_METHOD_PRESENT(geom, area) || !GEOM_METHOD_PRESENT(geom, area) ||
geom.area(&res)); geom.area(&res, &dummy));
return res; return res;
} }
double Item_func_glength::val() double Item_func_glength::val()
{ {
double res; double res= 0; // In case of errors
String *swkb= args[0]->val_str(&value); String *swkb= args[0]->val_str(&value);
Geometry geom; Geometry geom;
@ -650,8 +650,10 @@ longlong Item_func_srid::val_int()
null_value= (!swkb || null_value= (!swkb ||
geom.create_from_wkb(swkb->ptr() + SRID_SIZE, geom.create_from_wkb(swkb->ptr() + SRID_SIZE,
swkb->length() - SRID_SIZE)); swkb->length() - SRID_SIZE));
uint32 res= uint4korr(swkb->ptr()); if (null_value)
return (longlong) res; return 0;
return (longlong) (uint4korr(swkb->ptr()));
} }
#endif /*HAVE_SPATIAL*/ #endif /*HAVE_SPATIAL*/

2
sql/item_geofunc.h
View File

@ -23,8 +23,6 @@
#pragma interface /* gcc class implementation */ #pragma interface /* gcc class implementation */
#endif #endif
#define SRID_SIZE sizeof(uint32)
class Item_func_geometry_from_text: public Item_str_func class Item_func_geometry_from_text: public Item_str_func
{ {
public: public:

1796
sql/spatial.cc
View File

File diff suppressed because it is too large Load Diff

476
sql/spatial.h
View File

@ -17,118 +17,80 @@
#ifndef _spatial_h #ifndef _spatial_h
#define _spatial_h #define _spatial_h
const uint POINT_DATA_SIZE = 8+8; const uint SRID_SIZE= 4;
const uint WKB_HEADER_SIZE = 1+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 stPoint2D struct st_point_2d
{ {
double x; double x;
double y; double y;
}; };
struct stLinearRing struct st_linear_ring
{ {
size_t n_points; uint32 n_points;
stPoint2D points; st_point_2d points;
}; };
/***************************** MBR *******************************/ /***************************** MBR *******************************/
/*
It's ok that a lot of the functions are inline as these are only used once
in MySQL
*/
struct MBR struct MBR
{ {
double xmin, ymin, xmax, ymax;
MBR() MBR()
{ {
xmin=DBL_MAX; xmin= ymin= DBL_MAX;
ymin=DBL_MAX; xmax= ymax= -DBL_MAX;
xmax=-DBL_MAX;
ymax=-DBL_MAX;
} }
MBR(const double &_xmin, const double &_ymin, MBR(const double xmin_arg, const double ymin_arg,
const double &_xmax, const double &_ymax) const double xmax_arg, const double ymax_arg)
{ :xmin(xmin_arg), ymin(ymin_arg), xmax(xmax_arg), ymax(ymax_arg)
xmin=_xmin; {}
ymin=_ymin;
xmax=_xmax;
ymax=_ymax;
}
MBR(const stPoint2D &min, const stPoint2D &max) MBR(const st_point_2d &min, const st_point_2d &max)
{ :xmin(min.x), ymin(min.y), xmax(max.x), ymax(max.y)
xmin=min.x; {}
ymin=min.y;
xmax=max.x; inline void add_xy(double x, double y)
ymax=max.y;
}
double xmin;
double ymin;
double xmax;
double ymax;
void add_xy(double x, double y)
{ {
/* Not using "else" for proper one point MBR calculation */ /* Not using "else" for proper one point MBR calculation */
if (x<xmin) if (x < xmin)
{ xmin= x;
xmin=x; if (x > xmax)
} xmax= x;
if (x>xmax) if (y < ymin)
{ ymin= y;
xmax=x; if (y > ymax)
} ymax= y;
if (y<ymin)
{
ymin=y;
}
if (y>ymax)
{
ymax=y;
}
} }
void add_xy(const char *px, const char *py) void add_xy(const char *px, const char *py)
{ {
double x, y; double x, y;
float8get(x, px); float8get(x, px);
float8get(y, py); float8get(y, py);
/* Not using "else" for proper one point MBR calculation */ add_xy(x,y);
if (x<xmin)
{
xmin=x;
}
if (x>xmax)
{
xmax=x;
}
if (y<ymin)
{
ymin=y;
}
if (y>ymax)
{
ymax=y;
}
} }
void add_mbr(const MBR *mbr) void add_mbr(const MBR *mbr)
{ {
if (mbr->xmin<xmin) if (mbr->xmin < xmin)
{ xmin= mbr->xmin;
xmin=mbr->xmin; if (mbr->xmax > xmax)
} xmax= mbr->xmax;
if (mbr->xmax>xmax) if (mbr->ymin < ymin)
{ ymin= mbr->ymin;
xmax=mbr->xmax; if (mbr->ymax > ymax)
} ymax= mbr->ymax;
if (mbr->ymin<ymin)
{
ymin=mbr->ymin;
}
if (mbr->ymax>ymax)
{
ymax=mbr->ymax;
}
} }
int equals(const MBR *mbr) int equals(const MBR *mbr)
@ -177,12 +139,12 @@ struct MBR
int overlaps(const MBR *mbr) int overlaps(const MBR *mbr)
{ {
int lb = mbr->inner_point(xmin, ymin); int lb= mbr->inner_point(xmin, ymin);
int rb = mbr->inner_point(xmax, ymin); int rb= mbr->inner_point(xmax, ymin);
int rt = mbr->inner_point(xmax, ymax); int rt= mbr->inner_point(xmax, ymax);
int lt = mbr->inner_point(xmin, ymax); int lt= mbr->inner_point(xmin, ymax);
int a = lb+rb+rt+lt; int a = lb+rb+rt+lt;
return (a>0) && (a<4) && (!within(mbr)); return (a>0) && (a<4) && (!within(mbr));
} }
}; };
@ -192,16 +154,18 @@ struct MBR
class Geometry; class Geometry;
typedef int (Geometry::*GF_InitFromText)(GTextReadStream *, String *); typedef bool (Geometry::*GF_InitFromText)(Gis_read_stream *, String *);
typedef int (Geometry::*GF_GetDataAsText)(String *) const; typedef bool (Geometry::*GF_GetDataAsText)(String *, const char **);
typedef size_t (Geometry::*GF_GetDataSize)() const; typedef uint32 (Geometry::*GF_GetDataSize)() const;
typedef int (Geometry::*GF_GetMBR)(MBR *) const; typedef bool (Geometry::*GF_GetMBR)(MBR *, const char **end) const;
typedef int (Geometry::*GF_GetD)(double *) const; typedef bool (Geometry::*GF_GetD)(double *) const;
typedef int (Geometry::*GF_GetI)(int *) const; typedef bool (Geometry::*GF_GetD_AND_END)(double *, const char **) const;
typedef int (Geometry::*GF_GetUI)(uint32 *) const; typedef bool (Geometry::*GF_GetI)(int *) const;
typedef int (Geometry::*GF_GetWS)(String *) const; typedef bool (Geometry::*GF_GetUI)(uint32 *) const;
typedef int (Geometry::*GF_GetUIWS)(uint32, String *) const; typedef bool (Geometry::*GF_GetUI_AND_END)(uint32 *, const char **) const;
typedef bool (Geometry::*GF_GetWS)(String *);
typedef bool (Geometry::*GF_GetUIWS)(uint32, String *) const;
#define GEOM_METHOD_PRESENT(geom_obj, method)\ #define GEOM_METHOD_PRESENT(geom_obj, method)\
(geom_obj.m_vmt->method != &Geometry::method) (geom_obj.m_vmt->method != &Geometry::method)
@ -211,21 +175,22 @@ class Geometry
public: public:
enum wkbType enum wkbType
{ {
wkbPoint = 1, wkbPoint= 1,
wkbLineString = 2, wkbLineString= 2,
wkbPolygon = 3, wkbPolygon= 3,
wkbMultiPoint = 4, wkbMultiPoint= 4,
wkbMultiLineString = 5, wkbMultiLineString= 5,
wkbMultiPolygon = 6, wkbMultiPolygon= 6,
wkbGeometryCollection = 7 wkbGeometryCollection= 7,
wkb_end=8
}; };
enum wkbByteOrder enum wkbByteOrder
{ {
wkbXDR = 0, /* Big Endian */ wkbXDR= 0, /* Big Endian */
wkbNDR = 1 /* Little Endian */ wkbNDR= 1 /* Little Endian */
}; };
class GClassInfo class Gis_class_info
{ {
public: public:
GF_InitFromText init_from_wkt; GF_InitFromText init_from_wkt;
@ -235,14 +200,14 @@ public:
GF_GetD get_x; GF_GetD get_x;
GF_GetD get_y; GF_GetD get_y;
GF_GetD length; GF_GetD length;
GF_GetD area; GF_GetD_AND_END area;
GF_GetI is_closed; GF_GetI is_closed;
GF_GetUI num_interior_ring; GF_GetUI num_interior_ring;
GF_GetUI num_points; GF_GetUI num_points;
GF_GetUI num_geometries; GF_GetUI num_geometries;
GF_GetUI dimension; GF_GetUI_AND_END dimension;
GF_GetWS start_point; GF_GetWS start_point;
GF_GetWS end_point; GF_GetWS end_point;
@ -253,248 +218,291 @@ public:
GF_GetUIWS interior_ring_n; GF_GetUIWS interior_ring_n;
GF_GetUIWS geometry_n; GF_GetUIWS geometry_n;
LEX_STRING m_name;
int m_type_id; int m_type_id;
const char *m_name; Gis_class_info *m_next_rt;
GClassInfo *m_next_rt;
}; };
GClassInfo *m_vmt; Gis_class_info *m_vmt;
const GClassInfo *get_class_info() const { return m_vmt; } const Gis_class_info *get_class_info() const { return m_vmt; }
size_t get_data_size() const { return (this->*m_vmt->get_data_size)(); } uint32 get_data_size() const { return (this->*m_vmt->get_data_size)(); }
int init_from_wkt(GTextReadStream *trs, String *wkb) bool init_from_wkt(Gis_read_stream *trs, String *wkb)
{ return (this->*m_vmt->init_from_wkt)(trs, wkb); } { return (this->*m_vmt->init_from_wkt)(trs, wkb); }
int get_data_as_wkt(String *txt) const bool get_data_as_wkt(String *txt, const char **end)
{ return (this->*m_vmt->get_data_as_wkt)(txt); } { return (this->*m_vmt->get_data_as_wkt)(txt, end); }
int get_mbr(MBR *mbr) const { return (this->*m_vmt->get_mbr)(mbr); } int get_mbr(MBR *mbr, const char **end) const
int dimension(uint32 *dim) const { return (this->*m_vmt->get_mbr)(mbr, end); }
{ return (this->*m_vmt->dimension)(dim); } bool dimension(uint32 *dim, const char **end) const
{
return (this->*m_vmt->dimension)(dim, end);
}
int get_x(double *x) const { return (this->*m_vmt->get_x)(x); } bool get_x(double *x) const { return (this->*m_vmt->get_x)(x); }
int get_y(double *y) const { return (this->*m_vmt->get_y)(y); } bool get_y(double *y) const { return (this->*m_vmt->get_y)(y); }
int length(double *len) const { return (this->*m_vmt->length)(len); } bool length(double *len) const { return (this->*m_vmt->length)(len); }
int area(double *ar) const { return (this->*m_vmt->area)(ar); } bool area(double *ar, const char **end) const
{
return (this->*m_vmt->area)(ar, end);
}
int is_closed(int *closed) const bool is_closed(int *closed) const
{ return (this->*m_vmt->is_closed)(closed); } { return (this->*m_vmt->is_closed)(closed); }
int num_interior_ring(uint32 *n_int_rings) const bool num_interior_ring(uint32 *n_int_rings) const
{ return (this->*m_vmt->num_interior_ring)(n_int_rings); } { return (this->*m_vmt->num_interior_ring)(n_int_rings); }
int num_points(uint32 *n_points) const bool num_points(uint32 *n_points) const
{ return (this->*m_vmt->num_points)(n_points); } { return (this->*m_vmt->num_points)(n_points); }
int num_geometries(uint32 *num) const bool num_geometries(uint32 *num) const
{ return (this->*m_vmt->num_geometries)(num); } { return (this->*m_vmt->num_geometries)(num); }
int start_point(String *point) const bool start_point(String *point)
{ return (this->*m_vmt->start_point)(point); } { return (this->*m_vmt->start_point)(point); }
int end_point(String *point) const bool end_point(String *point)
{ return (this->*m_vmt->end_point)(point); } { return (this->*m_vmt->end_point)(point); }
int exterior_ring(String *ring) const bool exterior_ring(String *ring)
{ return (this->*m_vmt->exterior_ring)(ring); } { return (this->*m_vmt->exterior_ring)(ring); }
int centroid(String *point) const bool centroid(String *point)
{ return (this->*m_vmt->centroid)(point); } { return (this->*m_vmt->centroid)(point); }
int point_n(uint32 num, String *result) const bool point_n(uint32 num, String *result) const
{ return (this->*m_vmt->point_n)(num, result); } { return (this->*m_vmt->point_n)(num, result); }
int interior_ring_n(uint32 num, String *result) const bool interior_ring_n(uint32 num, String *result) const
{ return (this->*m_vmt->interior_ring_n)(num, result); } { return (this->*m_vmt->interior_ring_n)(num, result); }
int geometry_n(uint32 num, String *result) const bool geometry_n(uint32 num, String *result) const
{ return (this->*m_vmt->geometry_n)(num, result); } { return (this->*m_vmt->geometry_n)(num, result); }
public: public:
int create_from_wkb(const char *data, uint32 data_len); int create_from_wkb(const char *data, uint32 data_len);
int create_from_wkt(GTextReadStream *trs, String *wkt, int init_stream=1); int create_from_wkt(Gis_read_stream *trs, String *wkt, bool init_stream=1);
int init(int type_id) int init(int type_id)
{ {
m_vmt = find_class(type_id); m_vmt= find_class(type_id);
return !m_vmt; return !m_vmt;
} }
int new_geometry(const char *name, size_t len) int new_geometry(const char *name, uint32 len)
{ {
m_vmt = find_class(name, len); m_vmt= find_class(name, len);
return !m_vmt; return !m_vmt;
} }
int as_wkt(String *wkt, const char **end)
int as_wkt(String *wkt) const
{ {
if (wkt->reserve(strlen(get_class_info()->m_name) + 2, 512)) uint32 len= get_class_info()->m_name.length;
if (wkt->reserve(len + 2, 512))
return 1; return 1;
wkt->qs_append(get_class_info()->m_name); wkt->qs_append(get_class_info()->m_name.str, len);
wkt->qs_append('('); wkt->qs_append('(');
if (get_data_as_wkt(wkt)) if (get_data_as_wkt(wkt, end))
return 1; return 1;
wkt->qs_append(')'); wkt->qs_append(')');
return 0; return 0;
} }
void init_from_wkb(const char *data, uint32 data_len) inline void init_from_wkb(const char *data, uint32 data_len)
{ {
m_data = data; m_data= data;
m_data_end = data + data_len; m_data_end= data + data_len;
} }
void shift_wkb_header() inline void shift_wkb_header()
{ {
m_data += WKB_HEADER_SIZE; m_data+= WKB_HEADER_SIZE;
} }
int envelope(String *result) const; bool envelope(String *result) const;
protected: protected:
static GClassInfo *find_class(int type_id); static Gis_class_info *find_class(int type_id);
static GClassInfo *find_class(const char *name, size_t len); static Gis_class_info *find_class(const char *name, uint32 len);
const char *append_points(String *txt, uint32 n_points,
const char *data, uint32 offset);
bool create_point(String *result, const char *data);
bool create_point(String *result, double x, double y);
const char *get_mbr_for_points(MBR *mbr, const char *data, uint offset)
const;
bool no_data(const char *cur_data, uint32 data_amount) const inline bool no_data(const char *cur_data, uint32 data_amount) const
{ {
return (cur_data + data_amount > m_data_end); return (cur_data + data_amount > m_data_end);
} }
const char *m_data; const char *m_data;
const char *m_data_end; const char *m_data_end;
}; };
#define SIZEOF_STORED_DOUBLE 8
/***************************** Point *******************************/ /***************************** Point *******************************/
class GPoint: public Geometry class Gis_point: public Geometry
{ {
public: public:
size_t get_data_size() const; uint32 get_data_size() const;
int init_from_wkt(GTextReadStream *trs, String *wkb); bool init_from_wkt(Gis_read_stream *trs, String *wkb);
int get_data_as_wkt(String *txt) const; bool get_data_as_wkt(String *txt, const char **end);
int get_mbr(MBR *mbr) const; int get_mbr(MBR *mbr, const char **end) const;
int get_xy(double *x, double *y) const bool get_xy(double *x, double *y) const
{ {
const char *data = m_data; const char *data= m_data;
if (no_data(data, SIZEOF_STORED_DOUBLE * 2)) return 1; if (no_data(data, SIZEOF_STORED_DOUBLE * 2))
return 1;
float8get(*x, data); float8get(*x, data);
float8get(*y, data + SIZEOF_STORED_DOUBLE); float8get(*y, data + SIZEOF_STORED_DOUBLE);
return 0; return 0;
} }
int get_x(double *x) const bool get_x(double *x) const
{ {
if (no_data(m_data, SIZEOF_STORED_DOUBLE)) return 1; if (no_data(m_data, SIZEOF_STORED_DOUBLE))
return 1;
float8get(*x, m_data); float8get(*x, m_data);
return 0; return 0;
} }
int get_y(double *y) const bool get_y(double *y) const
{ {
const char *data = m_data; const char *data= m_data;
if (no_data(data, SIZEOF_STORED_DOUBLE * 2)) return 1; if (no_data(data, SIZEOF_STORED_DOUBLE * 2)) return 1;
float8get(*y, data + SIZEOF_STORED_DOUBLE); float8get(*y, data + SIZEOF_STORED_DOUBLE);
return 0; return 0;
} }
int dimension(uint32 *dim) const { *dim = 0; return 0; } bool dimension(uint32 *dim, const char **end) const
{
*dim= 0;
*end= 0; /* No default end */
return 0;
}
}; };
/***************************** LineString *******************************/ /***************************** LineString *******************************/
class GLineString: public Geometry class Gis_line_string: public Geometry
{ {
public: public:
size_t get_data_size() const; uint32 get_data_size() const;
int init_from_wkt(GTextReadStream *trs, String *wkb); bool init_from_wkt(Gis_read_stream *trs, String *wkb);
int get_data_as_wkt(String *txt) const; bool get_data_as_wkt(String *txt, const char **end);
int get_mbr(MBR *mbr) const; bool get_mbr(MBR *mbr, const char **end) const;
bool length(double *len) const;
int length(double *len) const; bool is_closed(int *closed) const;
int is_closed(int *closed) const; bool num_points(uint32 *n_points) const;
int num_points(uint32 *n_points) const; bool start_point(String *point);
int start_point(String *point) const; bool end_point(String *point);
int end_point(String *point) const; bool point_n(uint32 n, String *result);
int point_n(uint32 n, String *result) const; bool dimension(uint32 *dim, const char **end) const
int dimension(uint32 *dim) const { *dim = 1; return 0; } {
*dim= 1;
*end= 0; /* No default end */
return 0;
}
}; };
/***************************** Polygon *******************************/ /***************************** Polygon *******************************/
class GPolygon: public Geometry class Gis_polygon: public Geometry
{ {
public: public:
size_t get_data_size() const; uint32 get_data_size() const;
int init_from_wkt(GTextReadStream *trs, String *wkb); bool init_from_wkt(Gis_read_stream *trs, String *wkb);
int get_data_as_wkt(String *txt) const; bool get_data_as_wkt(String *txt, const char **end);
int get_mbr(MBR *mbr) const; bool get_mbr(MBR *mbr, const char **end) const;
bool area(double *ar, const char **end) const;
int area(double *ar) const; bool exterior_ring(String *result);
int exterior_ring(String *result) const; bool num_interior_ring(uint32 *n_int_rings) const;
int num_interior_ring(uint32 *n_int_rings) const; bool interior_ring_n(uint32 num, String *result) const;
int interior_ring_n(uint32 num, String *result) const; bool centroid_xy(double *x, double *y) const;
int centroid_xy(double *x, double *y) const; bool centroid(String *result);
int centroid(String *result) const; bool dimension(uint32 *dim, const char **end) const
int dimension(uint32 *dim) const { *dim = 2; return 0; } {
*dim= 2;
*end= 0; /* No default end */
return 0;
}
}; };
/***************************** MultiPoint *******************************/ /***************************** MultiPoint *******************************/
class GMultiPoint: public Geometry class Gis_multi_point: public Geometry
{ {
public: public:
size_t get_data_size() const; uint32 get_data_size() const;
int init_from_wkt(GTextReadStream *trs, String *wkb); bool init_from_wkt(Gis_read_stream *trs, String *wkb);
int get_data_as_wkt(String *txt) const; bool get_data_as_wkt(String *txt, const char **end);
int get_mbr(MBR *mbr) const; bool get_mbr(MBR *mbr, const char **end) const;
bool num_geometries(uint32 *num) const;
int num_geometries(uint32 *num) const; bool geometry_n(uint32 num, String *result) const;
int geometry_n(uint32 num, String *result) const; bool dimension(uint32 *dim, const char **end) const
int dimension(uint32 *dim) const { *dim = 0; return 0; } {
*dim= 0;
*end= 0; /* No default end */
return 0;
}
}; };
/***************************** MultiLineString *******************************/ /***************************** MultiLineString *******************************/
class GMultiLineString: public Geometry class Gis_multi_line_stringg: public Geometry
{ {
public: public:
size_t get_data_size() const; uint32 get_data_size() const;
int init_from_wkt(GTextReadStream *trs, String *wkb); bool init_from_wkt(Gis_read_stream *trs, String *wkb);
int get_data_as_wkt(String *txt) const; bool get_data_as_wkt(String *txt, const char **end);
int get_mbr(MBR *mbr) const; bool get_mbr(MBR *mbr, const char **end) const;
bool num_geometries(uint32 *num) const;
int num_geometries(uint32 *num) const; bool geometry_n(uint32 num, String *result) const;
int geometry_n(uint32 num, String *result) const; bool length(double *len) const;
int length(double *len) const; bool is_closed(int *closed) const;
int is_closed(int *closed) const; bool dimension(uint32 *dim, const char **end) const
int dimension(uint32 *dim) const { *dim = 1; return 0; } {
*dim= 1;
*end= 0; /* No default end */
return 0;
}
}; };
/***************************** MultiPolygon *******************************/ /***************************** MultiPolygon *******************************/
class GMultiPolygon: public Geometry class Gis_multi_polygon: public Geometry
{ {
public: public:
size_t get_data_size() const; uint32 get_data_size() const;
int init_from_wkt(GTextReadStream *trs, String *wkb); bool init_from_wkt(Gis_read_stream *trs, String *wkb);
int get_data_as_wkt(String *txt) const; bool get_data_as_wkt(String *txt, const char **end);
int get_mbr(MBR *mbr) const; bool get_mbr(MBR *mbr, const char **end) const;
bool num_geometries(uint32 *num) const;
bool geometry_n(uint32 num, String *result) const;
bool area(double *ar, const char **end) const;
bool centroid(String *result);
bool dimension(uint32 *dim, const char **end) const
{
*dim= 2;
*end= 0; /* No default end */
return 0;
}
int num_geometries(uint32 *num) const;
int geometry_n(uint32 num, String *result) const;
int area(double *ar) const;
int centroid(String *result) const;
int dimension(uint32 *dim) const { *dim = 2; return 0; }
}; };
/***************************** GeometryCollection *******************************/
class GGeometryCollection: public Geometry /*********************** GeometryCollection *******************************/
class Gis_geometry_collection: public Geometry
{ {
public: public:
size_t get_data_size() const; uint32 get_data_size() const;
int init_from_wkt(GTextReadStream *trs, String *wkb); bool init_from_wkt(Gis_read_stream *trs, String *wkb);
int get_data_as_wkt(String *txt) const; bool get_data_as_wkt(String *txt, const char **end);
int get_mbr(MBR *mbr) const; bool get_mbr(MBR *mbr, const char **end) const;
bool num_geometries(uint32 *num) const;
int num_geometries(uint32 *num) const; bool geometry_n(uint32 num, String *result) const;
int geometry_n(uint32 num, String *result) const; bool dimension(uint32 *dim, const char **end) const;
int dimension(uint32 *dim) const;
}; };
#endif #endif

16
sql/sql_string.cc
View File

@ -126,8 +126,8 @@ bool String::set(double num,uint decimals, CHARSET_INFO *cs)
str_charset=cs; str_charset=cs;
if (decimals >= NOT_FIXED_DEC) if (decimals >= NOT_FIXED_DEC)
{ {
sprintf(buff,"%.14g",num); // Enough for a DATETIME uint32 len= my_sprintf(buff,(buff, "%.14g",num));// Enough for a DATETIME
return copy(buff, (uint32) strlen(buff), &my_charset_latin1, cs); return copy(buff, len, &my_charset_latin1, cs);
} }
#ifdef HAVE_FCONVERT #ifdef HAVE_FCONVERT
int decpt,sign; int decpt,sign;
@ -671,9 +671,8 @@ int String::reserve(uint32 space_needed, uint32 grow_by)
return FALSE; return FALSE;
} }
void String::qs_append(const char *str) void String::qs_append(const char *str, uint32 len)
{ {
int len = strlen(str);
memcpy(Ptr + str_length, str, len + 1); memcpy(Ptr + str_length, str, len + 1);
str_length += len; str_length += len;
} }
@ -681,8 +680,7 @@ void String::qs_append(const char *str)
void String::qs_append(double d) void String::qs_append(double d)
{ {
char *buff = Ptr + str_length; char *buff = Ptr + str_length;
sprintf(buff,"%.14g", d); str_length+= my_sprintf(buff, (buff, "%.14g", d));
str_length += strlen(buff);
} }
void String::qs_append(double *d) void String::qs_append(double *d)
@ -692,12 +690,6 @@ void String::qs_append(double *d)
qs_append(ld); qs_append(ld);
} }
void String::qs_append(const char &c)
{
Ptr[str_length] = c;
str_length += sizeof(c);
}
/* /*
Compare strings according to collation, without end space. Compare strings according to collation, without end space.

12
sql/sql_string.h
View File

@ -237,7 +237,7 @@ public:
q_*** methods writes values of parameters itself q_*** methods writes values of parameters itself
qs_*** methods writes string representation of value qs_*** methods writes string representation of value
*/ */
void q_append(const char &c) void q_append(const char c)
{ {
Ptr[str_length++] = c; Ptr[str_length++] = c;
} }
@ -262,15 +262,19 @@ public:
str_length += data_len; str_length += data_len;
} }
void WriteAtPosition(int position, uint32 value) void write_at_position(int position, uint32 value)
{ {
int4store(Ptr + position,value); int4store(Ptr + position,value);
} }
void qs_append(const char *str); void qs_append(const char *str, uint32 len);
void qs_append(double d); void qs_append(double d);
void qs_append(double *d); void qs_append(double *d);
void qs_append(const char &c); inline void qs_append(const char c)
{
Ptr[str_length]= c;
str_length++;
}
/* Inline (general) functions used by the protocol functions */ /* Inline (general) functions used by the protocol functions */

12
sql/structs.h
View File

@ -20,11 +20,21 @@
struct st_table; struct st_table;
class Field; class Field;
typedef struct lex_string { typedef struct st_lex_string
{
char *str; char *str;
uint length; uint length;
} LEX_STRING; } LEX_STRING;
typedef struct st_lex_string_with_init :public st_lex_string
{
st_lex_string_with_init(const char *str_arg, uint length_arg)
{
str= (char*) str_arg;
length= length_arg;
}
} LEX_STRING_WITH_INIT;
typedef struct st_date_time_format { typedef struct st_date_time_format {
uchar positions[8]; uchar positions[8];