Remove time_bucket_ng

Author: fabriziomello

cmake/ScriptFiles.cmake

@@ -36,7 +36,6 @@ set(SOURCE_FILES
     ddl_triggers.sql
     bookend.sql
     time_bucket.sql
-    time_bucket_ng.sql
     version.sql
     size_utils.sql
     histogram.sql

sql/cagg_migrate.sql

@@ -596,8 +596,3 @@ BEGIN
     WHERE mat_hypertable_id OPERATOR(pg_catalog.=) _cagg_data.mat_hypertable_id;
 END;
 $BODY$;
-
--- Migrate a CAgg which is using the experimental time_bucket_ng function
--- into a CAgg using the regular time_bucket function
-CREATE OR REPLACE PROCEDURE _timescaledb_functions.cagg_migrate_to_time_bucket(cagg REGCLASS)
-   AS '@MODULE_PATHNAME@', 'ts_continuous_agg_migrate_to_time_bucket' LANGUAGE C;

sql/time_bucket_ng.sql

@@ -0,0 +1,10 @@
+-- Remove time_bucket_ng functions
+DROP FUNCTION IF EXISTS timescaledb_experimental.time_bucket_ng(bucket_width INTERVAL, ts DATE);
+DROP FUNCTION IF EXISTS timescaledb_experimental.time_bucket_ng(bucket_width INTERVAL, ts DATE, origin DATE);
+DROP FUNCTION IF EXISTS timescaledb_experimental.time_bucket_ng(bucket_width INTERVAL, ts TIMESTAMP);
+DROP FUNCTION IF EXISTS timescaledb_experimental.time_bucket_ng(bucket_width INTERVAL, ts TIMESTAMP, origin TIMESTAMP);
+DROP FUNCTION IF EXISTS timescaledb_experimental.time_bucket_ng(bucket_width INTERVAL, ts TIMESTAMPTZ, timezone TEXT);
+DROP FUNCTION IF EXISTS timescaledb_experimental.time_bucket_ng(bucket_width INTERVAL, ts TIMESTAMPTZ, origin TIMESTAMPTZ, timezone TEXT);
+DROP FUNCTION IF EXISTS timescaledb_experimental.time_bucket_ng(bucket_width INTERVAL, ts TIMESTAMPTZ);
+DROP FUNCTION IF EXISTS timescaledb_experimental.time_bucket_ng(bucket_width INTERVAL, ts TIMESTAMPTZ, origin TIMESTAMPTZ);
+DROP PROCEDURE IF EXISTS _timescaledb_functions.cagg_migrate_to_time_bucket(cagg REGCLASS);

sql/updates/latest-dev.sql

@@ -83,7 +83,6 @@ CROSSMODULE_WRAPPER(continuous_agg_invalidation_trigger);
 CROSSMODULE_WRAPPER(continuous_agg_refresh);
 CROSSMODULE_WRAPPER(continuous_agg_validate_query);
 CROSSMODULE_WRAPPER(continuous_agg_get_bucket_function);
-CROSSMODULE_WRAPPER(continuous_agg_migrate_to_time_bucket);
 CROSSMODULE_WRAPPER(cagg_try_repair);
 
 CROSSMODULE_WRAPPER(chunk_freeze_chunk);
@@ -335,7 +334,6 @@ TSDLLEXPORT CrossModuleFunctions ts_cm_functions_default = {
 	.continuous_agg_update_options = continuous_agg_update_options_default,
 	.continuous_agg_validate_query = error_no_default_fn_pg_community,
 	.continuous_agg_get_bucket_function = error_no_default_fn_pg_community,
-	.continuous_agg_migrate_to_time_bucket = error_no_default_fn_pg_community,
 	.cagg_try_repair = process_cagg_try_repair,
 
 	/* compression */

src/cross_module_fn.c

@@ -110,7 +110,6 @@ typedef struct CrossModuleFunctions
 										  WithClauseResult *with_clause_options);
 	PGFunction continuous_agg_validate_query;
 	PGFunction continuous_agg_get_bucket_function;
-	PGFunction continuous_agg_migrate_to_time_bucket;
 	PGFunction cagg_try_repair;
 
 	PGFunction compressed_data_send;

src/cross_module_fn.h

@@ -363,66 +363,6 @@ static FuncInfo funcinfo[] = {
 		.group_estimate = time_bucket_group_estimate,
 		.sort_transform = time_bucket_tz_sort_transform,
 	},
-	{
-		.origin = ORIGIN_TIMESCALE_EXPERIMENTAL,
-		.is_bucketing_func = true,
-		.allowed_in_cagg_definition = false,
-		.funcname = "time_bucket_ng",
-		.nargs = 2,
-		.arg_types = { INTERVALOID, DATEOID },
-		.group_estimate = time_bucket_group_estimate,
-		.sort_transform = time_bucket_sort_transform,
-	},
-	{
-		.origin = ORIGIN_TIMESCALE_EXPERIMENTAL,
-		.is_bucketing_func = true,
-		.allowed_in_cagg_definition = false,
-		.funcname = "time_bucket_ng",
-		.nargs = 3,
-		.arg_types = { INTERVALOID, DATEOID, DATEOID },
-		.group_estimate = time_bucket_group_estimate,
-		.sort_transform = time_bucket_sort_transform,
-	},
-	{
-		.origin = ORIGIN_TIMESCALE_EXPERIMENTAL,
-		.is_bucketing_func = true,
-		.allowed_in_cagg_definition = false,
-		.funcname = "time_bucket_ng",
-		.nargs = 2,
-		.arg_types = { INTERVALOID, TIMESTAMPOID },
-		.group_estimate = time_bucket_group_estimate,
-		.sort_transform = time_bucket_sort_transform,
-	},
-	{
-		.origin = ORIGIN_TIMESCALE_EXPERIMENTAL,
-		.is_bucketing_func = true,
-		.allowed_in_cagg_definition = false,
-		.funcname = "time_bucket_ng",
-		.nargs = 3,
-		.arg_types = { INTERVALOID, TIMESTAMPOID, TIMESTAMPOID },
-		.group_estimate = time_bucket_group_estimate,
-		.sort_transform = time_bucket_sort_transform,
-	},
-	{
-		.origin = ORIGIN_TIMESCALE_EXPERIMENTAL,
-		.is_bucketing_func = true,
-		.allowed_in_cagg_definition = false,
-		.funcname = "time_bucket_ng",
-		.nargs = 3,
-		.arg_types = { INTERVALOID, TIMESTAMPTZOID, TEXTOID },
-		.group_estimate = time_bucket_group_estimate,
-		.sort_transform = time_bucket_sort_transform,
-	},
-	{
-		.origin = ORIGIN_TIMESCALE_EXPERIMENTAL,
-		.is_bucketing_func = true,
-		.allowed_in_cagg_definition = false,
-		.funcname = "time_bucket_ng",
-		.nargs = 4,
-		.arg_types = { INTERVALOID, TIMESTAMPTZOID, TIMESTAMPTZOID, TEXTOID },
-		.group_estimate = time_bucket_group_estimate,
-		.sort_transform = time_bucket_sort_transform,
-	},
 	{
 		.origin = ORIGIN_TIMESCALE,
 		.is_bucketing_func = true,

src/func_cache.c

@@ -99,7 +99,6 @@ char *ts_last_tune_time = NULL;
 char *ts_last_tune_version = NULL;
 
 bool ts_guc_debug_require_batch_sorted_merge = false;
-bool ts_guc_debug_allow_cagg_with_deprecated_funcs = false;
 
 #ifdef TS_DEBUG
 bool ts_shutdown_bgw = false;
@@ -847,17 +846,6 @@ _guc_init(void)
 							 /* check_hook= */ NULL,
 							 /* assign_hook= */ NULL,
 							 /* show_hook= */ NULL);
-
-	DefineCustomBoolVariable(/* name= */ MAKE_EXTOPTION("debug_allow_cagg_with_deprecated_funcs"),
-							 /* short_desc= */ "allow new caggs using time_bucket_ng",
-							 /* long_desc= */ "this is for debugging/testing purposes",
-							 /* valueAddr= */ &ts_guc_debug_allow_cagg_with_deprecated_funcs,
-							 /* bootValue= */ false,
-							 /* context= */ PGC_USERSET,
-							 /* flags= */ 0,
-							 /* check_hook= */ NULL,
-							 /* assign_hook= */ NULL,
-							 /* show_hook= */ NULL);
 #endif
 
 	/* register feature flags */

src/guc.c

@@ -85,8 +85,6 @@ extern TSDLLEXPORT bool ts_guc_debug_compression_path_info;
 
 extern TSDLLEXPORT bool ts_guc_debug_require_batch_sorted_merge;
 
-extern TSDLLEXPORT bool ts_guc_debug_allow_cagg_with_deprecated_funcs;
-
 void _guc_init(void);
 
 typedef enum