Skip to content

Commit 8ca0f71

Browse files
sokolcatisokolcati
authored
Merge pull request #137 from postgrespro/PGPRO-12035
Update orderby.sql alternative output for 32-bit systems and add comments in all regress tests with alternatives.
2 parents 6edd4b5 + 02a8d77 commit 8ca0f71

27 files changed

+254
-21
lines changed

‎expected/altorder.out

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/*
2+
* ------------------------------------
3+
* NOTE: This test behaves differenly
4+
* ------------------------------------
5+
*
6+
* altorder.out - test output for 64-bit systems and
7+
* altorder_1.out - test output for 32-bit systems.
8+
*
9+
*/
110
CREATE TABLE atsts (id int, t tsvector, d timestamp);
211
\copy atsts from 'data/tsts.data'
312
-- PGPRO-2537: We need more data to test rumsort.c with logtape.c

‎expected/altorder_1.out

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/*
2+
* ------------------------------------
3+
* NOTE: This test behaves differenly
4+
* ------------------------------------
5+
*
6+
* altorder.out - test output for 64-bit systems and
7+
* altorder_1.out - test output for 32-bit systems.
8+
*
9+
*/
110
CREATE TABLE atsts (id int, t tsvector, d timestamp);
211
\copy atsts from 'data/tsts.data'
312
-- PGPRO-2537: We need more data to test rumsort.c with logtape.c

‎expected/altorder_hash.out

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/*
2+
* ------------------------------------
3+
* NOTE: This test behaves differenly
4+
* ------------------------------------
5+
*
6+
* altorder_hash.out - test output for 64-bit systems and
7+
* altorder_hash_1.out - test output for 32-bit systems.
8+
*
9+
*/
110
CREATE TABLE atstsh (id int, t tsvector, d timestamp);
211
\copy atstsh from 'data/tsts.data'
312
CREATE INDEX atstsh_idx ON atstsh USING rum (t rum_tsvector_hash_addon_ops, d)

‎expected/altorder_hash_1.out

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/*
2+
* ------------------------------------
3+
* NOTE: This test behaves differenly
4+
* ------------------------------------
5+
*
6+
* altorder_hash.out - test output for 64-bit systems and
7+
* altorder_hash_1.out - test output for 32-bit systems.
8+
*
9+
*/
110
CREATE TABLE atstsh (id int, t tsvector, d timestamp);
211
\copy atstsh from 'data/tsts.data'
312
CREATE INDEX atstsh_idx ON atstsh USING rum (t rum_tsvector_hash_addon_ops, d)

‎expected/array.out

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
/*
2-
* ---------------------------------------------
3-
* NOTE: This test behaves differenly on PgPro
4-
* ---------------------------------------------
2+
* ------------------------------------
3+
* NOTE: This test behaves differenly
4+
* ------------------------------------
5+
*
6+
* array.out - test output for 64-bit systems and
7+
* array_1.out - test output for 32-bit systems.
58
*
6-
* --------------------
7-
* array.sql and array_1.sql
8-
* --------------------
9-
* Test output for 64-bit and 32-bit systems respectively.
109
*/
1110
set enable_seqscan=off;
1211
set enable_sort=off;

‎expected/array_1.out

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
/*
2-
* ---------------------------------------------
3-
* NOTE: This test behaves differenly on PgPro
4-
* ---------------------------------------------
2+
* ------------------------------------
3+
* NOTE: This test behaves differenly
4+
* ------------------------------------
5+
*
6+
* array.out - test output for 64-bit systems and
7+
* array_1.out - test output for 32-bit systems.
58
*
6-
* --------------------
7-
* array.sql and array_1.sql
8-
* --------------------
9-
* Test output for 64-bit and 32-bit systems respectively.
109
*/
1110
set enable_seqscan=off;
1211
set enable_sort=off;

‎expected/float8.out

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/*
2+
* ------------------------------------
3+
* NOTE: This test behaves differenly
4+
* ------------------------------------
5+
*
6+
* float8.out - test output for 64-bit systems and
7+
* float8_1.out - test output for 32-bit systems.
8+
*
9+
*/
110
set enable_seqscan=off;
211
CREATE TABLE test_float8 (
312
i float8

‎expected/float8_1.out

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/*
2+
* ------------------------------------
3+
* NOTE: This test behaves differenly
4+
* ------------------------------------
5+
*
6+
* float8.out - test output for 64-bit systems and
7+
* float8_1.out - test output for 32-bit systems.
8+
*
9+
*/
110
set enable_seqscan=off;
211
CREATE TABLE test_float8 (
312
i float8

‎expected/int8.out

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/*
2+
* ------------------------------------
3+
* NOTE: This test behaves differenly
4+
* ------------------------------------
5+
*
6+
* int8.out - test output for 64-bit systems and
7+
* int8_1.out - test output for 32-bit systems.
8+
*
9+
*/
110
set enable_seqscan=off;
211
CREATE TABLE test_int8 (
312
i int8

‎expected/int8_1.out

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/*
2+
* ------------------------------------
3+
* NOTE: This test behaves differenly
4+
* ------------------------------------
5+
*
6+
* int8.out - test output for 64-bit systems and
7+
* int8_1.out - test output for 32-bit systems.
8+
*
9+
*/
110
set enable_seqscan=off;
211
CREATE TABLE test_int8 (
312
i int8

‎expected/money.out

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/*
2+
* ------------------------------------
3+
* NOTE: This test behaves differenly
4+
* ------------------------------------
5+
*
6+
* money.out - test output for 64-bit systems and
7+
* money_1.out - test output for 32-bit systems.
8+
*
9+
*/
110
set enable_seqscan=off;
211
CREATE TABLE test_money (
312
i money

‎expected/money_1.out

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/*
2+
* ------------------------------------
3+
* NOTE: This test behaves differenly
4+
* ------------------------------------
5+
*
6+
* money.out - test output for 64-bit systems and
7+
* money_1.out - test output for 32-bit systems.
8+
*
9+
*/
110
set enable_seqscan=off;
211
CREATE TABLE test_money (
312
i money

‎expected/orderby.out

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/*
2+
* ------------------------------------
3+
* NOTE: This test behaves differenly
4+
* ------------------------------------
5+
*
6+
* orderby.out - test output for 64-bit systems and
7+
* orderby_1.out - test output for 32-bit systems.
8+
*
9+
*/
110
CREATE TABLE tsts (id int, t tsvector, d timestamp);
211
\copy tsts from 'data/tsts.data'
312
CREATE INDEX tsts_idx ON tsts USING rum (t rum_tsvector_addon_ops, d)

‎expected/orderby_1.out

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/*
2+
* ------------------------------------
3+
* NOTE: This test behaves differenly
4+
* ------------------------------------
5+
*
6+
* orderby.out - test output for 64-bit systems and
7+
* orderby_1.out - test output for 32-bit systems.
8+
*
9+
*/
110
CREATE TABLE tsts (id int, t tsvector, d timestamp);
211
\copy tsts from 'data/tsts.data'
312
CREATE INDEX tsts_idx ON tsts USING rum (t rum_tsvector_addon_ops, d)
@@ -420,6 +429,11 @@ SELECT id, d FROM tsts WHERE t @@ 'wr&qh' AND d >= '2016-05-16 14:21:25' ORDER
420429
458 | Fri May 20 21:21:22.326724 2016
421430
(3 rows)
422431

432+
-- Test "ORDER BY" error message
433+
DROP INDEX tsts_idx;
434+
CREATE INDEX tsts_idx ON tsts USING rum (t rum_tsvector_addon_ops, d);
435+
SELECT id, d, d <=> '2016-05-16 14:21:25' FROM tsts WHERE t @@ 'wr&qh' ORDER BY d <=> '2016-05-16 14:21:25' LIMIT 5;
436+
ERROR: doesn't support order by over pass-by-reference column
423437
-- Test multicolumn index
424438
RESET enable_indexscan;
425439
RESET enable_indexonlyscan;

‎expected/orderby_hash.out

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/*
2+
* ------------------------------------
3+
* NOTE: This test behaves differenly
4+
* ------------------------------------
5+
*
6+
* orderby_hash.out - test output for 64-bit systems and
7+
* orderby_hash_1.out - test output for 32-bit systems.
8+
*
9+
*/
110
CREATE TABLE tstsh (id int, t tsvector, d timestamp);
211
\copy tstsh from 'data/tsts.data'
312
CREATE INDEX tstsh_idx ON tstsh USING rum (t rum_tsvector_hash_addon_ops, d)

‎expected/orderby_hash_1.out

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/*
2+
* ------------------------------------
3+
* NOTE: This test behaves differenly
4+
* ------------------------------------
5+
*
6+
* orderby_hash.out - test output for 64-bit systems and
7+
* orderby_hash_1.out - test output for 32-bit systems.
8+
*
9+
*/
110
CREATE TABLE tstsh (id int, t tsvector, d timestamp);
211
\copy tstsh from 'data/tsts.data'
312
CREATE INDEX tstsh_idx ON tstsh USING rum (t rum_tsvector_hash_addon_ops, d)

‎expected/timestamp.out

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/*
2+
* ------------------------------------
3+
* NOTE: This test behaves differenly
4+
* ------------------------------------
5+
*
6+
* timestamp.out - test output for 64-bit systems and
7+
* timestamp_1.out - test output for 32-bit systems.
8+
*
9+
*/
110
CREATE TABLE test_timestamp (
211
i timestamp
312
);

‎expected/timestamp_1.out

+9
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1+
/*
2+
* ------------------------------------
3+
* NOTE: This test behaves differenly
4+
* ------------------------------------
5+
*
6+
* timestamp.out - test output for 64-bit systems and
7+
* timestamp_1.out - test output for 32-bit systems.
8+
*
9+
*/
110
CREATE TABLE test_timestamp (
211
i timestamp
312
);

‎sql/altorder.sql

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
/*
2+
* ------------------------------------
3+
* NOTE: This test behaves differenly
4+
* ------------------------------------
5+
*
6+
* altorder.out - test output for 64-bit systems and
7+
* altorder_1.out - test output for 32-bit systems.
8+
*
9+
*/
10+
11+
112
CREATE TABLE atsts (id int, t tsvector, d timestamp);
213

314
\copy atsts from 'data/tsts.data'

‎sql/altorder_hash.sql

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
/*
2+
* ------------------------------------
3+
* NOTE: This test behaves differenly
4+
* ------------------------------------
5+
*
6+
* altorder_hash.out - test output for 64-bit systems and
7+
* altorder_hash_1.out - test output for 32-bit systems.
8+
*
9+
*/
10+
11+
112
CREATE TABLE atstsh (id int, t tsvector, d timestamp);
213

314
\copy atstsh from 'data/tsts.data'

‎sql/array.sql

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
/*
2-
* ---------------------------------------------
3-
* NOTE: This test behaves differenly on PgPro
4-
* ---------------------------------------------
2+
* ------------------------------------
3+
* NOTE: This test behaves differenly
4+
* ------------------------------------
5+
*
6+
* array.out - test output for 64-bit systems and
7+
* array_1.out - test output for 32-bit systems.
58
*
6-
* --------------------
7-
* array.sql and array_1.sql
8-
* --------------------
9-
* Test output for 64-bit and 32-bit systems respectively.
109
*/
1110

1211

‎sql/float8.sql

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
/*
2+
* ------------------------------------
3+
* NOTE: This test behaves differenly
4+
* ------------------------------------
5+
*
6+
* float8.out - test output for 64-bit systems and
7+
* float8_1.out - test output for 32-bit systems.
8+
*
9+
*/
10+
11+
112
set enable_seqscan=off;
213

314
CREATE TABLE test_float8 (

‎sql/int8.sql

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
/*
2+
* ------------------------------------
3+
* NOTE: This test behaves differenly
4+
* ------------------------------------
5+
*
6+
* int8.out - test output for 64-bit systems and
7+
* int8_1.out - test output for 32-bit systems.
8+
*
9+
*/
10+
11+
112
set enable_seqscan=off;
213

314
CREATE TABLE test_int8 (

‎sql/money.sql

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
/*
2+
* ------------------------------------
3+
* NOTE: This test behaves differenly
4+
* ------------------------------------
5+
*
6+
* money.out - test output for 64-bit systems and
7+
* money_1.out - test output for 32-bit systems.
8+
*
9+
*/
10+
11+
112
set enable_seqscan=off;
213

314
CREATE TABLE test_money (

‎sql/orderby.sql

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
/*
2+
* ------------------------------------
3+
* NOTE: This test behaves differenly
4+
* ------------------------------------
5+
*
6+
* orderby.out - test output for 64-bit systems and
7+
* orderby_1.out - test output for 32-bit systems.
8+
*
9+
*/
10+
11+
112
CREATE TABLE tsts (id int, t tsvector, d timestamp);
213

314
\copy tsts from 'data/tsts.data'

‎sql/orderby_hash.sql

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,14 @@
1+
/*
2+
* ------------------------------------
3+
* NOTE: This test behaves differenly
4+
* ------------------------------------
5+
*
6+
* orderby_hash.out - test output for 64-bit systems and
7+
* orderby_hash_1.out - test output for 32-bit systems.
8+
*
9+
*/
10+
11+
112
CREATE TABLE tstsh (id int, t tsvector, d timestamp);
213

314
\copy tstsh from 'data/tsts.data'

‎sql/timestamp.sql

+10
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
/*
2+
* ------------------------------------
3+
* NOTE: This test behaves differenly
4+
* ------------------------------------
5+
*
6+
* timestamp.out - test output for 64-bit systems and
7+
* timestamp_1.out - test output for 32-bit systems.
8+
*
9+
*/
10+
111

212
CREATE TABLE test_timestamp (
313
i timestamp

0 commit comments

Comments
 (0)