Remove experimental multinode functions

This commit removes the following functions: - timescaledb_experimental.block_new_chunks - timescaledb_experimental.allow_new_chunks - timescaledb_experimental.subscription_exec - timescaledb_experimental.move_chunk - timescaledb_experimental.copy_chunk - timescaledb_experimental.cleanup_copy_chunk_operation
timescale · Dec 13, 2023 · 11df1dd · 11df1dd
1 parent 83cf560
commit 11df1dd
Show file tree

Hide file tree

Showing 18 changed files with 56 additions and 1,814 deletions.
diff --git a/cmake/ScriptFiles.cmake b/cmake/ScriptFiles.cmake
@@ -28,7 +28,6 @@ set(SOURCE_FILES
     hypertable.sql
     chunk.sql
     ddl_internal.sql
-    ddl_experimental.sql
     util_time.sql
     util_internal_table_ddl.sql
     chunk_constraint.sql

diff --git a/sql/compat.sql b/sql/compat.sql
@@ -89,16 +89,6 @@ END$$
 SET search_path TO pg_catalog,pg_temp;
 
 
-CREATE OR REPLACE FUNCTION _timescaledb_internal.chunk_drop_replica(chunk regclass,node_name name) RETURNS void LANGUAGE PLPGSQL AS $$
-BEGIN
-  IF current_setting('timescaledb.enable_deprecation_warnings', true)::bool THEN
-    RAISE WARNING 'function _timescaledb_internal.chunk_drop_replica(regclass,name) is deprecated and has been moved to _timescaledb_functions schema. this compatibility function will be removed in a future version.';
-  END IF;
-  PERFORM _timescaledb_functions.chunk_drop_replica($1,$2);
-END$$
-SET search_path TO pg_catalog,pg_temp;
-
-
 CREATE OR REPLACE FUNCTION _timescaledb_internal.chunk_id_from_relid(relid oid) RETURNS integer LANGUAGE PLPGSQL AS $$
 BEGIN
   IF current_setting('timescaledb.enable_deprecation_warnings', true)::bool THEN
@@ -202,16 +192,6 @@ END$$
 SET search_path TO pg_catalog,pg_temp;
 
 
-CREATE OR REPLACE FUNCTION _timescaledb_internal.create_chunk_replica_table(chunk regclass,data_node_name name) RETURNS void LANGUAGE PLPGSQL AS $$
-BEGIN
-  IF current_setting('timescaledb.enable_deprecation_warnings', true)::bool THEN
-    RAISE WARNING 'function _timescaledb_internal.create_chunk_replica_table(regclass,name) is deprecated and has been moved to _timescaledb_functions schema. this compatibility function will be removed in a future version.';
-  END IF;
-  PERFORM _timescaledb_functions.create_chunk_replica_table($1,$2);
-END$$
-SET search_path TO pg_catalog,pg_temp;
-
-
 CREATE OR REPLACE FUNCTION _timescaledb_internal.create_chunk_table(hypertable regclass,slices jsonb,schema_name name,table_name name) RETURNS boolean LANGUAGE PLPGSQL AS $$
 BEGIN
   IF current_setting('timescaledb.enable_deprecation_warnings', true)::bool THEN
@@ -232,44 +212,6 @@ END$$
 SET search_path TO pg_catalog,pg_temp;
 
 
-CREATE OR REPLACE FUNCTION _timescaledb_internal.data_node_chunk_info(node_name name,schema_name_in name,table_name_in name) RETURNS TABLE (chunk_id integer, chunk_schema name, chunk_name name, table_bytes bigint, index_bytes bigint, toast_bytes bigint, total_bytes bigint) LANGUAGE PLPGSQL AS $$
-BEGIN
-  IF current_setting('timescaledb.enable_deprecation_warnings', true)::bool THEN
-    RAISE WARNING 'function _timescaledb_internal.data_node_chunk_info(name,name,name) is deprecated and has been moved to _timescaledb_functions schema. this compatibility function will be removed in a future version.';
-  END IF;
-  RETURN QUERY SELECT * FROM _timescaledb_functions.data_node_chunk_info($1,$2,$3);
-END$$
-SET search_path TO pg_catalog,pg_temp;
-
-
-CREATE OR REPLACE FUNCTION _timescaledb_internal.data_node_compressed_chunk_stats(node_name name,schema_name_in name,table_name_in name) RETURNS TABLE (chunk_schema name, chunk_name name, compression_status text, before_compression_table_bytes bigint, before_compression_index_bytes bigint, before_compression_toast_bytes bigint, before_compression_total_bytes bigint, after_compression_table_bytes bigint, after_compression_index_bytes bigint, after_compression_toast_bytes bigint, after_compression_total_bytes bigint) LANGUAGE PLPGSQL AS $$
-BEGIN
-  IF current_setting('timescaledb.enable_deprecation_warnings', true)::bool THEN
-    RAISE WARNING 'function _timescaledb_internal.data_node_compressed_chunk_stats(name,name,name) is deprecated and has been moved to _timescaledb_functions schema. this compatibility function will be removed in a future version.';
-  END IF;
-  RETURN QUERY SELECT * FROM _timescaledb_functions.data_node_compressed_chunk_stats($1,$2,$3);
-END$$
-SET search_path TO pg_catalog,pg_temp;
-
-
-CREATE OR REPLACE FUNCTION _timescaledb_internal.data_node_hypertable_info(node_name name,schema_name_in name,table_name_in name) RETURNS TABLE (table_bytes bigint, index_bytes bigint, toast_bytes bigint, total_bytes bigint) LANGUAGE PLPGSQL AS $$
-BEGIN
-  IF current_setting('timescaledb.enable_deprecation_warnings', true)::bool THEN
-    RAISE WARNING 'function _timescaledb_internal.data_node_hypertable_info(name,name,name) is deprecated and has been moved to _timescaledb_functions schema. this compatibility function will be removed in a future version.';
-  END IF;
-  RETURN QUERY SELECT * FROM _timescaledb_functions.data_node_hypertable_info($1,$2,$3);
-END$$
-SET search_path TO pg_catalog,pg_temp;
-
-
-CREATE OR REPLACE FUNCTION _timescaledb_internal.data_node_index_size(node_name name,schema_name_in name,table_name_in name) RETURNS TABLE (hypertable_id INTEGER, total_bytes BIGINT) LANGUAGE PLPGSQL AS $$
-BEGIN
-  IF current_setting('timescaledb.enable_deprecation_warnings', true)::bool THEN
-    RAISE WARNING 'function _timescaledb_internal.data_node_index_size(name,name,name) is deprecated and has been moved to _timescaledb_functions schema. this compatibility function will be removed in a future version.';
-  END IF;
-  RETURN QUERY SELECT * FROM _timescaledb_functions.data_node_index_size($1,$2,$3);
-END$$
-SET search_path TO pg_catalog,pg_temp;
 
 
 CREATE OR REPLACE FUNCTION _timescaledb_internal.drop_chunk(chunk regclass) RETURNS boolean LANGUAGE PLPGSQL AS $$
@@ -292,16 +234,6 @@ END$$
 SET search_path TO pg_catalog,pg_temp;
 
 
-CREATE OR REPLACE FUNCTION _timescaledb_internal.drop_stale_chunks(node_name name,chunks integer[]=NULL) RETURNS void LANGUAGE PLPGSQL AS $$
-BEGIN
-  IF current_setting('timescaledb.enable_deprecation_warnings', true)::bool THEN
-    RAISE WARNING 'function _timescaledb_internal.drop_stale_chunks(name,integer[]) is deprecated and has been moved to _timescaledb_functions schema. this compatibility function will be removed in a future version.';
-  END IF;
-  PERFORM _timescaledb_functions.drop_stale_chunks($1,$2);
-END$$
-SET search_path TO pg_catalog,pg_temp;
-
-
 -- We cannot create a wrapper function in plpgsql for the aggregate transition
 -- functions because plpgsql cannot deal with datatype internal but since these
 -- are used in an aggregation context and cannot be called directly and will
@@ -436,15 +368,6 @@ END$$
 SET search_path TO pg_catalog,pg_temp;
 
 
-CREATE OR REPLACE FUNCTION _timescaledb_internal.health() RETURNS TABLE (node_name NAME, healthy BOOL, in_recovery BOOL, error TEXT) LANGUAGE PLPGSQL AS $$
-BEGIN
-  IF current_setting('timescaledb.enable_deprecation_warnings', true)::bool THEN
-    RAISE WARNING 'function _timescaledb_internal.health() is deprecated and has been moved to _timescaledb_functions schema. this compatibility function will be removed in a future version.';
-  END IF;
-  RETURN QUERY SELECT * FROM _timescaledb_functions.health();
-END$$
-SET search_path TO pg_catalog,pg_temp;
-
 CREATE OR REPLACE FUNCTION _timescaledb_internal.hypertable_constraint_add_table_fk_constraint(user_ht_constraint_name name,user_ht_schema_name name,user_ht_table_name name,compress_ht_id integer) RETURNS void LANGUAGE PLPGSQL AS $$
 BEGIN
   IF current_setting('timescaledb.enable_deprecation_warnings', true)::bool THEN
@@ -1005,12 +928,3 @@ END$$
 SET search_path TO pg_catalog,pg_temp;
 
 
-CREATE OR REPLACE PROCEDURE _timescaledb_internal.wait_subscription_sync(schema_name name,table_name name,retry_count integer=18000,retry_delay_ms numeric=0.2) LANGUAGE PLPGSQL AS $$
-BEGIN
-  IF current_setting('timescaledb.enable_deprecation_warnings', true)::bool THEN
-    RAISE WARNING 'procedure _timescaledb_internal.wait_subscription_sync(name,name,integer,numeric) is deprecated and has been moved to _timescaledb_functions schema. this compatibility function will be removed in a future version.';
-  END IF;
-  CALL _timescaledb_functions.wait_subscription_sync($1,$2,$3,$4);
-END$$
-SET search_path TO pg_catalog,pg_temp;
-
diff --git a/sql/ddl_experimental.sql b/sql/ddl_experimental.sql
diff --git a/sql/updates/2.1.1--2.2.0.sql b/sql/updates/2.1.1--2.2.0.sql
@@ -1,8 +1,9 @@
 DROP VIEW IF EXISTS _timescaledb_internal.hypertable_chunk_local_size;
 DROP VIEW IF EXISTS _timescaledb_internal.compressed_chunk_stats;
 
+-- only do stub here to not introduce dependency in shared object in update chain
 CREATE FUNCTION @[email protected]_distributed_restore_point(
     name                   TEXT
 ) RETURNS TABLE(node_name NAME, node_type TEXT, restore_point pg_lsn)
-AS '@MODULE_PATHNAME@', 'ts_create_distributed_restore_point' LANGUAGE C VOLATILE STRICT;
+AS $$SELECT NULL::name,NULL::text,NULL::pg_lsn;$$ LANGUAGE SQL VOLATILE STRICT;
 
diff --git a/sql/updates/2.6.1--2.7.0.sql b/sql/updates/2.6.1--2.7.0.sql
@@ -90,9 +90,10 @@ ALTER TABLE _timescaledb_catalog.continuous_agg
 DROP PROCEDURE IF EXISTS timescaledb_experimental.move_chunk(REGCLASS, NAME, NAME);
 DROP PROCEDURE IF EXISTS timescaledb_experimental.copy_chunk(REGCLASS, NAME, NAME);
 
+-- we only create stub here to prevent dependency on a specific so
 CREATE OR REPLACE FUNCTION timescaledb_experimental.subscription_exec(
     subscription_command TEXT
-) RETURNS VOID AS '@MODULE_PATHNAME@', 'ts_subscription_exec' LANGUAGE C VOLATILE;
+) RETURNS VOID AS '' LANGUAGE SQL VOLATILE;
 
 -- Recreate chunk_copy_operation table with newly added `compress_chunk_name` column
 --

diff --git a/sql/updates/latest-dev.sql b/sql/updates/latest-dev.sql
@@ -85,12 +85,31 @@ DROP PROCEDURE IF EXISTS _timescaledb_functions.wait_subscription_sync;
 DROP FUNCTION IF EXISTS _timescaledb_functions.health;
 DROP FUNCTION IF EXISTS _timescaledb_functions.drop_stale_chunks;
 
+DROP FUNCTION IF EXISTS _timescaledb_internal.create_chunk_replica_table;
+DROP FUNCTION IF EXISTS _timescaledb_internal.chunk_drop_replica;
+DROP PROCEDURE IF EXISTS _timescaledb_internal.wait_subscription_sync;
+DROP FUNCTION IF EXISTS _timescaledb_internal.health;
+DROP FUNCTION IF EXISTS _timescaledb_internal.drop_stale_chunks;
+
+ALTER TABLE _timescaledb_catalog.remote_txn DROP CONSTRAINT remote_txn_remote_transaction_id_check;
+
+DROP TYPE IF EXISTS @[email protected] CASCADE;
 DROP FUNCTION IF EXISTS _timescaledb_functions.rxid_in;
 DROP FUNCTION IF EXISTS _timescaledb_functions.rxid_out;
 
-DROP TYPE IF EXISTS @[email protected];
-
 DROP FUNCTION IF EXISTS _timescaledb_functions.data_node_hypertable_info;
 DROP FUNCTION IF EXISTS _timescaledb_functions.data_node_chunk_info;
 DROP FUNCTION IF EXISTS _timescaledb_functions.data_node_compressed_chunk_stats;
 DROP FUNCTION IF EXISTS _timescaledb_functions.data_node_index_size;
+DROP FUNCTION IF EXISTS _timescaledb_internal.data_node_hypertable_info;
+DROP FUNCTION IF EXISTS _timescaledb_internal.data_node_chunk_info;
+DROP FUNCTION IF EXISTS _timescaledb_internal.data_node_compressed_chunk_stats;
+DROP FUNCTION IF EXISTS _timescaledb_internal.data_node_index_size;
+
+DROP FUNCTION IF EXISTS timescaledb_experimental.block_new_chunks;
+DROP FUNCTION IF EXISTS timescaledb_experimental.allow_new_chunks;
+DROP FUNCTION IF EXISTS timescaledb_experimental.subscription_exec;
+DROP PROCEDURE IF EXISTS timescaledb_experimental.move_chunk;
+DROP PROCEDURE IF EXISTS timescaledb_experimental.copy_chunk;
+DROP PROCEDURE IF EXISTS timescaledb_experimental.cleanup_copy_chunk_operation;
+
diff --git a/sql/updates/reverse-dev.sql b/sql/updates/reverse-dev.sql
@@ -248,7 +248,6 @@ CREATE FUNCTION _timescaledb_functions.drop_stale_chunks(
 ) RETURNS VOID
 AS '@MODULE_PATHNAME@', 'ts_chunks_drop_stale' LANGUAGE C VOLATILE;
 
-
 CREATE FUNCTION _timescaledb_functions.rxid_in(cstring) RETURNS @[email protected]
     AS '@MODULE_PATHNAME@', 'ts_remote_txn_id_in' LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
 
@@ -261,6 +260,8 @@ CREATE TYPE @[email protected] (
   output = _timescaledb_functions.rxid_out
 );
 
+ALTER TABLE _timescaledb_catalog.remote_txn ADD CONSTRAINT remote_txn_remote_transaction_id_check CHECK (remote_transaction_id::@[email protected] IS NOT NULL);
+
 CREATE FUNCTION _timescaledb_functions.data_node_hypertable_info(
     node_name              NAME,
     schema_name_in name,
@@ -308,3 +309,31 @@ CREATE FUNCTION _timescaledb_functions.data_node_index_size(node_name name, sche
 RETURNS TABLE ( hypertable_id INTEGER, total_bytes BIGINT)
 AS '@MODULE_PATHNAME@' , 'ts_dist_remote_hypertable_index_info' LANGUAGE C VOLATILE STRICT;
 
+CREATE FUNCTION timescaledb_experimental.block_new_chunks(data_node_name NAME, hypertable REGCLASS = NULL, force BOOLEAN = FALSE) RETURNS INTEGER
+AS '@MODULE_PATHNAME@', 'ts_data_node_block_new_chunks' LANGUAGE C VOLATILE;
+
+CREATE FUNCTION timescaledb_experimental.allow_new_chunks(data_node_name NAME, hypertable REGCLASS = NULL) RETURNS INTEGER
+AS '@MODULE_PATHNAME@', 'ts_data_node_allow_new_chunks' LANGUAGE C VOLATILE;
+
+CREATE PROCEDURE timescaledb_experimental.move_chunk(
+    chunk REGCLASS,
+    source_node NAME = NULL,
+    destination_node NAME = NULL,
+    operation_id NAME = NULL)
+AS '@MODULE_PATHNAME@', 'ts_move_chunk_proc' LANGUAGE C;
+
+CREATE PROCEDURE timescaledb_experimental.copy_chunk(
+    chunk REGCLASS,
+    source_node NAME = NULL,
+    destination_node NAME = NULL,
+    operation_id NAME = NULL)
+AS '@MODULE_PATHNAME@', 'ts_copy_chunk_proc' LANGUAGE C;
+
+CREATE FUNCTION timescaledb_experimental.subscription_exec(
+    subscription_command TEXT
+) RETURNS VOID AS '@MODULE_PATHNAME@', 'ts_subscription_exec' LANGUAGE C VOLATILE;
+
+CREATE PROCEDURE timescaledb_experimental.cleanup_copy_chunk_operation(
+    operation_id NAME)
+AS '@MODULE_PATHNAME@', 'ts_copy_chunk_cleanup_proc' LANGUAGE C;
+
diff --git a/src/cross_module_fn.c b/src/cross_module_fn.c
@@ -47,10 +47,6 @@ CROSSMODULE_WRAPPER(job_alter_set_hypertable_id);
 
 CROSSMODULE_WRAPPER(reorder_chunk);
 CROSSMODULE_WRAPPER(move_chunk);
-CROSSMODULE_WRAPPER(move_chunk_proc);
-CROSSMODULE_WRAPPER(copy_chunk_proc);
-CROSSMODULE_WRAPPER(copy_chunk_cleanup_proc);
-CROSSMODULE_WRAPPER(subscription_exec);
 
 CROSSMODULE_WRAPPER(policies_add);
 CROSSMODULE_WRAPPER(policies_remove);
@@ -421,12 +417,8 @@ TSDLLEXPORT CrossModuleFunctions ts_cm_functions_default = {
 	.job_run = error_no_default_fn_pg_community,
 	.job_execute = job_execute_default_fn,
 
-	.move_chunk = error_no_default_fn_pg_community,
-	.move_chunk_proc = error_no_default_fn_pg_community,
-	.copy_chunk_proc = error_no_default_fn_pg_community,
-	.copy_chunk_cleanup_proc = error_no_default_fn_pg_community,
-	.subscription_exec = error_no_default_fn_pg_community,
 	.reorder_chunk = error_no_default_fn_pg_community,
+	.move_chunk = error_no_default_fn_pg_community,
 
 	.policies_add = error_no_default_fn_pg_community,
 	.policies_remove = error_no_default_fn_pg_community,

diff --git a/src/cross_module_fn.h b/src/cross_module_fn.h
@@ -88,10 +88,6 @@ typedef struct CrossModuleFunctions
 
 	PGFunction reorder_chunk;
 	PGFunction move_chunk;
-	PGFunction move_chunk_proc;
-	PGFunction copy_chunk_proc;
-	PGFunction subscription_exec;
-	PGFunction copy_chunk_cleanup_proc;
 
 	/* Vectorized queries */
 	bool (*push_down_aggregation)(PlannerInfo *root, AggPath *aggregation_path, Path *subpath);

diff --git a/tsl/src/CMakeLists.txt b/tsl/src/CMakeLists.txt
@@ -1,7 +1,6 @@
 set(SOURCES
     chunk_api.c
     chunk.c
-    chunk_copy.c
     data_node.c
     deparse.c
     dist_util.c