diff --git a/src/backend/distributed/shared_library_init.c b/src/backend/distributed/shared_library_init.c index 4cf84fe3d..6182e4e8a 100644 --- a/src/backend/distributed/shared_library_init.c +++ b/src/backend/distributed/shared_library_init.c @@ -122,10 +122,6 @@ static bool StatisticsCollectionGucCheckHook(bool *newval, void **extra, GucSour static void CitusAuthHook(Port *port, int status); -/* static variable to hold value of deprecated GUC variable */ -static bool DeprecatedBool = false; -static int DeprecatedInt = 0; - static ClientAuthentication_hook_type original_client_auth_hook = NULL; @@ -566,27 +562,6 @@ RegisterCitusConfigVariables(void) GUC_UNIT_MS | GUC_STANDARD, NULL, NULL, NULL); - DefineCustomIntVariable( - "citus.sslmode", - gettext_noop("This variable has been deprecated. Use the citus.node_conninfo " - "GUC instead."), - NULL, - &DeprecatedInt, - 0, 0, 32, - PGC_POSTMASTER, - GUC_SUPERUSER_ONLY | GUC_NO_SHOW_ALL, - NULL, NULL, NULL); - - DefineCustomBoolVariable( - "citus.binary_master_copy_format", - gettext_noop("This GUC variable has been deprecated."), - NULL, - &DeprecatedBool, - false, - PGC_USERSET, - GUC_STANDARD | GUC_NO_SHOW_ALL, - NULL, NULL, NULL); - DefineCustomBoolVariable( "citus.binary_worker_copy_format", gettext_noop("Use the binary worker copy format."), @@ -599,16 +574,6 @@ RegisterCitusConfigVariables(void) GUC_STANDARD, NULL, NULL, NULL); - DefineCustomBoolVariable( - "citus.expire_cached_shards", - gettext_noop("This GUC variable has been deprecated."), - NULL, - &DeprecatedBool, - false, - PGC_SIGHUP, - GUC_STANDARD | GUC_NO_SHOW_ALL, - NULL, NULL, NULL); - DefineCustomBoolVariable( "citus.enable_local_execution", gettext_noop("Enables queries on shards that are local to the current node " @@ -1220,16 +1185,6 @@ RegisterCitusConfigVariables(void) GUC_UNIT_MS | GUC_STANDARD, NULL, NULL, NULL); - DefineCustomIntVariable( - "citus.task_tracker_delay", - gettext_noop("This GUC variable has been deprecated."), - NULL, - &DeprecatedInt, - 200 * MS, 1, 100 * MS_PER_SECOND, - PGC_SIGHUP, - GUC_UNIT_MS | GUC_STANDARD | GUC_NO_SHOW_ALL, - NULL, NULL, NULL); - DefineCustomIntVariable( "citus.max_cached_conns_per_worker", gettext_noop("Sets the maximum number of connections to cache per worker."), @@ -1244,26 +1199,6 @@ RegisterCitusConfigVariables(void) GUC_STANDARD, NULL, NULL, NULL); - DefineCustomIntVariable( - "citus.max_assign_task_batch_size", - gettext_noop("This GUC variable has been deprecated."), - NULL, - &DeprecatedInt, - 64, 1, INT_MAX, - PGC_USERSET, - GUC_STANDARD | GUC_NO_SHOW_ALL, - NULL, NULL, NULL); - - DefineCustomIntVariable( - "citus.max_tracked_tasks_per_node", - gettext_noop("This GUC variable has been deprecated."), - NULL, - &DeprecatedInt, - 1024, 8, INT_MAX, - PGC_POSTMASTER, - GUC_STANDARD | GUC_NO_SHOW_ALL, - NULL, NULL, NULL); - DefineCustomIntVariable( "citus.repartition_join_bucket_count_per_node", gettext_noop("Sets the bucket size for repartition joins per node"), @@ -1275,16 +1210,6 @@ RegisterCitusConfigVariables(void) GUC_STANDARD | GUC_NO_SHOW_ALL, NULL, NULL, NULL); - DefineCustomIntVariable( - "citus.max_running_tasks_per_node", - gettext_noop("This GUC variable has been deprecated."), - NULL, - &DeprecatedInt, - 8, 1, INT_MAX, - PGC_SIGHUP, - GUC_STANDARD | GUC_NO_SHOW_ALL, - NULL, NULL, NULL); - DefineCustomIntVariable( "citus.partition_buffer_size", gettext_noop("Sets the buffer size to use for partition operations."), @@ -1299,16 +1224,6 @@ RegisterCitusConfigVariables(void) GUC_UNIT_KB | GUC_STANDARD, NULL, NULL, NULL); - DefineCustomIntVariable( - "citus.large_table_shard_count", - gettext_noop("This variable has been deprecated."), - gettext_noop("Consider reference tables instead"), - &DeprecatedInt, - 4, 1, 10000, - PGC_USERSET, - GUC_NO_SHOW_ALL, - NULL, NULL, NULL); - DefineCustomIntVariable( "citus.limit_clause_row_fetch_count", gettext_noop("Number of rows to fetch per task for limit clause optimization."), @@ -1562,16 +1477,6 @@ RegisterCitusConfigVariables(void) GUC_NO_SHOW_ALL, NULL, NULL, NULL); - DefineCustomIntVariable( - "citus.max_task_string_size", - gettext_noop("This GUC variable has been deprecated."), - NULL, - &DeprecatedInt, - 12288, 8192, 65536, - PGC_POSTMASTER, - GUC_STANDARD | GUC_NO_SHOW_ALL, - NULL, NULL, NULL); - DefineCustomBoolVariable( "citus.enable_statistics_collection", gettext_noop("Enables sending basic usage statistics to Citus."), diff --git a/src/test/regress/expected/multi_binary_master_copy_format.out b/src/test/regress/expected/multi_binary_master_copy_format.out deleted file mode 100644 index baee865a0..000000000 --- a/src/test/regress/expected/multi_binary_master_copy_format.out +++ /dev/null @@ -1,32 +0,0 @@ --- --- MULTI_BINARY_MASTER_COPY --- -SET citus.next_shard_id TO 430000; --- Try binary master copy for different executors -SET citus.binary_master_copy_format TO 'on'; -SELECT count(*) FROM lineitem; - count ---------------------------------------------------------------------- - 12000 -(1 row) - -SELECT l_shipmode FROM lineitem WHERE l_partkey = 67310 OR l_partkey = 155190; - l_shipmode ---------------------------------------------------------------------- - TRUCK - MAIL -(2 rows) - -SELECT count(*) FROM lineitem; - count ---------------------------------------------------------------------- - 12000 -(1 row) - -SELECT l_shipmode FROM lineitem WHERE l_partkey = 67310 OR l_partkey = 155190; - l_shipmode ---------------------------------------------------------------------- - TRUCK - MAIL -(2 rows) - diff --git a/src/test/regress/expected/multi_task_string_size.out b/src/test/regress/expected/multi_task_string_size.out index 7e8600c3c..d745a6076 100644 --- a/src/test/regress/expected/multi_task_string_size.out +++ b/src/test/regress/expected/multi_task_string_size.out @@ -211,15 +211,6 @@ SELECT create_distributed_table('wide_table', 'long_column_001'); (1 row) -SHOW citus.max_task_string_size; - citus.max_task_string_size ---------------------------------------------------------------------- - 12288 -(1 row) - --- setting can not be changed on runtime -SET citus.max_task_string_size TO 20000; -ERROR: parameter "citus.max_task_string_size" cannot be changed without restarting the server -- error message may vary between executions -- hiding warning and error message -- no output means the query has failed diff --git a/src/test/regress/multi_schedule b/src/test/regress/multi_schedule index 8c90cbb30..1bc2c9416 100644 --- a/src/test/regress/multi_schedule +++ b/src/test/regress/multi_schedule @@ -123,7 +123,7 @@ test: multi_query_directory_cleanup test: multi_task_assignment_policy multi_cross_shard test: multi_utility_statements test: multi_dropped_column_aliases foreign_key_restriction_enforcement -test: multi_binary_master_copy_format binary_protocol +test: binary_protocol test: alter_table_set_access_method test: alter_distributed_table diff --git a/src/test/regress/multi_schedule_hyperscale b/src/test/regress/multi_schedule_hyperscale index 2bff6e4d3..661436102 100644 --- a/src/test/regress/multi_schedule_hyperscale +++ b/src/test/regress/multi_schedule_hyperscale @@ -74,7 +74,6 @@ test: multi_jsonb_agg multi_jsonb_object_agg multi_json_agg multi_json_object_ag test: multi_agg_type_conversion multi_count_type_conversion test: multi_cross_shard test: multi_dropped_column_aliases foreign_key_restriction_enforcement -test: multi_binary_master_copy_format # ---------- # Parallel TPC-H tests to check our distributed execution behavior diff --git a/src/test/regress/multi_schedule_hyperscale_superuser b/src/test/regress/multi_schedule_hyperscale_superuser index 5fcda010b..19569241b 100644 --- a/src/test/regress/multi_schedule_hyperscale_superuser +++ b/src/test/regress/multi_schedule_hyperscale_superuser @@ -81,7 +81,6 @@ test: multi_join_pruning multi_hash_pruning intermediate_result_pruning test: multi_query_directory_cleanup test: multi_cross_shard test: multi_dropped_column_aliases foreign_key_restriction_enforcement -test: multi_binary_master_copy_format # ---------- # Parallel TPC-H tests to check our distributed execution behavior diff --git a/src/test/regress/sql/multi_binary_master_copy_format.sql b/src/test/regress/sql/multi_binary_master_copy_format.sql deleted file mode 100644 index 5a0f9a073..000000000 --- a/src/test/regress/sql/multi_binary_master_copy_format.sql +++ /dev/null @@ -1,18 +0,0 @@ --- --- MULTI_BINARY_MASTER_COPY --- - - -SET citus.next_shard_id TO 430000; - - --- Try binary master copy for different executors - -SET citus.binary_master_copy_format TO 'on'; - -SELECT count(*) FROM lineitem; -SELECT l_shipmode FROM lineitem WHERE l_partkey = 67310 OR l_partkey = 155190; - - -SELECT count(*) FROM lineitem; -SELECT l_shipmode FROM lineitem WHERE l_partkey = 67310 OR l_partkey = 155190; diff --git a/src/test/regress/sql/multi_task_string_size.sql b/src/test/regress/sql/multi_task_string_size.sql index 969e4ccb4..7253d1106 100644 --- a/src/test/regress/sql/multi_task_string_size.sql +++ b/src/test/regress/sql/multi_task_string_size.sql @@ -209,12 +209,6 @@ CREATE TABLE wide_table SELECT create_distributed_table('wide_table', 'long_column_001'); - -SHOW citus.max_task_string_size; - --- setting can not be changed on runtime -SET citus.max_task_string_size TO 20000; - -- error message may vary between executions -- hiding warning and error message -- no output means the query has failed