Remove use of deprecated containment operators in tests
Switch @ to <@ and ~ to @> in gist-related tests. The old operator names have been deprecated and will eventually (possibly soon) be removed. Author: Justin Pryzby <pryzby@telsasoft.com> Discussion: https://www.postgresql.org/message-id/flat/20201027032511.GF9241@telsasoft.com
This commit is contained in:
parent
8c2d8f6cc4
commit
3165426e54
|
@ -46,18 +46,18 @@ SET enable_indexscan = ON;
|
|||
SET enable_bitmapscan = OFF;
|
||||
EXPLAIN (COSTS OFF)
|
||||
SELECT * FROM fast_emp4000
|
||||
WHERE home_base @ '(200,200),(2000,1000)'::box
|
||||
WHERE home_base <@ '(200,200),(2000,1000)'::box
|
||||
ORDER BY (home_base[0])[0];
|
||||
QUERY PLAN
|
||||
----------------------------------------------------------------
|
||||
-----------------------------------------------------------------
|
||||
Sort
|
||||
Sort Key: ((home_base[0])[0])
|
||||
-> Index Only Scan using grect2ind2 on fast_emp4000
|
||||
Index Cond: (home_base @ '(2000,1000),(200,200)'::box)
|
||||
Index Cond: (home_base <@ '(2000,1000),(200,200)'::box)
|
||||
(4 rows)
|
||||
|
||||
SELECT * FROM fast_emp4000
|
||||
WHERE home_base @ '(200,200),(2000,1000)'::box
|
||||
WHERE home_base <@ '(200,200),(2000,1000)'::box
|
||||
ORDER BY (home_base[0])[0];
|
||||
home_base
|
||||
-----------------------
|
||||
|
|
|
@ -75,7 +75,7 @@ SET enable_seqscan = ON;
|
|||
SET enable_indexscan = OFF;
|
||||
SET enable_bitmapscan = OFF;
|
||||
SELECT * FROM fast_emp4000
|
||||
WHERE home_base @ '(200,200),(2000,1000)'::box
|
||||
WHERE home_base <@ '(200,200),(2000,1000)'::box
|
||||
ORDER BY (home_base[0])[0];
|
||||
home_base
|
||||
-----------------------
|
||||
|
@ -95,7 +95,7 @@ SELECT count(*) FROM fast_emp4000 WHERE home_base IS NULL;
|
|||
278
|
||||
(1 row)
|
||||
|
||||
SELECT * FROM polygon_tbl WHERE f1 ~ '((1,1),(2,2),(2,1))'::polygon
|
||||
SELECT * FROM polygon_tbl WHERE f1 @> '((1,1),(2,2),(2,1))'::polygon
|
||||
ORDER BY (poly_center(f1))[0];
|
||||
f1
|
||||
---------------------
|
||||
|
@ -259,18 +259,18 @@ SET enable_indexscan = ON;
|
|||
SET enable_bitmapscan = OFF;
|
||||
EXPLAIN (COSTS OFF)
|
||||
SELECT * FROM fast_emp4000
|
||||
WHERE home_base @ '(200,200),(2000,1000)'::box
|
||||
WHERE home_base <@ '(200,200),(2000,1000)'::box
|
||||
ORDER BY (home_base[0])[0];
|
||||
QUERY PLAN
|
||||
----------------------------------------------------------------
|
||||
-----------------------------------------------------------------
|
||||
Sort
|
||||
Sort Key: ((home_base[0])[0])
|
||||
-> Index Only Scan using grect2ind on fast_emp4000
|
||||
Index Cond: (home_base @ '(2000,1000),(200,200)'::box)
|
||||
Index Cond: (home_base <@ '(2000,1000),(200,200)'::box)
|
||||
(4 rows)
|
||||
|
||||
SELECT * FROM fast_emp4000
|
||||
WHERE home_base @ '(200,200),(2000,1000)'::box
|
||||
WHERE home_base <@ '(200,200),(2000,1000)'::box
|
||||
ORDER BY (home_base[0])[0];
|
||||
home_base
|
||||
-----------------------
|
||||
|
@ -309,17 +309,17 @@ SELECT count(*) FROM fast_emp4000 WHERE home_base IS NULL;
|
|||
(1 row)
|
||||
|
||||
EXPLAIN (COSTS OFF)
|
||||
SELECT * FROM polygon_tbl WHERE f1 ~ '((1,1),(2,2),(2,1))'::polygon
|
||||
SELECT * FROM polygon_tbl WHERE f1 @> '((1,1),(2,2),(2,1))'::polygon
|
||||
ORDER BY (poly_center(f1))[0];
|
||||
QUERY PLAN
|
||||
-----------------------------------------------------------
|
||||
------------------------------------------------------------
|
||||
Sort
|
||||
Sort Key: ((poly_center(f1))[0])
|
||||
-> Index Scan using gpolygonind on polygon_tbl
|
||||
Index Cond: (f1 ~ '((1,1),(2,2),(2,1))'::polygon)
|
||||
Index Cond: (f1 @> '((1,1),(2,2),(2,1))'::polygon)
|
||||
(4 rows)
|
||||
|
||||
SELECT * FROM polygon_tbl WHERE f1 ~ '((1,1),(2,2),(2,1))'::polygon
|
||||
SELECT * FROM polygon_tbl WHERE f1 @> '((1,1),(2,2),(2,1))'::polygon
|
||||
ORDER BY (poly_center(f1))[0];
|
||||
f1
|
||||
---------------------
|
||||
|
|
|
@ -50,10 +50,10 @@ SET enable_bitmapscan = OFF;
|
|||
|
||||
EXPLAIN (COSTS OFF)
|
||||
SELECT * FROM fast_emp4000
|
||||
WHERE home_base @ '(200,200),(2000,1000)'::box
|
||||
WHERE home_base <@ '(200,200),(2000,1000)'::box
|
||||
ORDER BY (home_base[0])[0];
|
||||
SELECT * FROM fast_emp4000
|
||||
WHERE home_base @ '(200,200),(2000,1000)'::box
|
||||
WHERE home_base <@ '(200,200),(2000,1000)'::box
|
||||
ORDER BY (home_base[0])[0];
|
||||
|
||||
EXPLAIN (COSTS OFF)
|
||||
|
|
|
@ -107,14 +107,14 @@ SET enable_indexscan = OFF;
|
|||
SET enable_bitmapscan = OFF;
|
||||
|
||||
SELECT * FROM fast_emp4000
|
||||
WHERE home_base @ '(200,200),(2000,1000)'::box
|
||||
WHERE home_base <@ '(200,200),(2000,1000)'::box
|
||||
ORDER BY (home_base[0])[0];
|
||||
|
||||
SELECT count(*) FROM fast_emp4000 WHERE home_base && '(1000,1000,0,0)'::box;
|
||||
|
||||
SELECT count(*) FROM fast_emp4000 WHERE home_base IS NULL;
|
||||
|
||||
SELECT * FROM polygon_tbl WHERE f1 ~ '((1,1),(2,2),(2,1))'::polygon
|
||||
SELECT * FROM polygon_tbl WHERE f1 @> '((1,1),(2,2),(2,1))'::polygon
|
||||
ORDER BY (poly_center(f1))[0];
|
||||
|
||||
SELECT * FROM circle_tbl WHERE f1 && circle(point(1,-2), 1)
|
||||
|
@ -161,10 +161,10 @@ SET enable_bitmapscan = OFF;
|
|||
|
||||
EXPLAIN (COSTS OFF)
|
||||
SELECT * FROM fast_emp4000
|
||||
WHERE home_base @ '(200,200),(2000,1000)'::box
|
||||
WHERE home_base <@ '(200,200),(2000,1000)'::box
|
||||
ORDER BY (home_base[0])[0];
|
||||
SELECT * FROM fast_emp4000
|
||||
WHERE home_base @ '(200,200),(2000,1000)'::box
|
||||
WHERE home_base <@ '(200,200),(2000,1000)'::box
|
||||
ORDER BY (home_base[0])[0];
|
||||
|
||||
EXPLAIN (COSTS OFF)
|
||||
|
@ -176,9 +176,9 @@ SELECT count(*) FROM fast_emp4000 WHERE home_base IS NULL;
|
|||
SELECT count(*) FROM fast_emp4000 WHERE home_base IS NULL;
|
||||
|
||||
EXPLAIN (COSTS OFF)
|
||||
SELECT * FROM polygon_tbl WHERE f1 ~ '((1,1),(2,2),(2,1))'::polygon
|
||||
SELECT * FROM polygon_tbl WHERE f1 @> '((1,1),(2,2),(2,1))'::polygon
|
||||
ORDER BY (poly_center(f1))[0];
|
||||
SELECT * FROM polygon_tbl WHERE f1 ~ '((1,1),(2,2),(2,1))'::polygon
|
||||
SELECT * FROM polygon_tbl WHERE f1 @> '((1,1),(2,2),(2,1))'::polygon
|
||||
ORDER BY (poly_center(f1))[0];
|
||||
|
||||
EXPLAIN (COSTS OFF)
|
||||
|
|
Loading…
Reference in New Issue