From cffa4f399f4786c9bf0930c8d9fd37d9742ddc18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20Villemain?= Date: Wed, 26 Mar 2025 12:04:10 +0100 Subject: [PATCH] Remove nodeid and groupid output in a test In multi_read_from_secondaries, there was a select on nodeid and groupid. But in another (future) test a node is dropped then added again, it's ok but its nodeid and groupid are increased which leads to a faillure in this test file. Apparently nodeid and groupid are not really the subject of the test so just remove them from the SELECT. --- .../regress/expected/multi_read_from_secondaries.out | 10 +++++----- src/test/regress/sql/multi_read_from_secondaries.sql | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/test/regress/expected/multi_read_from_secondaries.out b/src/test/regress/expected/multi_read_from_secondaries.out index 9652b6520..585987b1f 100644 --- a/src/test/regress/expected/multi_read_from_secondaries.out +++ b/src/test/regress/expected/multi_read_from_secondaries.out @@ -24,12 +24,12 @@ INSERT INTO dest_table (a, b) VALUES (2, 1); INSERT INTO source_table (a, b) VALUES (1, 5); INSERT INTO source_table (a, b) VALUES (10, 10); -- simulate actually having secondary nodes -SELECT nodeid, groupid, nodename, nodeport, noderack, isactive, noderole, nodecluster FROM pg_dist_node ORDER BY 1, 2; - nodeid | groupid | nodename | nodeport | noderack | isactive | noderole | nodecluster +SELECT nodename, nodeport, noderack, isactive, noderole, nodecluster FROM pg_dist_node ORDER BY 1, 2; + nodename | nodeport | noderack | isactive | noderole | nodecluster --------------------------------------------------------------------- - 1 | 0 | localhost | 57636 | default | t | primary | default - 2 | 1 | localhost | 57637 | default | t | primary | default - 3 | 2 | localhost | 57638 | default | t | primary | default + localhost | 57636 | default | t | primary | default + localhost | 57637 | default | t | primary | default + localhost | 57638 | default | t | primary | default (3 rows) UPDATE pg_dist_node SET noderole = 'secondary'; diff --git a/src/test/regress/sql/multi_read_from_secondaries.sql b/src/test/regress/sql/multi_read_from_secondaries.sql index e50b41256..0da4d5aaf 100644 --- a/src/test/regress/sql/multi_read_from_secondaries.sql +++ b/src/test/regress/sql/multi_read_from_secondaries.sql @@ -20,7 +20,7 @@ INSERT INTO source_table (a, b) VALUES (1, 5); INSERT INTO source_table (a, b) VALUES (10, 10); -- simulate actually having secondary nodes -SELECT nodeid, groupid, nodename, nodeport, noderack, isactive, noderole, nodecluster FROM pg_dist_node ORDER BY 1, 2; +SELECT nodename, nodeport, noderack, isactive, noderole, nodecluster FROM pg_dist_node ORDER BY 1, 2; UPDATE pg_dist_node SET noderole = 'secondary'; \c "dbname=regression options='-c\ citus.use_secondary_nodes=always'"