Skip to content

Commit 15ba590

Browse files
tglsfdctglsfdc
committed
Adjust SP-GiST regression tests to be less locale-sensitive.
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.
1 parent f9de1e9 commit 15ba590

File tree

2 files changed

+65
-65
lines changed

2 files changed

+65
-65
lines changed

‎src/test/regress/expected/create_index.out‎

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -72,11 +72,11 @@ CREATE INDEX sp_quad_ind ON quad_point_tbl USING spgist (p);
7272
CREATE TABLE kd_point_tbl AS SELECT * FROM quad_point_tbl;
7373
CREATE INDEX sp_kd_ind ON kd_point_tbl USING spgist (p kd_point_ops);
7474
CREATE TABLE suffix_text_tbl AS
75-
SELECT name AS t FROM road;
75+
SELECT name AS t FROM road WHERE name !~ '^[0-9]';
7676
INSERT INTO suffix_text_tbl
77-
SELECT '0123456789abcdef' FROM generate_series(1,1000);
78-
INSERT INTO suffix_text_tbl VALUES ('0123456789abcde');
79-
INSERT INTO suffix_text_tbl VALUES ('0123456789abcdefF');
77+
SELECT 'P0123456789abcdef' FROM generate_series(1,1000);
78+
INSERT INTO suffix_text_tbl VALUES ('P0123456789abcde');
79+
INSERT INTO suffix_text_tbl VALUES ('P0123456789abcdefF');
8080
CREATE INDEX sp_suff_ind ON suffix_text_tbl USING spgist (t);
8181
--
8282
-- Test GiST and SP-GiST indexes
@@ -269,19 +269,19 @@ SELECT count(*) FROM quad_point_tbl WHERE p ~= '(4585, 365)';
269269
1
270270
(1 row)
271271

272-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdef';
272+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdef';
273273
count
274274
-------
275275
1000
276276
(1 row)
277277

278-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcde';
278+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcde';
279279
count
280280
-------
281281
1
282282
(1 row)
283283

284-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdefF';
284+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdefF';
285285
count
286286
-------
287287
1
@@ -290,25 +290,25 @@ SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdefF';
290290
SELECT count(*) FROM suffix_text_tbl WHERE t < 'Aztec Ct ';
291291
count
292292
-------
293-
1705
293+
272
294294
(1 row)
295295

296296
SELECT count(*) FROM suffix_text_tbl WHERE t ~<~ 'Aztec Ct ';
297297
count
298298
-------
299-
1705
299+
272
300300
(1 row)
301301

302302
SELECT count(*) FROM suffix_text_tbl WHERE t <= 'Aztec Ct ';
303303
count
304304
-------
305-
1706
305+
273
306306
(1 row)
307307

308308
SELECT count(*) FROM suffix_text_tbl WHERE t ~<=~ 'Aztec Ct ';
309309
count
310310
-------
311-
1706
311+
273
312312
(1 row)
313313

314314
SELECT count(*) FROM suffix_text_tbl WHERE t = 'Aztec Ct ';
@@ -889,45 +889,45 @@ SELECT count(*) FROM kd_point_tbl WHERE p ~= '(4585, 365)';
889889
(1 row)
890890

891891
EXPLAIN (COSTS OFF)
892-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdef';
892+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdef';
893893
QUERY PLAN
894894
------------------------------------------------------------
895895
Aggregate
896896
-> Index Only Scan using sp_suff_ind on suffix_text_tbl
897-
Index Cond: (t = '0123456789abcdef'::text)
897+
Index Cond: (t = 'P0123456789abcdef'::text)
898898
(3 rows)
899899

900-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdef';
900+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdef';
901901
count
902902
-------
903903
1000
904904
(1 row)
905905

906906
EXPLAIN (COSTS OFF)
907-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcde';
907+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcde';
908908
QUERY PLAN
909909
------------------------------------------------------------
910910
Aggregate
911911
-> Index Only Scan using sp_suff_ind on suffix_text_tbl
912-
Index Cond: (t = '0123456789abcde'::text)
912+
Index Cond: (t = 'P0123456789abcde'::text)
913913
(3 rows)
914914

915-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcde';
915+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcde';
916916
count
917917
-------
918918
1
919919
(1 row)
920920

921921
EXPLAIN (COSTS OFF)
922-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdefF';
922+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdefF';
923923
QUERY PLAN
924924
------------------------------------------------------------
925925
Aggregate
926926
-> Index Only Scan using sp_suff_ind on suffix_text_tbl
927-
Index Cond: (t = '0123456789abcdefF'::text)
927+
Index Cond: (t = 'P0123456789abcdefF'::text)
928928
(3 rows)
929929

930-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdefF';
930+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdefF';
931931
count
932932
-------
933933
1
@@ -945,7 +945,7 @@ SELECT count(*) FROM suffix_text_tbl WHERE t < 'Aztec
945945
SELECT count(*) FROM suffix_text_tbl WHERE t < 'Aztec Ct ';
946946
count
947947
-------
948-
1705
948+
272
949949
(1 row)
950950

951951
EXPLAIN (COSTS OFF)
@@ -960,7 +960,7 @@ SELECT count(*) FROM suffix_text_tbl WHERE t ~<~ 'Aztec
960960
SELECT count(*) FROM suffix_text_tbl WHERE t ~<~ 'Aztec Ct ';
961961
count
962962
-------
963-
1705
963+
272
964964
(1 row)
965965

966966
EXPLAIN (COSTS OFF)
@@ -975,7 +975,7 @@ SELECT count(*) FROM suffix_text_tbl WHERE t <= 'Aztec
975975
SELECT count(*) FROM suffix_text_tbl WHERE t <= 'Aztec Ct ';
976976
count
977977
-------
978-
1706
978+
273
979979
(1 row)
980980

981981
EXPLAIN (COSTS OFF)
@@ -990,7 +990,7 @@ SELECT count(*) FROM suffix_text_tbl WHERE t ~<=~ 'Aztec
990990
SELECT count(*) FROM suffix_text_tbl WHERE t ~<=~ 'Aztec Ct ';
991991
count
992992
-------
993-
1706
993+
273
994994
(1 row)
995995

996996
EXPLAIN (COSTS OFF)
@@ -1347,51 +1347,51 @@ SELECT count(*) FROM kd_point_tbl WHERE p ~= '(4585, 365)';
13471347
(1 row)
13481348

13491349
EXPLAIN (COSTS OFF)
1350-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdef';
1351-
QUERY PLAN
1352-
----------------------------------------------------------
1350+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdef';
1351+
QUERY PLAN
1352+
-----------------------------------------------------------
13531353
Aggregate
13541354
-> Bitmap Heap Scan on suffix_text_tbl
1355-
Recheck Cond: (t = '0123456789abcdef'::text)
1355+
Recheck Cond: (t = 'P0123456789abcdef'::text)
13561356
-> Bitmap Index Scan on sp_suff_ind
1357-
Index Cond: (t = '0123456789abcdef'::text)
1357+
Index Cond: (t = 'P0123456789abcdef'::text)
13581358
(5 rows)
13591359

1360-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdef';
1360+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdef';
13611361
count
13621362
-------
13631363
1000
13641364
(1 row)
13651365

13661366
EXPLAIN (COSTS OFF)
1367-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcde';
1368-
QUERY PLAN
1369-
---------------------------------------------------------
1367+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcde';
1368+
QUERY PLAN
1369+
----------------------------------------------------------
13701370
Aggregate
13711371
-> Bitmap Heap Scan on suffix_text_tbl
1372-
Recheck Cond: (t = '0123456789abcde'::text)
1372+
Recheck Cond: (t = 'P0123456789abcde'::text)
13731373
-> Bitmap Index Scan on sp_suff_ind
1374-
Index Cond: (t = '0123456789abcde'::text)
1374+
Index Cond: (t = 'P0123456789abcde'::text)
13751375
(5 rows)
13761376

1377-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcde';
1377+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcde';
13781378
count
13791379
-------
13801380
1
13811381
(1 row)
13821382

13831383
EXPLAIN (COSTS OFF)
1384-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdefF';
1385-
QUERY PLAN
1386-
-----------------------------------------------------------
1384+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdefF';
1385+
QUERY PLAN
1386+
------------------------------------------------------------
13871387
Aggregate
13881388
-> Bitmap Heap Scan on suffix_text_tbl
1389-
Recheck Cond: (t = '0123456789abcdefF'::text)
1389+
Recheck Cond: (t = 'P0123456789abcdefF'::text)
13901390
-> Bitmap Index Scan on sp_suff_ind
1391-
Index Cond: (t = '0123456789abcdefF'::text)
1391+
Index Cond: (t = 'P0123456789abcdefF'::text)
13921392
(5 rows)
13931393

1394-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdefF';
1394+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdefF';
13951395
count
13961396
-------
13971397
1
@@ -1411,7 +1411,7 @@ SELECT count(*) FROM suffix_text_tbl WHERE t < 'Aztec
14111411
SELECT count(*) FROM suffix_text_tbl WHERE t < 'Aztec Ct ';
14121412
count
14131413
-------
1414-
1705
1414+
272
14151415
(1 row)
14161416

14171417
EXPLAIN (COSTS OFF)
@@ -1428,7 +1428,7 @@ SELECT count(*) FROM suffix_text_tbl WHERE t ~<~ 'Aztec
14281428
SELECT count(*) FROM suffix_text_tbl WHERE t ~<~ 'Aztec Ct ';
14291429
count
14301430
-------
1431-
1705
1431+
272
14321432
(1 row)
14331433

14341434
EXPLAIN (COSTS OFF)
@@ -1445,7 +1445,7 @@ SELECT count(*) FROM suffix_text_tbl WHERE t <= 'Aztec
14451445
SELECT count(*) FROM suffix_text_tbl WHERE t <= 'Aztec Ct ';
14461446
count
14471447
-------
1448-
1706
1448+
273
14491449
(1 row)
14501450

14511451
EXPLAIN (COSTS OFF)
@@ -1462,7 +1462,7 @@ SELECT count(*) FROM suffix_text_tbl WHERE t ~<=~ 'Aztec
14621462
SELECT count(*) FROM suffix_text_tbl WHERE t ~<=~ 'Aztec Ct ';
14631463
count
14641464
-------
1465-
1706
1465+
273
14661466
(1 row)
14671467

14681468
EXPLAIN (COSTS OFF)

‎src/test/regress/sql/create_index.sql‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -109,12 +109,12 @@ CREATE TABLE kd_point_tbl AS SELECT * FROM quad_point_tbl;
109109
CREATE INDEX sp_kd_ind ON kd_point_tbl USING spgist (p kd_point_ops);
110110

111111
CREATE TABLE suffix_text_tbl AS
112-
SELECT name AS t FROM road;
112+
SELECT name AS t FROM road WHERE name !~ '^[0-9]';
113113

114114
INSERT INTO suffix_text_tbl
115-
SELECT '0123456789abcdef' FROM generate_series(1,1000);
116-
INSERT INTO suffix_text_tbl VALUES ('0123456789abcde');
117-
INSERT INTO suffix_text_tbl VALUES ('0123456789abcdefF');
115+
SELECT 'P0123456789abcdef' FROM generate_series(1,1000);
116+
INSERT INTO suffix_text_tbl VALUES ('P0123456789abcde');
117+
INSERT INTO suffix_text_tbl VALUES ('P0123456789abcdefF');
118118

119119
CREATE INDEX sp_suff_ind ON suffix_text_tbl USING spgist (t);
120120

@@ -186,11 +186,11 @@ SELECT count(*) FROM quad_point_tbl WHERE p >^ '(5000, 4000)';
186186

187187
SELECT count(*) FROM quad_point_tbl WHERE p ~= '(4585, 365)';
188188

189-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdef';
189+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdef';
190190

191-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcde';
191+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcde';
192192

193-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdefF';
193+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdefF';
194194

195195
SELECT count(*) FROM suffix_text_tbl WHERE t < 'Aztec Ct ';
196196

@@ -362,16 +362,16 @@ SELECT count(*) FROM kd_point_tbl WHERE p ~= '(4585, 365)';
362362
SELECT count(*) FROM kd_point_tbl WHERE p ~= '(4585, 365)';
363363

364364
EXPLAIN (COSTS OFF)
365-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdef';
366-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdef';
365+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdef';
366+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdef';
367367

368368
EXPLAIN (COSTS OFF)
369-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcde';
370-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcde';
369+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcde';
370+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcde';
371371

372372
EXPLAIN (COSTS OFF)
373-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdefF';
374-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdefF';
373+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdefF';
374+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdefF';
375375

376376
EXPLAIN (COSTS OFF)
377377
SELECT count(*) FROM suffix_text_tbl WHERE t < 'Aztec Ct ';
@@ -479,16 +479,16 @@ SELECT count(*) FROM kd_point_tbl WHERE p ~= '(4585, 365)';
479479
SELECT count(*) FROM kd_point_tbl WHERE p ~= '(4585, 365)';
480480

481481
EXPLAIN (COSTS OFF)
482-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdef';
483-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdef';
482+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdef';
483+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdef';
484484

485485
EXPLAIN (COSTS OFF)
486-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcde';
487-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcde';
486+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcde';
487+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcde';
488488

489489
EXPLAIN (COSTS OFF)
490-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdefF';
491-
SELECT count(*) FROM suffix_text_tbl WHERE t = '0123456789abcdefF';
490+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdefF';
491+
SELECT count(*) FROM suffix_text_tbl WHERE t = 'P0123456789abcdefF';
492492

493493
EXPLAIN (COSTS OFF)
494494
SELECT count(*) FROM suffix_text_tbl WHERE t < 'Aztec Ct ';

0 commit comments

Comments
 (0)