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

PG17 compatibility: fix backend type orders in test (#7760) 

This work was already done by @m3hm3t and approved as part of
https://github.com/citusdata/citus/pull/7722
I separated it in this PR since the previous one contained other changes
which we don't currently want to merge.

Relevant PG commit:

---------

Co-authored-by: Mehmet YILMAZ <mehmety87@gmail.com>
pull/7761/head
Naisila Puka 2024-11-22 01:08:15 +03:00 committed by GitHub
parent d7f04aa187
commit 65dcc5904d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/test/regress/expected/multi_mx_hide_shard_names.out
View File

@ -473,19 +473,25 @@ SELECT relname FROM pg_catalog.pg_class WHERE relnamespace = 'mx_hide_shard_name
-- PG16 added one more backend type B_STANDALONE_BACKEND -- PG16 added one more backend type B_STANDALONE_BACKEND
-- and also alphabetized the backend types, hence the orders changed -- and also alphabetized the backend types, hence the orders changed
-- Relevant PG commit: -- Relevant PG16 commit:
-- https://github.com/postgres/postgres/commit/0c679464a837079acc75ff1d45eaa83f79e05690 -- https://github.com/postgres/postgres/commit/0c679464a837079acc75ff1d45eaa83f79e05690
-- Relevant Pg17 commit:
-- https://github.com/postgres/postgres/commit/067701f57758f9baed5bd9d868539738d77bfa92#diff-afc0ebd67534b71b5b94b29a1387aa6eedffe342a5539f52d686428be323e802
SHOW server_version \gset SHOW server_version \gset
SELECT substring(:'server_version', '\d+')::int >= 16 AS server_version_ge_16 SELECT substring(:'server_version', '\d+')::int >= 17 AS server_version_ge_17 \gset
\gset SELECT substring(:'server_version', '\d+')::int >= 16 AS server_version_ge_16 \gset
\if :server_version_ge_16 \if :server_version_ge_17
SELECT 4 AS client_backend \gset SELECT 1 AS client_backend \gset
SELECT 5 AS bgworker \gset SELECT 4 AS bgworker \gset
SELECT 12 AS walsender \gset SELECT 5 AS walsender \gset
\elif :server_version_ge_16
SELECT 4 AS client_backend \gset
SELECT 5 AS bgworker \gset
SELECT 12 AS walsender \gset
\else \else
SELECT 3 AS client_backend \gset SELECT 3 AS client_backend \gset
SELECT 4 AS bgworker \gset SELECT 4 AS bgworker \gset
SELECT 9 AS walsender \gset SELECT 9 AS walsender \gset
\endif \endif
-- say, we set it to bgworker -- say, we set it to bgworker
-- the shards and indexes do not show up -- the shards and indexes do not show up

27
src/test/regress/sql/multi_mx_hide_shard_names.sql
View File

@ -246,20 +246,25 @@ SELECT relname FROM pg_catalog.pg_class WHERE relnamespace = 'mx_hide_shard_name
-- PG16 added one more backend type B_STANDALONE_BACKEND -- PG16 added one more backend type B_STANDALONE_BACKEND
-- and also alphabetized the backend types, hence the orders changed -- and also alphabetized the backend types, hence the orders changed
-- Relevant PG commit: -- Relevant PG16 commit:
-- https://github.com/postgres/postgres/commit/0c679464a837079acc75ff1d45eaa83f79e05690 -- https://github.com/postgres/postgres/commit/0c679464a837079acc75ff1d45eaa83f79e05690
-- Relevant Pg17 commit:
-- https://github.com/postgres/postgres/commit/067701f57758f9baed5bd9d868539738d77bfa92#diff-afc0ebd67534b71b5b94b29a1387aa6eedffe342a5539f52d686428be323e802
SHOW server_version \gset SHOW server_version \gset
SELECT substring(:'server_version', '\d+')::int >= 16 AS server_version_ge_16 SELECT substring(:'server_version', '\d+')::int >= 17 AS server_version_ge_17 \gset
\gset SELECT substring(:'server_version', '\d+')::int >= 16 AS server_version_ge_16 \gset
\if :server_version_ge_17
\if :server_version_ge_16 SELECT 1 AS client_backend \gset
SELECT 4 AS client_backend \gset SELECT 4 AS bgworker \gset
SELECT 5 AS bgworker \gset SELECT 5 AS walsender \gset
SELECT 12 AS walsender \gset \elif :server_version_ge_16
SELECT 4 AS client_backend \gset
SELECT 5 AS bgworker \gset
SELECT 12 AS walsender \gset
\else \else
SELECT 3 AS client_backend \gset SELECT 3 AS client_backend \gset
SELECT 4 AS bgworker \gset SELECT 4 AS bgworker \gset
SELECT 9 AS walsender \gset SELECT 9 AS walsender \gset
\endif \endif
-- say, we set it to bgworker -- say, we set it to bgworker