Merge pull request #109395 from msirek/backport23.1.9-rc-108954

release-23.1.9-rc: invertedidx: derive geog/geom filters which enable inverted index scan
cockroachdb · Aug 30, 2023 · 198f880 · 198f880
2 parents d6f1afe + c23a8ed
commit 198f880
Show file tree

Hide file tree

Showing 7 changed files with 1,167 additions and 586 deletions.
diff --git a/pkg/sql/logictest/testdata/logic_test/geospatial b/pkg/sql/logictest/testdata/logic_test/geospatial
@@ -5969,3 +5969,159 @@ POLYGON ((30.010000000000002 50.009999999999998, 30.010000000000002 52.009999999
 
 statement error 'GeometryCollection' geometry type not supported
 SELECT st_asencodedpolyline(geomfromewkb(('01070000A0E61000000300000001060000A0E6100000040000000103000080010000000B0000006F9AF3F7D81863C057397A0B3ACD42C006ED79D13D2DF24130E1CBF62A4A45C01B6DC0D279F452C022F8C672D2C1F9C140DB9D23050141C0B53FBA6E396656C0C0A1842E2B53EC413A8DC94C568D61401BEF0352091651C05C681DE175D2FD41A048C859DF7C5440C00E327AC97FF63F68BBA8144D0EF8416E6042F340DD6040805791CE56602740DC6C3922676401C29C6D4009B1334E40625E855D7A7E5140D4241F7D86D2D5C14B1E4BCA077A58C07806BF9D4D084D4074E74BE4DCAA00C2C11D020045A051C0D81F8E3DD0AE3740B8315FF7F63AF4C1BAD97494BA9860C07411EFAF0A6C3D4038E26DE7A194F4C16F9AF3F7D81863C057397A0B3ACD42C006ED79D13D2DF2410103000080010000000B000000610D90AE22A55FC0B8265672F7562940CE3E91EB7A320042CC96C05617B649C085229B1A09E153C0D84FA7998764EB4190FEB5A7C71B2DC03EBBCB6B588F4DC02891E1ED4A7DE6417C0F7BBC14C75840E08D4D210E2F21C04180E453EDEDFFC112E57185B2435240F0D20FC2D7C11640F8BF2E3AB98DD2C1D0A9A94D6EA14140FCABD1E5BF074B400010C2F75AA16F4166BC301BE6FB55C002F9F182DE3D53400038B551BC0495C199463681FA6E5CC0184D3E0AE179554030323F0F2525F4415791FBE04FEA61C0361E8733C77A5240C84AEBEAD466EEC1D5012A75E04F63C0A8BF403F623D4240182CFEFA9071E0C1610D90AE22A55FC0B8265672F7562940CE3E91EB7A3200420103000080010000000C000000004CADA6B302E0BF3EE5FA281ACE3BC0E051ABD6580901429B65A22CCBDC53C003DEBC27260E4AC07E45691D3E7AF541408E6FAB9A1008C016E33E2631FD40C0EEF80F0FF3E8F341A8C5EAA8B0C836409E85B8193CE952C0F4448FFF9B31F24190F9A9FCD2AC604004F99C51ED4356C0903A1F652902D4C1C01B737BD389554080315427550738C05C51AE075475F64124F6F92382235C40148AB5FED33D38C048960D3AC6D7E8412C2E310EABA5514058EA10C427562EC0A82D4D1A69D7FE41621FC77070C26540FE84B78FE5BE51400962385E53FAFEC1483899F770B14DC020BD4BBBAB604D401C08306EA143E84140337962764325C0002F089A1DF3F83FAC9B66F32C2BE841004CADA6B302E0BF3EE5FA281ACE3BC0E051ABD65809014201030000800100000006000000D03FF366A2C95C40E59BFCECDD7553C0D028B038BB63D041A40AEF5CB0195840006FB928107F084020CA0A39A4AED34100F09D4126336140E8AC65DAC4954C4024406D4040D1EE41F04B3F3DA6C75740106594C0ADCE4440A498B6372039FD4155D08A1E777452C084CC004170E949409C87DF53EB9AFDC1D03FF366A2C95C40E59BFCECDD7553C0D028B038BB63D04101020000A0E61000000200000074F55D784E5F50408F7DE14351CD41C0FCCCE7B1B166F541583C392FCD7554409022EAF3EFCC39C03CDE1C0E29A7EB4101040000A0E6100000060000000101000080E8801DFC8A2130C04401B4AE182F50C0BC13340EB7E2E1C1010100008010DC3F808D824D406C9927CDAE5144409A464D93BBD7F94101010000806F0682A50FE253C030E1964D47F74BC00E752ECB60B0F441010100008014F5242FC2C444C01257DB8E51FA51404449E2FB7D2AFFC1010100008069945BA1FD2E50C0501CA74B7A661C40CB83CB9A4894F1C10101000080C0BBBC345A4B51C0E08F6EBB2F250E400681A78F4FFCF741'::GEOGRAPHY)::BYTEA)::GEOMETRY);
+
+subtest regression_103616
+
+# Regression test for #103616
+statement ok
+CREATE TABLE t103616 (
+  tag string,
+  geog GEOGRAPHY,
+  geom GEOMETRY,
+  INVERTED INDEX geog_idx (geog),
+  INVERTED INDEX geom_idx (geom)
+);
+
+statement ok
+insert into t103616 values ('null', null, null);
+
+statement ok
+insert into t103616 values ('point (0 0)', 'POINT(0 0)'::GEOGRAPHY, 'POINT(0 0)'::GEOMETRY);
+
+statement ok
+insert into t103616 values ('point (10 10)', 'POINT(10 10)'::GEOGRAPHY, 'POINT(10 10)'::GEOMETRY);
+
+statement ok
+insert into t103616 values ('empty 1', ST_GeogFromText('POLYGON EMPTY'), ST_GeomFromText('POLYGON EMPTY'));
+
+statement ok
+insert into t103616 values ('empty 2', ST_GeogFromText('GEOMETRYCOLLECTION EMPTY'), ST_GeomFromText('GEOMETRYCOLLECTION EMPTY'));
+
+# Null and empty geog values should not appear in the output.
+query T rowsort
+SELECT tag FROM t103616@geog_idx
+WHERE
+    st_distance(geog, 'POINT(0 0)'::GEOGRAPHY, false) = 0;
+----
+point (0 0)
+
+# Null and empty geog values should not appear in the output.
+query T rowsort
+SELECT tag FROM t103616@geog_idx
+WHERE
+    st_distance(geog, 'POINT(0 0)'::GEOGRAPHY, false) = 0;
+----
+point (0 0)
+
+# Null and empty geog values should not appear in the output.
+query T rowsort
+SELECT tag FROM t103616@geog_idx
+WHERE
+    NOT 1.2345678901234566e-43 < st_distance(geog, 'POINT(0 0)'::GEOGRAPHY);
+----
+point (0 0)
+
+# Null and empty geog values should not appear in the output.
+query T rowsort
+SELECT tag FROM t103616
+WHERE
+    NOT 1.2345678901234566e-43 > st_distance(geog, 'POINT(0 0)'::GEOGRAPHY);
+----
+point (10 10)
+
+# Null and empty geog values should not appear in the output.
+query T rowsort
+SELECT tag FROM t103616@geog_idx
+WHERE
+    1.2345678901234566e-43 > st_distance(geog, 'POINT(0 0)'::GEOGRAPHY);
+----
+point (0 0)
+
+# Null and empty geog values should not appear in the output.
+query T rowsort
+SELECT tag FROM t103616
+WHERE
+    1.2345678901234566e-43 < st_distance(geog, 'POINT(0 0)'::GEOGRAPHY);
+----
+point (10 10)
+
+# Null and empty geog values should not appear in the output.
+query T rowsort
+SELECT tag FROM t103616
+WHERE
+    0 <= st_distance(geog, 'POINT(0 0)'::GEOGRAPHY);
+----
+point (0 0)
+point (10 10)
+
+# Only null and empty geog values should appear in the output.
+query T rowsort
+SELECT tag FROM t103616
+WHERE
+    (st_distance(geog, 'POINT(0 0)'::GEOGRAPHY, false) = 0) IS NULL;
+----
+null
+empty 1
+empty 2
+
+# Only null and empty geog values should appear in the output.
+query T rowsort
+SELECT tag FROM t103616
+WHERE
+    (0 <= st_distance(geog, 'POINT(0 0)'::GEOGRAPHY)) IS NULL;
+----
+null
+empty 1
+empty 2
+
+# Null and empty geom values should appear in the output.
+query T rowsort
+SELECT tag FROM t103616@geom_idx
+WHERE
+    NOT 1.2345678901234566e-43 < st_maxdistance(geom, 'POINT(0 0)'::GEOMETRY);
+----
+point (0 0)
+
+# Null and empty geom values should not appear in the output.
+query T rowsort
+SELECT tag FROM t103616
+WHERE
+    NOT 1.2345678901234566e-43 > st_maxdistance(geom, 'POINT(0 0)'::GEOMETRY);
+----
+point (10 10)
+
+# Null and empty geom values should not appear in the output.
+query T rowsort
+SELECT tag FROM t103616@geom_idx
+WHERE
+    1.2345678901234566e-43 > st_maxdistance(geom, 'POINT(0 0)'::GEOMETRY);
+----
+point (0 0)
+
+# Null and empty geom values should not appear in the output.
+query T rowsort
+SELECT tag FROM t103616
+WHERE
+    1.2345678901234566e-43 < st_maxdistance(geom, 'POINT(0 0)'::GEOMETRY);
+----
+point (10 10)
+
+# Null and empty geom values should not appear in the output.
+query T rowsort
+SELECT tag FROM t103616
+WHERE
+    0 <= st_maxdistance(geom, 'POINT(0 0)'::GEOMETRY);
+----
+point (0 0)
+point (10 10)
+
+# Only null and empty geog values should appear in the output.
+query T rowsort
+SELECT tag FROM t103616
+WHERE
+    (0 <= st_maxdistance(geom, 'POINT(0 0)'::GEOMETRY)) IS NULL;
+----
+null
+empty 1
+empty 2
+