open-dsi
/
postgres
mirror of https://github.com/postgres/postgres
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adjust SP-GiST regression tests to be less locale-sensitive.

Browse Source 
The original test cases gave varying results depending on whether the
locale sorts digits before or after letters.  Since that's not really
what we wish to test here, adjust the test data to not contain any strings
beginning with digits.  Per report from Pavel Stehule.
pull/1/head
Tom Lane 14 years ago
parent f9de1e9a96
commit 15ba590792
2 changed files with 65 additions and 65 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 90
      src/test/regress/expected/create_index.out
  2. 38
      src/test/regress/sql/create_index.sql

90
src/test/regress/expected/create_index.out
Unescape View File

@ -72,11 +72,11 @@ CREATE INDEX sp_quad_ind ON quad_point_tbl USING spgist (p);
CREATE TABLE kd_point_tbl AS SELECT * FROM quad_point_tbl; CREATE TABLE kd_point_tbl AS SELECT * FROM quad_point_tbl;
CREATE INDEX sp_kd_ind ON kd_point_tbl USING spgist (p kd_point_ops); CREATE INDEX sp_kd_ind ON kd_point_tbl USING spgist (p kd_point_ops);
CREATE TABLE suffix_text_tbl AS CREATE TABLE suffix_text_tbl AS
SELECT name AS t FROM road; SELECT name AS t FROM road WHERE name !~ '^[0-9]';
INSERT INTO suffix_text_tbl INSERT INTO suffix_text_tbl
SELECT '0123456789abcdef' FROM generate_series(1,1000); SELECT 'P0123456789abcdef' FROM generate_series(1,1000);
INSERT INTO suffix_text_tbl VALUES ('0123456789abcde'); INSERT INTO suffix_text_tbl VALUES ('P0123456789abcde');
INSERT INTO suffix_text_tbl VALUES ('0123456789abcdefF'); INSERT INTO suffix_text_tbl VALUES ('P0123456789abcdefF');
CREATE INDEX sp_suff_ind ON suffix_text_tbl USING spgist (t); CREATE INDEX sp_suff_ind ON suffix_text_tbl USING spgist (t);
-- --
-- Test GiST and SP-GiST indexes -- Test GiST and SP-GiST indexes
@ -269,19 +269,19 @@ SELECT count(*) FROM quad_point_tbl WHERE p ~= '(4585, 365)';
1 1
(1 row) (1 row)
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdef'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdef';
count count
------- -------
1000 1000
(1 row) (1 row)
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcde'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcde';
count count
------- -------
1 1
(1 row) (1 row)
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdefF'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdefF';
count count
------- -------
1 1
@ -290,25 +290,25 @@ SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdefF';
SELECT count(*) FROM suffix_text_tbl WHERE t < 'Aztec Ct '; SELECT count(*) FROM suffix_text_tbl WHERE t < 'Aztec Ct ';
count count
------- -------
1705 272
(1 row) (1 row)
SELECT count(*) FROM suffix_text_tbl WHERE t ~<~ 'Aztec Ct '; SELECT count(*) FROM suffix_text_tbl WHERE t ~<~ 'Aztec Ct ';
count count
------- -------
1705 272
(1 row) (1 row)
SELECT count(*) FROM suffix_text_tbl WHERE t <= 'Aztec Ct '; SELECT count(*) FROM suffix_text_tbl WHERE t <= 'Aztec Ct ';
count count
------- -------
1706 273
(1 row) (1 row)
SELECT count(*) FROM suffix_text_tbl WHERE t ~<=~ 'Aztec Ct '; SELECT count(*) FROM suffix_text_tbl WHERE t ~<=~ 'Aztec Ct ';
count count
------- -------
1706 273
(1 row) (1 row)
SELECT count(*) FROM suffix_text_tbl WHERE t = 'Aztec Ct '; SELECT count(*) FROM suffix_text_tbl WHERE t = 'Aztec Ct ';
@ -889,45 +889,45 @@ SELECT count(*) FROM kd_point_tbl WHERE p ~= '(4585, 365)';
(1 row) (1 row)
EXPLAIN (COSTS OFF) EXPLAIN (COSTS OFF)
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdef'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdef';
QUERY PLAN QUERY PLAN
------------------------------------------------------------ ------------------------------------------------------------
Aggregate Aggregate
-> Index Only Scan using sp_suff_ind on suffix_text_tbl -> Index Only Scan using sp_suff_ind on suffix_text_tbl
Index Cond: (t = '0123456789abcdef'::text) Index Cond: (t = 'P0123456789abcdef'::text)
(3 rows) (3 rows)
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdef'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdef';
count count
------- -------
1000 1000
(1 row) (1 row)
EXPLAIN (COSTS OFF) EXPLAIN (COSTS OFF)
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcde'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcde';
QUERY PLAN QUERY PLAN
------------------------------------------------------------ ------------------------------------------------------------
Aggregate Aggregate
-> Index Only Scan using sp_suff_ind on suffix_text_tbl -> Index Only Scan using sp_suff_ind on suffix_text_tbl
Index Cond: (t = '0123456789abcde'::text) Index Cond: (t = 'P0123456789abcde'::text)
(3 rows) (3 rows)
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcde'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcde';
count count
------- -------
1 1
(1 row) (1 row)
EXPLAIN (COSTS OFF) EXPLAIN (COSTS OFF)
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdefF'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdefF';
QUERY PLAN QUERY PLAN
------------------------------------------------------------ ------------------------------------------------------------
Aggregate Aggregate
-> Index Only Scan using sp_suff_ind on suffix_text_tbl -> Index Only Scan using sp_suff_ind on suffix_text_tbl
Index Cond: (t = '0123456789abcdefF'::text) Index Cond: (t = 'P0123456789abcdefF'::text)
(3 rows) (3 rows)
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdefF'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdefF';
count count
------- -------
1 1
@ -945,7 +945,7 @@ SELECT count(*) FROM suffix_text_tbl WHERE t < 'Aztec
SELECT count(*) FROM suffix_text_tbl WHERE t < 'Aztec Ct '; SELECT count(*) FROM suffix_text_tbl WHERE t < 'Aztec Ct ';
count count
------- -------
1705 272
(1 row) (1 row)
EXPLAIN (COSTS OFF) EXPLAIN (COSTS OFF)
@ -960,7 +960,7 @@ SELECT count(*) FROM suffix_text_tbl WHERE t ~<~ 'Aztec
SELECT count(*) FROM suffix_text_tbl WHERE t ~<~ 'Aztec Ct '; SELECT count(*) FROM suffix_text_tbl WHERE t ~<~ 'Aztec Ct ';
count count
------- -------
1705 272
(1 row) (1 row)
EXPLAIN (COSTS OFF) EXPLAIN (COSTS OFF)
@ -975,7 +975,7 @@ SELECT count(*) FROM suffix_text_tbl WHERE t <= 'Aztec
SELECT count(*) FROM suffix_text_tbl WHERE t <= 'Aztec Ct '; SELECT count(*) FROM suffix_text_tbl WHERE t <= 'Aztec Ct ';
count count
------- -------
1706 273
(1 row) (1 row)
EXPLAIN (COSTS OFF) EXPLAIN (COSTS OFF)
@ -990,7 +990,7 @@ SELECT count(*) FROM suffix_text_tbl WHERE t ~<=~ 'Aztec
SELECT count(*) FROM suffix_text_tbl WHERE t ~<=~ 'Aztec Ct '; SELECT count(*) FROM suffix_text_tbl WHERE t ~<=~ 'Aztec Ct ';
count count
------- -------
1706 273
(1 row) (1 row)
EXPLAIN (COSTS OFF) EXPLAIN (COSTS OFF)
@ -1347,51 +1347,51 @@ SELECT count(*) FROM kd_point_tbl WHERE p ~= '(4585, 365)';
(1 row) (1 row)
EXPLAIN (COSTS OFF) EXPLAIN (COSTS OFF)
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdef'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdef';
QUERY PLAN QUERY PLAN
---------------------------------------------------------- -----------------------------------------------------------
Aggregate Aggregate
-> Bitmap Heap Scan on suffix_text_tbl -> Bitmap Heap Scan on suffix_text_tbl
Recheck Cond: (t = '0123456789abcdef'::text) Recheck Cond: (t = 'P0123456789abcdef'::text)
-> Bitmap Index Scan on sp_suff_ind -> Bitmap Index Scan on sp_suff_ind
Index Cond: (t = '0123456789abcdef'::text) Index Cond: (t = 'P0123456789abcdef'::text)
(5 rows) (5 rows)
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdef'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdef';
count count
------- -------
1000 1000
(1 row) (1 row)
EXPLAIN (COSTS OFF) EXPLAIN (COSTS OFF)
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcde'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcde';
QUERY PLAN QUERY PLAN
--------------------------------------------------------- ----------------------------------------------------------
Aggregate Aggregate
-> Bitmap Heap Scan on suffix_text_tbl -> Bitmap Heap Scan on suffix_text_tbl
Recheck Cond: (t = '0123456789abcde'::text) Recheck Cond: (t = 'P0123456789abcde'::text)
-> Bitmap Index Scan on sp_suff_ind -> Bitmap Index Scan on sp_suff_ind
Index Cond: (t = '0123456789abcde'::text) Index Cond: (t = 'P0123456789abcde'::text)
(5 rows) (5 rows)
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcde'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcde';
count count
------- -------
1 1
(1 row) (1 row)
EXPLAIN (COSTS OFF) EXPLAIN (COSTS OFF)
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdefF'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdefF';
QUERY PLAN QUERY PLAN
----------------------------------------------------------- ------------------------------------------------------------
Aggregate Aggregate
-> Bitmap Heap Scan on suffix_text_tbl -> Bitmap Heap Scan on suffix_text_tbl
Recheck Cond: (t = '0123456789abcdefF'::text) Recheck Cond: (t = 'P0123456789abcdefF'::text)
-> Bitmap Index Scan on sp_suff_ind -> Bitmap Index Scan on sp_suff_ind
Index Cond: (t = '0123456789abcdefF'::text) Index Cond: (t = 'P0123456789abcdefF'::text)
(5 rows) (5 rows)
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdefF'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdefF';
count count
------- -------
1 1
@ -1411,7 +1411,7 @@ SELECT count(*) FROM suffix_text_tbl WHERE t < 'Aztec
SELECT count(*) FROM suffix_text_tbl WHERE t < 'Aztec Ct '; SELECT count(*) FROM suffix_text_tbl WHERE t < 'Aztec Ct ';
count count
------- -------
1705 272
(1 row) (1 row)
EXPLAIN (COSTS OFF) EXPLAIN (COSTS OFF)
@ -1428,7 +1428,7 @@ SELECT count(*) FROM suffix_text_tbl WHERE t ~<~ 'Aztec
SELECT count(*) FROM suffix_text_tbl WHERE t ~<~ 'Aztec Ct '; SELECT count(*) FROM suffix_text_tbl WHERE t ~<~ 'Aztec Ct ';
count count
------- -------
1705 272
(1 row) (1 row)
EXPLAIN (COSTS OFF) EXPLAIN (COSTS OFF)
@ -1445,7 +1445,7 @@ SELECT count(*) FROM suffix_text_tbl WHERE t <= 'Aztec
SELECT count(*) FROM suffix_text_tbl WHERE t <= 'Aztec Ct '; SELECT count(*) FROM suffix_text_tbl WHERE t <= 'Aztec Ct ';
count count
------- -------
1706 273
(1 row) (1 row)
EXPLAIN (COSTS OFF) EXPLAIN (COSTS OFF)
@ -1462,7 +1462,7 @@ SELECT count(*) FROM suffix_text_tbl WHERE t ~<=~ 'Aztec
SELECT count(*) FROM suffix_text_tbl WHERE t ~<=~ 'Aztec Ct '; SELECT count(*) FROM suffix_text_tbl WHERE t ~<=~ 'Aztec Ct ';
count count
------- -------
1706 273
(1 row) (1 row)
EXPLAIN (COSTS OFF) EXPLAIN (COSTS OFF)

38
src/test/regress/sql/create_index.sql
Unescape View File

@ -109,12 +109,12 @@ CREATE TABLE kd_point_tbl AS SELECT * FROM quad_point_tbl;
CREATE INDEX sp_kd_ind ON kd_point_tbl USING spgist (p kd_point_ops); CREATE INDEX sp_kd_ind ON kd_point_tbl USING spgist (p kd_point_ops);
CREATE TABLE suffix_text_tbl AS CREATE TABLE suffix_text_tbl AS
SELECT name AS t FROM road; SELECT name AS t FROM road WHERE name !~ '^[0-9]';
INSERT INTO suffix_text_tbl INSERT INTO suffix_text_tbl
SELECT '0123456789abcdef' FROM generate_series(1,1000); SELECT 'P0123456789abcdef' FROM generate_series(1,1000);
INSERT INTO suffix_text_tbl VALUES ('0123456789abcde'); INSERT INTO suffix_text_tbl VALUES ('P0123456789abcde');
INSERT INTO suffix_text_tbl VALUES ('0123456789abcdefF'); INSERT INTO suffix_text_tbl VALUES ('P0123456789abcdefF');
CREATE INDEX sp_suff_ind ON suffix_text_tbl USING spgist (t); CREATE INDEX sp_suff_ind ON suffix_text_tbl USING spgist (t);
@ -186,11 +186,11 @@ SELECT count(*) FROM quad_point_tbl WHERE p >^ '(5000, 4000)';
SELECT count(*) FROM quad_point_tbl WHERE p ~= '(4585, 365)'; SELECT count(*) FROM quad_point_tbl WHERE p ~= '(4585, 365)';
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdef'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdef';
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcde'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcde';
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdefF'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdefF';
SELECT count(*) FROM suffix_text_tbl WHERE t < 'Aztec Ct '; SELECT count(*) FROM suffix_text_tbl WHERE t < 'Aztec Ct ';
@ -362,16 +362,16 @@ SELECT count(*) FROM kd_point_tbl WHERE p ~= '(4585, 365)';
SELECT count(*) FROM kd_point_tbl WHERE p ~= '(4585, 365)'; SELECT count(*) FROM kd_point_tbl WHERE p ~= '(4585, 365)';
EXPLAIN (COSTS OFF) EXPLAIN (COSTS OFF)
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdef'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdef';
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdef'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdef';
EXPLAIN (COSTS OFF) EXPLAIN (COSTS OFF)
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcde'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcde';
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcde'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcde';
EXPLAIN (COSTS OFF) EXPLAIN (COSTS OFF)
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdefF'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdefF';
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdefF'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdefF';
EXPLAIN (COSTS OFF) EXPLAIN (COSTS OFF)
SELECT count(*) FROM suffix_text_tbl WHERE t < 'Aztec Ct '; SELECT count(*) FROM suffix_text_tbl WHERE t < 'Aztec Ct ';
@ -479,16 +479,16 @@ SELECT count(*) FROM kd_point_tbl WHERE p ~= '(4585, 365)';
SELECT count(*) FROM kd_point_tbl WHERE p ~= '(4585, 365)'; SELECT count(*) FROM kd_point_tbl WHERE p ~= '(4585, 365)';
EXPLAIN (COSTS OFF) EXPLAIN (COSTS OFF)
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdef'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdef';
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdef'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdef';
EXPLAIN (COSTS OFF) EXPLAIN (COSTS OFF)
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcde'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcde';
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcde'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcde';
EXPLAIN (COSTS OFF) EXPLAIN (COSTS OFF)
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdefF'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdefF';
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdefF'; SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdefF';
EXPLAIN (COSTS OFF) EXPLAIN (COSTS OFF)
SELECT count(*) FROM suffix_text_tbl WHERE t < 'Aztec Ct '; SELECT count(*) FROM suffix_text_tbl WHERE t < 'Aztec Ct ';

Write Preview
Loading…
Cancel
Save