From 0eee7fd9b8cc86d704687babbe6533c0884a044d Mon Sep 17 00:00:00 2001 From: Hanefi Onaldi Date: Wed, 29 Jun 2022 22:43:50 +0300 Subject: [PATCH] Fix downgrade scripts from 11.0-2 to 11.0-1 (cherry picked from commit f60809a6c1f4b7a66650332480cf830e7ad8ad91) Conflicts: src/test/regress/expected/multi_extension.out src/test/regress/sql/multi_extension.sql --- .../sql/downgrades/citus--11.0-2--11.0-1.sql | 2 +- src/test/regress/expected/multi_extension.out | 19 +++++++++++++------ src/test/regress/sql/multi_extension.sql | 17 ++++++++++------- 3 files changed, 24 insertions(+), 14 deletions(-) diff --git a/src/backend/distributed/sql/downgrades/citus--11.0-2--11.0-1.sql b/src/backend/distributed/sql/downgrades/citus--11.0-2--11.0-1.sql index 7743d5179..3cbbcc883 100644 --- a/src/backend/distributed/sql/downgrades/citus--11.0-2--11.0-1.sql +++ b/src/backend/distributed/sql/downgrades/citus--11.0-2--11.0-1.sql @@ -1,5 +1,6 @@ #include "../udfs/citus_shards_on_worker/11.0-1.sql" #include "../udfs/citus_shard_indexes_on_worker/11.0-1.sql" +#include "../udfs/citus_finalize_upgrade_to_citus11/11.0-1.sql" DROP FUNCTION pg_catalog.citus_disable_node(text, integer, bool); CREATE FUNCTION pg_catalog.citus_disable_node(nodename text, nodeport integer, force bool default false) @@ -15,5 +16,4 @@ DROP FUNCTION pg_catalog.citus_is_coordinator(); DROP FUNCTION pg_catalog.run_command_on_coordinator(text,boolean); DROP FUNCTION pg_catalog.start_metadata_sync_to_all_nodes(); -DROP FUNCTION pg_catalog.citus_finalize_upgrade_to_citus11(boolean); DROP PROCEDURE pg_catalog.citus_finish_citus_upgrade(); diff --git a/src/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out index 5bb9df393..13d3bb084 100644 --- a/src/test/regress/expected/multi_extension.out +++ b/src/test/regress/expected/multi_extension.out @@ -1031,6 +1031,15 @@ SELECT * FROM multi_extension.print_extension_changes(); | view citus_stat_activity (41 rows) +-- Test downgrade to 11.0-1 from 11.0-2 +ALTER EXTENSION citus UPDATE TO '11.0-2'; +ALTER EXTENSION citus UPDATE TO '11.0-1'; +-- Should be empty result since upgrade+downgrade should be a no-op +SELECT * FROM multi_extension.print_extension_changes(); + previous_object | current_object +--------------------------------------------------------------------- +(0 rows) + -- Snapshot of state at 11.0-2 ALTER EXTENSION citus UPDATE TO '11.0-2'; SELECT * FROM multi_extension.print_extension_changes(); @@ -1042,18 +1051,16 @@ SELECT * FROM multi_extension.print_extension_changes(); | function start_metadata_sync_to_all_nodes() boolean (4 rows) --- Test downgrade script (result should be empty) -ALTER EXTENSION citus UPDATE TO '11.0-1'; -ALTER EXTENSION citus UPDATE TO '11.0-2'; --- Snapshot of state at 11.0-3 +-- Test downgrade to 11.0-2 from 11.0-3 ALTER EXTENSION citus UPDATE TO '11.0-3'; +ALTER EXTENSION citus UPDATE TO '11.0-2'; +-- Should be empty result since upgrade+downgrade should be a no-op SELECT * FROM multi_extension.print_extension_changes(); previous_object | current_object --------------------------------------------------------------------- (0 rows) --- Test downgrade script (result should be empty) -ALTER EXTENSION citus UPDATE TO '11.0-2'; +-- Snapshot of state at 11.0-3 ALTER EXTENSION citus UPDATE TO '11.0-3'; SELECT * FROM multi_extension.print_extension_changes(); previous_object | current_object diff --git a/src/test/regress/sql/multi_extension.sql b/src/test/regress/sql/multi_extension.sql index 697ab31d9..ded997db2 100644 --- a/src/test/regress/sql/multi_extension.sql +++ b/src/test/regress/sql/multi_extension.sql @@ -459,20 +459,23 @@ SELECT * FROM multi_extension.print_extension_changes(); ALTER EXTENSION citus UPDATE TO '11.0-1'; SELECT * FROM multi_extension.print_extension_changes(); +-- Test downgrade to 11.0-1 from 11.0-2 +ALTER EXTENSION citus UPDATE TO '11.0-2'; +ALTER EXTENSION citus UPDATE TO '11.0-1'; +-- Should be empty result since upgrade+downgrade should be a no-op +SELECT * FROM multi_extension.print_extension_changes(); + -- Snapshot of state at 11.0-2 ALTER EXTENSION citus UPDATE TO '11.0-2'; SELECT * FROM multi_extension.print_extension_changes(); --- Test downgrade script (result should be empty) -ALTER EXTENSION citus UPDATE TO '11.0-1'; -ALTER EXTENSION citus UPDATE TO '11.0-2'; - --- Snapshot of state at 11.0-3 +-- Test downgrade to 11.0-2 from 11.0-3 ALTER EXTENSION citus UPDATE TO '11.0-3'; +ALTER EXTENSION citus UPDATE TO '11.0-2'; +-- Should be empty result since upgrade+downgrade should be a no-op SELECT * FROM multi_extension.print_extension_changes(); --- Test downgrade script (result should be empty) -ALTER EXTENSION citus UPDATE TO '11.0-2'; +-- Snapshot of state at 11.0-3 ALTER EXTENSION citus UPDATE TO '11.0-3'; SELECT * FROM multi_extension.print_extension_changes();