Commit e971b18f authored by gkodinov/kgeorge@magare.gmz's avatar gkodinov/kgeorge@magare.gmz
Browse files

Bug #30825: Problems when putting a non-spatial index on a GIS column 

 Fixed the usage of spatial data (and Point in specific) with 
 non-spatial indexes.
 Several problems :
   - The length of the Point class was not updated to include the 
     spatial reference system identifier. Fixed by increasing with 4 
     bytes.
   - The storage length of the spatial columns was not accounting for
     the length that is prepended to it. Fixed by treating the 
     spatial data columns as blobs (and thus increasing the storage
     length)
   - When creating the key image for comparison in index read wrong
     key image was created (the one needed for and r-tree search,
     not the one for b-tree/other search). Fixed by treating the
     spatial data columns as blobs (and creating the correct kind of
     image based on the index type).
parent 20ec6605

mysql-test/include/gis_keys.inc

0 → 100644
+46 −0
Original line number Diff line number Diff line 
--source include/have_geometry.inc



#

# Spatial objects with keys

#



#

# Bug #30825: Problems when putting a non-spatial index on a GIS column

#



CREATE TABLE t1 (p POINT);

CREATE TABLE t2 (p POINT, INDEX(p));

INSERT INTO t1 VALUES (POINTFROMTEXT('POINT(1 2)'));

INSERT INTO t2 VALUES (POINTFROMTEXT('POINT(1 2)'));



-- no index, returns 1 as expected

SELECT COUNT(*) FROM t1 WHERE p=POINTFROMTEXT('POINT(1 2)');



-- with index, returns 1 as expected

-- EXPLAIN shows that the index is not used though

-- due to the "most rows covered anyway, so a scan is more effective" rule

EXPLAIN 

SELECT COUNT(*) FROM t2 WHERE p=POINTFROMTEXT('POINT(1 2)');

SELECT COUNT(*) FROM t2 WHERE p=POINTFROMTEXT('POINT(1 2)');



-- adding another row to the table so that

-- the "most rows covered" rule doesn't kick in anymore

-- now EXPLAIN shows the index used on the table

-- and we're getting the wrong result again

INSERT INTO t1 VALUES (POINTFROMTEXT('POINT(1 2)'));

INSERT INTO t2 VALUES (POINTFROMTEXT('POINT(1 2)'));

EXPLAIN 

SELECT COUNT(*) FROM t1 WHERE p=POINTFROMTEXT('POINT(1 2)');

SELECT COUNT(*) FROM t1 WHERE p=POINTFROMTEXT('POINT(1 2)');



EXPLAIN 

SELECT COUNT(*) FROM t2 WHERE p=POINTFROMTEXT('POINT(1 2)');

SELECT COUNT(*) FROM t2 WHERE p=POINTFROMTEXT('POINT(1 2)');



EXPLAIN 

SELECT COUNT(*) FROM t2 IGNORE INDEX(p) WHERE p=POINTFROMTEXT('POINT(1 2)');

SELECT COUNT(*) FROM t2 IGNORE INDEX(p) WHERE p=POINTFROMTEXT('POINT(1 2)');



DROP TABLE t1, t2;



--echo End of 5.0 tests

mysql-test/r/bdb_gis.result

+39 −0
Original line number Diff line number Diff line
@@ -542,3 +542,42 @@ Overlaps(@horiz1, @point2) 
0

DROP TABLE t1;

End of 5.0 tests

CREATE TABLE t1 (p POINT);

CREATE TABLE t2 (p POINT, INDEX(p));

INSERT INTO t1 VALUES (POINTFROMTEXT('POINT(1 2)'));

INSERT INTO t2 VALUES (POINTFROMTEXT('POINT(1 2)'));

SELECT COUNT(*) FROM t1 WHERE p=POINTFROMTEXT('POINT(1 2)');

COUNT(*)

1

EXPLAIN 

SELECT COUNT(*) FROM t2 WHERE p=POINTFROMTEXT('POINT(1 2)');

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ref	p	p	28	const	1	Using where

SELECT COUNT(*) FROM t2 WHERE p=POINTFROMTEXT('POINT(1 2)');

COUNT(*)

1

INSERT INTO t1 VALUES (POINTFROMTEXT('POINT(1 2)'));

INSERT INTO t2 VALUES (POINTFROMTEXT('POINT(1 2)'));

EXPLAIN 

SELECT COUNT(*) FROM t1 WHERE p=POINTFROMTEXT('POINT(1 2)');

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where

SELECT COUNT(*) FROM t1 WHERE p=POINTFROMTEXT('POINT(1 2)');

COUNT(*)

2

EXPLAIN 

SELECT COUNT(*) FROM t2 WHERE p=POINTFROMTEXT('POINT(1 2)');

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ALL	p	NULL	NULL	NULL	2	Using where

SELECT COUNT(*) FROM t2 WHERE p=POINTFROMTEXT('POINT(1 2)');

COUNT(*)

2

EXPLAIN 

SELECT COUNT(*) FROM t2 IGNORE INDEX(p) WHERE p=POINTFROMTEXT('POINT(1 2)');

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	2	Using where

SELECT COUNT(*) FROM t2 IGNORE INDEX(p) WHERE p=POINTFROMTEXT('POINT(1 2)');

COUNT(*)

2

DROP TABLE t1, t2;

End of 5.0 tests

mysql-test/r/gis-rtree.result

+2 −2
Original line number Diff line number Diff line
@@ -167,7 +167,7 @@ count(*) 
150

EXPLAIN SELECT fid, AsText(g) FROM t1 WHERE Within(g, GeomFromText('Polygon((140 140,160 140,160 160,140 160,140 140))'));

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	range	g	g	32	NULL	8	Using where

1	SIMPLE	t1	range	g	g	34	NULL	8	Using where

SELECT fid, AsText(g) FROM t1 WHERE Within(g, GeomFromText('Polygon((140 140,160 140,160 160,140 160,140 140))'));

fid	AsText(g)

1	LINESTRING(150 150,150 150)
@@ -301,7 +301,7 @@ count(*) 
EXPLAIN SELECT fid, AsText(g) FROM t2 WHERE Within(g, 

GeomFromText('Polygon((40 40,60 40,60 60,40 60,40 40))'));

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	range	g	g	32	NULL	4	Using where

1	SIMPLE	t2	range	g	g	34	NULL	4	Using where

SELECT fid, AsText(g) FROM t2 WHERE Within(g, 

GeomFromText('Polygon((40 40,60 40,60 60,40 60,40 40))'));

fid	AsText(g)

mysql-test/r/gis.result

+39 −0
Original line number Diff line number Diff line
@@ -894,4 +894,43 @@ drop table t1, t2; 
SELECT 1;

1

1

CREATE TABLE t1 (p POINT);

CREATE TABLE t2 (p POINT, INDEX(p));

INSERT INTO t1 VALUES (POINTFROMTEXT('POINT(1 2)'));

INSERT INTO t2 VALUES (POINTFROMTEXT('POINT(1 2)'));

SELECT COUNT(*) FROM t1 WHERE p=POINTFROMTEXT('POINT(1 2)');

COUNT(*)

1

EXPLAIN 

SELECT COUNT(*) FROM t2 WHERE p=POINTFROMTEXT('POINT(1 2)');

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	system	p	NULL	NULL	NULL	1	

SELECT COUNT(*) FROM t2 WHERE p=POINTFROMTEXT('POINT(1 2)');

COUNT(*)

1

INSERT INTO t1 VALUES (POINTFROMTEXT('POINT(1 2)'));

INSERT INTO t2 VALUES (POINTFROMTEXT('POINT(1 2)'));

EXPLAIN 

SELECT COUNT(*) FROM t1 WHERE p=POINTFROMTEXT('POINT(1 2)');

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where

SELECT COUNT(*) FROM t1 WHERE p=POINTFROMTEXT('POINT(1 2)');

COUNT(*)

2

EXPLAIN 

SELECT COUNT(*) FROM t2 WHERE p=POINTFROMTEXT('POINT(1 2)');

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ref	p	p	28	const	1	Using where

SELECT COUNT(*) FROM t2 WHERE p=POINTFROMTEXT('POINT(1 2)');

COUNT(*)

2

EXPLAIN 

SELECT COUNT(*) FROM t2 IGNORE INDEX(p) WHERE p=POINTFROMTEXT('POINT(1 2)');

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	2	Using where

SELECT COUNT(*) FROM t2 IGNORE INDEX(p) WHERE p=POINTFROMTEXT('POINT(1 2)');

COUNT(*)

2

DROP TABLE t1, t2;

End of 5.0 tests

End of 5.0 tests

mysql-test/r/innodb_gis.result

+39 −0
Original line number Diff line number Diff line
@@ -542,3 +542,42 @@ Overlaps(@horiz1, @point2) 
0

DROP TABLE t1;

End of 5.0 tests

CREATE TABLE t1 (p POINT);

CREATE TABLE t2 (p POINT, INDEX(p));

INSERT INTO t1 VALUES (POINTFROMTEXT('POINT(1 2)'));

INSERT INTO t2 VALUES (POINTFROMTEXT('POINT(1 2)'));

SELECT COUNT(*) FROM t1 WHERE p=POINTFROMTEXT('POINT(1 2)');

COUNT(*)

1

EXPLAIN 

SELECT COUNT(*) FROM t2 WHERE p=POINTFROMTEXT('POINT(1 2)');

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ref	p	p	28	const	1	Using where

SELECT COUNT(*) FROM t2 WHERE p=POINTFROMTEXT('POINT(1 2)');

COUNT(*)

1

INSERT INTO t1 VALUES (POINTFROMTEXT('POINT(1 2)'));

INSERT INTO t2 VALUES (POINTFROMTEXT('POINT(1 2)'));

EXPLAIN 

SELECT COUNT(*) FROM t1 WHERE p=POINTFROMTEXT('POINT(1 2)');

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	2	Using where

SELECT COUNT(*) FROM t1 WHERE p=POINTFROMTEXT('POINT(1 2)');

COUNT(*)

2

EXPLAIN 

SELECT COUNT(*) FROM t2 WHERE p=POINTFROMTEXT('POINT(1 2)');

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ref	p	p	28	const	1	Using where

SELECT COUNT(*) FROM t2 WHERE p=POINTFROMTEXT('POINT(1 2)');

COUNT(*)

2

EXPLAIN 

SELECT COUNT(*) FROM t2 IGNORE INDEX(p) WHERE p=POINTFROMTEXT('POINT(1 2)');

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ALL	NULL	NULL	NULL	NULL	2	Using where

SELECT COUNT(*) FROM t2 IGNORE INDEX(p) WHERE p=POINTFROMTEXT('POINT(1 2)');

COUNT(*)

2

DROP TABLE t1, t2;

End of 5.0 tests