Skip to content

Commit 1b5dcfb

Browse files
vissarionTor Didriksen
authored andcommitted
WL#9582 Implements the use of distance scan of R-tree indexes
Fix a test in gis_bugs_crashes that was returning a different result in MacOS after pushing wl9582. The input geometry of that test is (geometrically) invalid so the result is unexpected. The test now tests the input geometry if they are valid instead of performing operations on them. This also fixes: Bug#36017208 MTR test gis.gis_bugs_crashes fails with a result difference Change-Id: Ie66aefca95ba724eafa83751e40c3a5991e329b6 (cherry picked from commit 6a0528b6e858bd1c28d2e8b3ba4f0acf0b605758)
1 parent dfeb55e commit 1b5dcfb

File tree

2 files changed

+7
-9
lines changed

2 files changed

+7
-9
lines changed

mysql-test/suite/gis/r/gis_bugs_crashes.result

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2018,20 +2018,19 @@ ST_GEOMFROMTEXT('MULTIPOLYGON(((-1 -1,7 4,1 10,-1 -1)),'
20182018
######################################################################################################
20192019
# BUG#20462962 : ASSERTION `GEOMETRY::IS_VALID_GEOTYPE(GT)' FAILED
20202020
######################################################################################################
2021-
SELECT ST_ASTEXT(ST_INTERSECTION(
2021+
SELECT ST_ISVALID(
20222022
ST_GEOMFROMWKB(ST_ASWKB(GEOMETRYCOLLECTION(
20232023
MULTIPOINT(POINT(8,-6), POINT(9,2), POINT(9,1), POINT(-0,6), POINT(8,6), POINT(4,3), POINT(.7,6)),
20242024
MULTIPOINT(POINT(8,-0.7654), POINT(2,7), POINT(8,-0.7654), POINT(-.0,7), POINT(.0,6), POINT(.9,+.4), POINT(6,2.232432)),
20252025
POLYGON(
20262026
LINESTRING(POINT(8,6), POINT(-.4,3), POINT(-9.8,2.232432), POINT(-1032.34324,8), POINT(2.232432,.8), POINT(8,6))),
20272027
POLYGON(
2028-
LINESTRING(POINT(0,9), POINT(3,1), POINT(3,0), POINT(3,2), POINT(0,9)))))),
2029-
ST_GEOMFROMTEXT('MULTILINESTRING((-0.7654 2.232432, 7 2, -6 -1032.34324, 9 7, 2.8 4))')));
2030-
ST_ASTEXT(ST_INTERSECTION(
2028+
LINESTRING(POINT(0,9), POINT(3,1), POINT(3,0), POINT(3,2), POINT(0,9)))))));
2029+
ST_ISVALID(
20312030
ST_GEOMFROMWKB(ST_ASWKB(GEOMETRYCOLLECTION(
20322031
MULTIPOINT(POINT(8,-6), POINT(9,2), POINT(9,1), POINT(-0,6), POINT(8,6), POINT(4,3), POINT(.7,6)),
2033-
MULTIPOINT(POINT(8,-0.7654), POINT(2,7), POINT(8,-0.7654), POINT(-.0,7), POINT(.0,6
2034-
GEOMETRYCOLLECTION(LINESTRING(-0.7654 2.232432,3.6737899159 2.0995592838),LINESTRING(3.9273011579 4.5454683022,2.8 4),POINT(3.9273011579 4.5454683022))
2032+
MULTIPOINT(POINT(8,-0.7654), POINT(2,7), POINT(8,-0.7654), POINT(-.0,7), POINT(.0,6), POINT(.9,+.4
2033+
0
20352034
######################################################################################################
20362035
# BUG#20408240 : ST_DIFFERENCE : ASSERTION `T1->RESULT_RANGE' FAILED
20372036
######################################################################################################

mysql-test/suite/gis/t/gis_bugs_crashes.test

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2000,15 +2000,14 @@ DO ST_ASTEXT(ST_SYMDIFFERENCE(
20002000
--echo ######################################################################################################
20012001

20022002
--replace_numeric_round 10
2003-
SELECT ST_ASTEXT(ST_INTERSECTION(
2003+
SELECT ST_ISVALID(
20042004
ST_GEOMFROMWKB(ST_ASWKB(GEOMETRYCOLLECTION(
20052005
MULTIPOINT(POINT(8,-6.0), POINT(9,2), POINT(9,1), POINT(-0,6), POINT(8,6), POINT(4,3), POINT(.7,6)),
20062006
MULTIPOINT(POINT(8,-0.7654), POINT(2,7), POINT(8,-0.7654), POINT(-.0,7), POINT(.0,6), POINT(.9,+.4), POINT(6,2.232432)),
20072007
POLYGON(
20082008
LINESTRING(POINT(8,6), POINT(-.4,3), POINT(-9.8,2.232432), POINT(-1032.34324,8), POINT(2.232432,.8), POINT(8,6))),
20092009
POLYGON(
2010-
LINESTRING(POINT(0,9), POINT(3,1), POINT(3,0), POINT(3,2), POINT(0,9)))))),
2011-
ST_GEOMFROMTEXT('MULTILINESTRING((-0.7654 2.232432, 7 2, -6 -1032.34324, 9 7, 2.8 4))')));
2010+
LINESTRING(POINT(0,9), POINT(3,1), POINT(3,0), POINT(3,2), POINT(0,9)))))));
20122011

20132012
--echo ######################################################################################################
20142013
--echo # BUG#20408240 : ST_DIFFERENCE : ASSERTION `T1->RESULT_RANGE' FAILED

0 commit comments

Comments
 (0)