external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

PG17 compatibility: fix some tests outputs (#7765) 

There are two commits in this PR:

1) Remove domain_default column since it has been removed from PG17
Relevant PG commit:
78806a9509
78806a95095c4fb9230a441925244690d9c07d23

2) pg_stat_statements reset output diff fix
pg_stat_statements reset output changed in PG17, fix idea from
Relevant PG commits:
6ab1dbd26b
6ab1dbd26bbf307055d805feaaca16dc3e750d36
pull/7922/head
Naisila Puka 2024-12-02 18:03:38 +03:00 committed by naisila
parent 0de7b5a240
commit 1074035446
5 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/test/regress/expected/issue_5248.out
View File

@ -201,7 +201,6 @@ FROM (
sample_6.info AS c1, sample_6.info AS c1,
subq_0.c2 AS c2, subq_0.c2 AS c2,
subq_0.c3 AS c3, subq_0.c3 AS c3,
ref_3.domain_default AS c4,
sample_6.user_id AS c5, sample_6.user_id AS c5,
ref_3.collation_name AS c6 ref_3.collation_name AS c6
FROM orders AS sample_6 TABLESAMPLE system (3.8) FROM orders AS sample_6 TABLESAMPLE system (3.8)

1
src/test/regress/expected/issue_5248_0.out
View File

@ -201,7 +201,6 @@ FROM (
sample_6.info AS c1, sample_6.info AS c1,
subq_0.c2 AS c2, subq_0.c2 AS c2,
subq_0.c3 AS c3, subq_0.c3 AS c3,
ref_3.domain_default AS c4,
sample_6.user_id AS c5, sample_6.user_id AS c5,
ref_3.collation_name AS c6 ref_3.collation_name AS c6
FROM orders AS sample_6 TABLESAMPLE system (3.8) FROM orders AS sample_6 TABLESAMPLE system (3.8)

12
src/test/regress/expected/stat_statements.out
View File

@ -179,10 +179,10 @@ ORDER BY 1, 2, 3, 4;
SET citus.stat_statements_track TO 'all'; SET citus.stat_statements_track TO 'all';
-- reset pg_stat_statements and verify it also cleans citus_stat_statements output -- reset pg_stat_statements and verify it also cleans citus_stat_statements output
-- verify that entries are actually removed from citus_stat_statements -- verify that entries are actually removed from citus_stat_statements
SELECT pg_stat_statements_reset(); SELECT pg_stat_statements_reset() IS NOT NULL AS t;
pg_stat_statements_reset t
--------------------------------------------------------------------- ---------------------------------------------------------------------
t
(1 row) (1 row)
SELECT * FROM citus_stat_statements; SELECT * FROM citus_stat_statements;
@ -251,10 +251,10 @@ ORDER BY 1, 2, 3, 4;
SELECT l_orderkey FROM lineitem_hash_part WHERE l_orderkey > ? | adaptive | | 1 SELECT l_orderkey FROM lineitem_hash_part WHERE l_orderkey > ? | adaptive | | 1
(6 rows) (6 rows)
SELECT pg_stat_statements_reset(); SELECT pg_stat_statements_reset() IS NOT NULL AS t;
pg_stat_statements_reset t
--------------------------------------------------------------------- ---------------------------------------------------------------------
t
(1 row) (1 row)
SELECT count(*) FROM lineitem_hash_part; SELECT count(*) FROM lineitem_hash_part;

1
src/test/regress/sql/issue_5248.sql
View File

@ -184,7 +184,6 @@ FROM (
sample_6.info AS c1, sample_6.info AS c1,
subq_0.c2 AS c2, subq_0.c2 AS c2,
subq_0.c3 AS c3, subq_0.c3 AS c3,
ref_3.domain_default AS c4,
sample_6.user_id AS c5, sample_6.user_id AS c5,
ref_3.collation_name AS c6 ref_3.collation_name AS c6
FROM orders AS sample_6 TABLESAMPLE system (3.8) FROM orders AS sample_6 TABLESAMPLE system (3.8)

4
src/test/regress/sql/stat_statements.sql
View File

@ -91,7 +91,7 @@ SET citus.stat_statements_track TO 'all';
-- reset pg_stat_statements and verify it also cleans citus_stat_statements output -- reset pg_stat_statements and verify it also cleans citus_stat_statements output
-- verify that entries are actually removed from citus_stat_statements -- verify that entries are actually removed from citus_stat_statements
SELECT pg_stat_statements_reset(); SELECT pg_stat_statements_reset() IS NOT NULL AS t;
SELECT * FROM citus_stat_statements; SELECT * FROM citus_stat_statements;
-- run some queries -- run some queries
@ -109,7 +109,7 @@ SELECT normalize_query_string(query), executor, partition_key, calls
FROM citus_stat_statements FROM citus_stat_statements
ORDER BY 1, 2, 3, 4; ORDER BY 1, 2, 3, 4;
SELECT pg_stat_statements_reset(); SELECT pg_stat_statements_reset() IS NOT NULL AS t;
SELECT count(*) FROM lineitem_hash_part; SELECT count(*) FROM lineitem_hash_part;
SELECT count(*) FROM lineitem_hash_part WHERE l_orderkey = 4; SELECT count(*) FROM lineitem_hash_part WHERE l_orderkey = 4;