From cc0597ce213a7fb310435e62258e0f8b3cf6a7fc Mon Sep 17 00:00:00 2001 From: eaydingol Date: Mon, 29 Jan 2024 12:04:06 +0000 Subject: [PATCH] Do not drop citus_internal_add_object_metadata from pg_catalog. --- src/backend/distributed/sql/citus--12.1-1--12.2-1.sql | 1 - .../distributed/sql/downgrades/citus--12.2-1--12.1-1.sql | 2 -- src/test/regress/expected/multi_extension.out | 3 +-- src/test/regress/expected/upgrade_list_citus_objects.out | 3 ++- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/src/backend/distributed/sql/citus--12.1-1--12.2-1.sql b/src/backend/distributed/sql/citus--12.1-1--12.2-1.sql index 84734eaee..e08afbfea 100644 --- a/src/backend/distributed/sql/citus--12.1-1--12.2-1.sql +++ b/src/backend/distributed/sql/citus--12.1-1--12.2-1.sql @@ -29,7 +29,6 @@ REVOKE ALL ON FUNCTION citus_internal.start_management_transaction FROM PUBLIC; DROP FUNCTION pg_catalog.citus_internal_add_colocation_metadata(int, int, int, regtype, oid); #include "udfs/citus_internal_add_colocation_metadata/12.2-1.sql" -DROP FUNCTION pg_catalog.citus_internal_add_object_metadata(text, text[], text[], integer, integer, boolean); #include "udfs/citus_internal_add_object_metadata/12.2-1.sql" #include "udfs/citus_internal_add_partition_metadata/12.2-1.sql" diff --git a/src/backend/distributed/sql/downgrades/citus--12.2-1--12.1-1.sql b/src/backend/distributed/sql/downgrades/citus--12.2-1--12.1-1.sql index 83607b582..f439214aa 100644 --- a/src/backend/distributed/sql/downgrades/citus--12.2-1--12.1-1.sql +++ b/src/backend/distributed/sql/downgrades/citus--12.2-1--12.1-1.sql @@ -27,7 +27,5 @@ DROP FUNCTION citus_internal.add_colocation_metadata(int, int, int, regtype, oid #include "../udfs/citus_internal_add_colocation_metadata/11.0-1.sql" DROP FUNCTION citus_internal.add_object_metadata(text, text[], text[], integer, integer, boolean); -#include "../udfs/citus_internal_add_object_metadata/11.0-1.sql" DROP FUNCTION citus_internal.add_partition_metadata(regclass, "char", text, integer, "char"); -#include "../udfs/citus_internal_add_partition_metadata/10.2-1.sql" diff --git a/src/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out index bab08cb00..aac21b213 100644 --- a/src/test/regress/expected/multi_extension.out +++ b/src/test/regress/expected/multi_extension.out @@ -1423,7 +1423,6 @@ SELECT * FROM multi_extension.print_extension_changes(); previous_object | current_object --------------------------------------------------------------------- function citus_internal_add_colocation_metadata(integer,integer,integer,regtype,oid) void | - function citus_internal_add_object_metadata(text,text[],text[],integer,integer,boolean) void | | function citus_internal.acquire_citus_advisory_object_class_lock(integer,cstring) void | function citus_internal.add_colocation_metadata(integer,integer,integer,regtype,oid) void | function citus_internal.add_object_metadata(text,text[],text[],integer,integer,boolean) void @@ -1433,7 +1432,7 @@ SELECT * FROM multi_extension.print_extension_changes(); | function citus_internal.mark_object_distributed(oid,text,oid,text) void | function citus_internal.start_management_transaction(xid8) void | function citus_internal_database_command(text) void -(11 rows) +(10 rows) DROP TABLE multi_extension.prev_objects, multi_extension.extension_diff; -- show running version diff --git a/src/test/regress/expected/upgrade_list_citus_objects.out b/src/test/regress/expected/upgrade_list_citus_objects.out index 8c8a08e19..f375dff35 100644 --- a/src/test/regress/expected/upgrade_list_citus_objects.out +++ b/src/test/regress/expected/upgrade_list_citus_objects.out @@ -71,6 +71,7 @@ ORDER BY 1; function citus_internal.replace_isolation_tester_func() function citus_internal.restore_isolation_tester_func() function citus_internal.start_management_transaction(xid8) + function citus_internal_add_object_metadata(text,text[],text[],integer,integer,boolean) function citus_internal_add_partition_metadata(regclass,"char",text,integer,"char") function citus_internal_add_placement_metadata(bigint,bigint,integer,bigint) function citus_internal_add_placement_metadata(bigint,integer,bigint,integer,bigint) @@ -350,5 +351,5 @@ ORDER BY 1; view citus_stat_tenants_local view pg_dist_shard_placement view time_partitions -(340 rows) +(341 rows)