From 1a4482a37c5163a1ce1f1656ae744ea0044ccfbf Mon Sep 17 00:00:00 2001 From: Onur Tirtir Date: Tue, 26 Jan 2021 11:19:02 +0300 Subject: [PATCH] Get rid of the sql dir for new udf --- src/backend/distributed/sql/citus--9.5-1--10.0-1.sql | 1 - .../distributed/sql/downgrades/citus--10.0-1--9.5-1.sql | 1 - .../sql/udfs/citus_add_local_table_to_metadata/10.0-1.sql | 6 ------ .../sql/udfs/citus_add_local_table_to_metadata/latest.sql | 6 ------ .../sql/udfs/create_citus_local_table/10.0-1.sql | 6 +++--- .../sql/udfs/create_citus_local_table/latest.sql | 6 +++--- src/test/regress/expected/multi_extension.out | 3 +-- src/test/regress/expected/multi_extension_0.out | 3 +-- src/test/regress/expected/upgrade_list_citus_objects.out | 3 +-- src/test/regress/expected/upgrade_list_citus_objects_0.out | 3 +-- 10 files changed, 10 insertions(+), 28 deletions(-) delete mode 100644 src/backend/distributed/sql/udfs/citus_add_local_table_to_metadata/10.0-1.sql delete mode 100644 src/backend/distributed/sql/udfs/citus_add_local_table_to_metadata/latest.sql diff --git a/src/backend/distributed/sql/citus--9.5-1--10.0-1.sql b/src/backend/distributed/sql/citus--9.5-1--10.0-1.sql index d45e3362e..c305fec8d 100644 --- a/src/backend/distributed/sql/citus--9.5-1--10.0-1.sql +++ b/src/backend/distributed/sql/citus--9.5-1--10.0-1.sql @@ -10,7 +10,6 @@ DROP FUNCTION IF EXISTS pg_catalog.citus_total_relation_size(regclass); #include "udfs/alter_table_set_access_method/10.0-1.sql" #include "udfs/undistribute_table/10.0-1.sql" #include "udfs/create_citus_local_table/10.0-1.sql" -#include "udfs/citus_add_local_table_to_metadata/10.0-1.sql" #include "udfs/citus_set_coordinator_host/10.0-1.sql" #include "udfs/citus_add_node/10.0-1.sql" #include "udfs/citus_activate_node/10.0-1.sql" diff --git a/src/backend/distributed/sql/downgrades/citus--10.0-1--9.5-1.sql b/src/backend/distributed/sql/downgrades/citus--10.0-1--9.5-1.sql index 1824d2ad8..fd8a9fbf5 100644 --- a/src/backend/distributed/sql/downgrades/citus--10.0-1--9.5-1.sql +++ b/src/backend/distributed/sql/downgrades/citus--10.0-1--9.5-1.sql @@ -23,7 +23,6 @@ DROP FUNCTION pg_catalog.alter_distributed_table(regclass, text, int, text, bool DROP FUNCTION pg_catalog.alter_table_set_access_method(regclass, text); DROP FUNCTION pg_catalog.citus_total_relation_size(regclass,boolean); DROP FUNCTION pg_catalog.undistribute_table(regclass,boolean); -DROP FUNCTION pg_catalog.create_citus_local_table(regclass,boolean); DROP FUNCTION pg_catalog.citus_add_local_table_to_metadata(regclass,boolean); DROP FUNCTION pg_catalog.citus_add_node(text, integer, integer, noderole, name); DROP FUNCTION pg_catalog.citus_activate_node(text, integer); diff --git a/src/backend/distributed/sql/udfs/citus_add_local_table_to_metadata/10.0-1.sql b/src/backend/distributed/sql/udfs/citus_add_local_table_to_metadata/10.0-1.sql deleted file mode 100644 index 608883de2..000000000 --- a/src/backend/distributed/sql/udfs/citus_add_local_table_to_metadata/10.0-1.sql +++ /dev/null @@ -1,6 +0,0 @@ -CREATE OR REPLACE FUNCTION pg_catalog.citus_add_local_table_to_metadata(table_name regclass, cascade_via_foreign_keys boolean default false) - RETURNS void - LANGUAGE C STRICT - AS 'MODULE_PATHNAME', $$citus_add_local_table_to_metadata$$; -COMMENT ON FUNCTION pg_catalog.citus_add_local_table_to_metadata(table_name regclass, cascade_via_foreign_keys boolean) - IS 'create a citus local table'; diff --git a/src/backend/distributed/sql/udfs/citus_add_local_table_to_metadata/latest.sql b/src/backend/distributed/sql/udfs/citus_add_local_table_to_metadata/latest.sql deleted file mode 100644 index 608883de2..000000000 --- a/src/backend/distributed/sql/udfs/citus_add_local_table_to_metadata/latest.sql +++ /dev/null @@ -1,6 +0,0 @@ -CREATE OR REPLACE FUNCTION pg_catalog.citus_add_local_table_to_metadata(table_name regclass, cascade_via_foreign_keys boolean default false) - RETURNS void - LANGUAGE C STRICT - AS 'MODULE_PATHNAME', $$citus_add_local_table_to_metadata$$; -COMMENT ON FUNCTION pg_catalog.citus_add_local_table_to_metadata(table_name regclass, cascade_via_foreign_keys boolean) - IS 'create a citus local table'; diff --git a/src/backend/distributed/sql/udfs/create_citus_local_table/10.0-1.sql b/src/backend/distributed/sql/udfs/create_citus_local_table/10.0-1.sql index 251580c5a..6efe7bcf1 100644 --- a/src/backend/distributed/sql/udfs/create_citus_local_table/10.0-1.sql +++ b/src/backend/distributed/sql/udfs/create_citus_local_table/10.0-1.sql @@ -1,7 +1,7 @@ DROP FUNCTION pg_catalog.create_citus_local_table(regclass); -CREATE OR REPLACE FUNCTION pg_catalog.create_citus_local_table(table_name regclass, cascade_via_foreign_keys boolean default false) +CREATE OR REPLACE FUNCTION pg_catalog.citus_add_local_table_to_metadata(table_name regclass, cascade_via_foreign_keys boolean default false) RETURNS void LANGUAGE C STRICT - AS 'MODULE_PATHNAME', $$create_citus_local_table$$; -COMMENT ON FUNCTION pg_catalog.create_citus_local_table(table_name regclass, cascade_via_foreign_keys boolean) + AS 'MODULE_PATHNAME', $$citus_add_local_table_to_metadata$$; +COMMENT ON FUNCTION pg_catalog.citus_add_local_table_to_metadata(table_name regclass, cascade_via_foreign_keys boolean) IS 'create a citus local table'; diff --git a/src/backend/distributed/sql/udfs/create_citus_local_table/latest.sql b/src/backend/distributed/sql/udfs/create_citus_local_table/latest.sql index 251580c5a..6efe7bcf1 100644 --- a/src/backend/distributed/sql/udfs/create_citus_local_table/latest.sql +++ b/src/backend/distributed/sql/udfs/create_citus_local_table/latest.sql @@ -1,7 +1,7 @@ DROP FUNCTION pg_catalog.create_citus_local_table(regclass); -CREATE OR REPLACE FUNCTION pg_catalog.create_citus_local_table(table_name regclass, cascade_via_foreign_keys boolean default false) +CREATE OR REPLACE FUNCTION pg_catalog.citus_add_local_table_to_metadata(table_name regclass, cascade_via_foreign_keys boolean default false) RETURNS void LANGUAGE C STRICT - AS 'MODULE_PATHNAME', $$create_citus_local_table$$; -COMMENT ON FUNCTION pg_catalog.create_citus_local_table(table_name regclass, cascade_via_foreign_keys boolean) + AS 'MODULE_PATHNAME', $$citus_add_local_table_to_metadata$$; +COMMENT ON FUNCTION pg_catalog.citus_add_local_table_to_metadata(table_name regclass, cascade_via_foreign_keys boolean) IS 'create a citus local table'; diff --git a/src/test/regress/expected/multi_extension.out b/src/test/regress/expected/multi_extension.out index b18e96106..5fbe24308 100644 --- a/src/test/regress/expected/multi_extension.out +++ b/src/test/regress/expected/multi_extension.out @@ -495,7 +495,6 @@ SELECT * FROM print_extension_changes(); | function citus_update_shard_statistics(bigint) | function citus_update_table_statistics(regclass) | function columnar.columnar_handler(internal) - | function create_citus_local_table(regclass,boolean) | function notify_constraint_dropped() | function remove_local_tables_from_metadata() | function time_partition_range(regclass) @@ -509,7 +508,7 @@ SELECT * FROM print_extension_changes(); | view citus_shards | view citus_tables | view time_partitions -(64 rows) +(63 rows) DROP TABLE prev_objects, extension_diff; -- show running version diff --git a/src/test/regress/expected/multi_extension_0.out b/src/test/regress/expected/multi_extension_0.out index 5bedcac82..582e0fc9f 100644 --- a/src/test/regress/expected/multi_extension_0.out +++ b/src/test/regress/expected/multi_extension_0.out @@ -491,7 +491,6 @@ SELECT * FROM print_extension_changes(); | function citus_update_node(integer,text,integer,boolean,integer) | function citus_update_shard_statistics(bigint) | function citus_update_table_statistics(regclass) - | function create_citus_local_table(regclass,boolean) | function notify_constraint_dropped() | function remove_local_tables_from_metadata() | function time_partition_range(regclass) @@ -505,7 +504,7 @@ SELECT * FROM print_extension_changes(); | view citus_shards | view citus_tables | view time_partitions -(60 rows) +(59 rows) DROP TABLE prev_objects, 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 64ca826cc..3b852facc 100644 --- a/src/test/regress/expected/upgrade_list_citus_objects.out +++ b/src/test/regress/expected/upgrade_list_citus_objects.out @@ -104,7 +104,6 @@ ORDER BY 1; function coord_combine_agg(oid,cstring,anyelement) function coord_combine_agg_ffunc(internal,oid,cstring,anyelement) function coord_combine_agg_sfunc(internal,oid,cstring,anyelement) - function create_citus_local_table(regclass,boolean) function create_distributed_function(regprocedure,text,text) function create_distributed_table(regclass,text,citus.distribution_type,text) function create_intermediate_result(text,text) @@ -239,5 +238,5 @@ ORDER BY 1; view citus_worker_stat_activity view pg_dist_shard_placement view time_partitions -(223 rows) +(222 rows) diff --git a/src/test/regress/expected/upgrade_list_citus_objects_0.out b/src/test/regress/expected/upgrade_list_citus_objects_0.out index 8d450dfa1..9835daf7d 100644 --- a/src/test/regress/expected/upgrade_list_citus_objects_0.out +++ b/src/test/regress/expected/upgrade_list_citus_objects_0.out @@ -100,7 +100,6 @@ ORDER BY 1; function coord_combine_agg(oid,cstring,anyelement) function coord_combine_agg_ffunc(internal,oid,cstring,anyelement) function coord_combine_agg_sfunc(internal,oid,cstring,anyelement) - function create_citus_local_table(regclass,boolean) function create_distributed_function(regprocedure,text,text) function create_distributed_table(regclass,text,citus.distribution_type,text) function create_intermediate_result(text,text) @@ -235,5 +234,5 @@ ORDER BY 1; view citus_worker_stat_activity view pg_dist_shard_placement view time_partitions -(219 rows) +(218 rows)