Remove regprocedure oid type from catalog

In #6624 we refactored the time bucket catalog table to make it more
generic and save information for all Continuous Aggregates. Previously
it stored only variable bucket size information.

The problem is we used the `regprocedure` type to store the OID of the
given time bucket function but unfortunately it is not supported by
`pg_upgrade`.

Fixed it by changing the column to TEXT and resolve to/from OID using
builtin `regprocedurein` and `format_procedure_qualified` functions.

Fixes #6935

.unreleased/fix_6940

@@ -0,0 +1 @@
+Fixes: #6940 Fix `pg_upgrade` failure by removing `regprocedure` from catalog table

sql/pre_install/tables.sql

@@ -351,7 +351,7 @@ SELECT pg_catalog.pg_extension_config_dump('_timescaledb_catalog.continuous_agg'
 CREATE TABLE _timescaledb_catalog.continuous_aggs_bucket_function (
   mat_hypertable_id integer NOT NULL,
   -- The bucket function
-  bucket_func regprocedure NOT NULL,
+  bucket_func text NOT NULL,
   -- `bucket_width` argument of the function, e.g. "1 month"
   bucket_width text NOT NULL,
   -- optional `origin` argument of the function provided by the user
@@ -364,7 +364,8 @@ CREATE TABLE _timescaledb_catalog.continuous_aggs_bucket_function (
   bucket_fixed_width bool NOT NULL,
   -- table constraints
   CONSTRAINT continuous_aggs_bucket_function_pkey PRIMARY KEY (mat_hypertable_id),
-  CONSTRAINT continuous_aggs_bucket_function_mat_hypertable_id_fkey FOREIGN KEY (mat_hypertable_id) REFERENCES _timescaledb_catalog.hypertable (id) ON DELETE CASCADE
+  CONSTRAINT continuous_aggs_bucket_function_mat_hypertable_id_fkey FOREIGN KEY (mat_hypertable_id) REFERENCES _timescaledb_catalog.hypertable (id) ON DELETE CASCADE,
+  CONSTRAINT continuous_aggs_bucket_function_func_check CHECK (pg_catalog.to_regprocedure(bucket_func) IS DISTINCT FROM 0)
 );
 
 SELECT pg_catalog.pg_extension_config_dump('_timescaledb_catalog.continuous_aggs_bucket_function', '');

sql/updates/latest-dev.sql

@@ -0,0 +1,49 @@
+CREATE TABLE _timescaledb_catalog._tmp_continuous_aggs_bucket_function AS
+    SELECT
+      mat_hypertable_id,
+      bucket_func::text AS bucket_func,
+      bucket_width,
+      bucket_origin,
+      bucket_offset,
+      bucket_timezone,
+      bucket_fixed_width
+    FROM
+      _timescaledb_catalog.continuous_aggs_bucket_function
+    ORDER BY
+         mat_hypertable_id;
+
+ALTER EXTENSION timescaledb
+    DROP TABLE _timescaledb_catalog.continuous_aggs_bucket_function;
+
+DROP TABLE _timescaledb_catalog.continuous_aggs_bucket_function;
+
+CREATE TABLE _timescaledb_catalog.continuous_aggs_bucket_function (
+  mat_hypertable_id integer NOT NULL,
+  -- The bucket function
+  bucket_func text NOT NULL,
+  -- `bucket_width` argument of the function, e.g. "1 month"
+  bucket_width text NOT NULL,
+  -- optional `origin` argument of the function provided by the user
+  bucket_origin text,
+  -- optional `offset` argument of the function provided by the user
+  bucket_offset text,
+  -- optional `timezone` argument of the function provided by the user
+  bucket_timezone text,
+  -- fixed or variable sized bucket
+  bucket_fixed_width bool NOT NULL,
+  -- table constraints
+  CONSTRAINT continuous_aggs_bucket_function_pkey PRIMARY KEY (mat_hypertable_id),
+  CONSTRAINT continuous_aggs_bucket_function_mat_hypertable_id_fkey FOREIGN KEY (mat_hypertable_id) REFERENCES _timescaledb_catalog.hypertable (id) ON DELETE CASCADE,
+  CONSTRAINT continuous_aggs_bucket_function_func_check CHECK (pg_catalog.to_regprocedure(bucket_func) IS DISTINCT FROM 0)
+);
+
+INSERT INTO _timescaledb_catalog.continuous_aggs_bucket_function
+  SELECT * FROM _timescaledb_catalog._tmp_continuous_aggs_bucket_function;
+
+DROP TABLE _timescaledb_catalog._tmp_continuous_aggs_bucket_function;
+
+SELECT pg_catalog.pg_extension_config_dump('_timescaledb_catalog.continuous_aggs_bucket_function', '');
+
+GRANT SELECT ON TABLE _timescaledb_catalog.continuous_aggs_bucket_function TO PUBLIC;
+
+ANALYZE _timescaledb_catalog.continuous_aggs_bucket_function;

sql/updates/reverse-dev.sql

@@ -0,0 +1,48 @@
+CREATE TABLE _timescaledb_catalog._tmp_continuous_aggs_bucket_function AS
+    SELECT
+      mat_hypertable_id,
+      pg_catalog.to_regprocedure(bucket_func) AS bucket_func,
+      bucket_width,
+      bucket_origin,
+      bucket_offset,
+      bucket_timezone,
+      bucket_fixed_width
+    FROM
+      _timescaledb_catalog.continuous_aggs_bucket_function
+    ORDER BY
+         mat_hypertable_id;
+
+ALTER EXTENSION timescaledb
+    DROP TABLE _timescaledb_catalog.continuous_aggs_bucket_function;
+
+DROP TABLE _timescaledb_catalog.continuous_aggs_bucket_function;
+
+CREATE TABLE _timescaledb_catalog.continuous_aggs_bucket_function (
+  mat_hypertable_id integer NOT NULL,
+  -- The bucket function
+  bucket_func regprocedure NOT NULL,
+  -- `bucket_width` argument of the function, e.g. "1 month"
+  bucket_width text NOT NULL,
+  -- optional `origin` argument of the function provided by the user
+  bucket_origin text,
+  -- optional `offset` argument of the function provided by the user
+  bucket_offset text,
+  -- optional `timezone` argument of the function provided by the user
+  bucket_timezone text,
+  -- fixed or variable sized bucket
+  bucket_fixed_width bool NOT NULL,
+  -- table constraints
+  CONSTRAINT continuous_aggs_bucket_function_pkey PRIMARY KEY (mat_hypertable_id),
+  CONSTRAINT continuous_aggs_bucket_function_mat_hypertable_id_fkey FOREIGN KEY (mat_hypertable_id) REFERENCES _timescaledb_catalog.hypertable (id) ON DELETE CASCADE
+);
+
+INSERT INTO _timescaledb_catalog.continuous_aggs_bucket_function
+  SELECT * FROM _timescaledb_catalog._tmp_continuous_aggs_bucket_function;
+
+DROP TABLE _timescaledb_catalog._tmp_continuous_aggs_bucket_function;
+
+SELECT pg_catalog.pg_extension_config_dump('_timescaledb_catalog.continuous_aggs_bucket_function', '');
+
+GRANT SELECT ON TABLE _timescaledb_catalog.continuous_aggs_bucket_function TO PUBLIC;
+
+ANALYZE _timescaledb_catalog.continuous_aggs_bucket_function;

src/ts_catalog/continuous_agg.c

@@ -504,10 +504,10 @@ continuous_agg_fill_bucket_function(int32 mat_hypertable_id, ContinuousAggsBucke
 
 		/* Bucket function */
 		Assert(!isnull[AttrNumberGetAttrOffset(Anum_continuous_aggs_bucket_function_function)]);
-		bf->bucket_function = DatumGetObjectId(
+		const char *bucket_function_str = TextDatumGetCString(
 			values[AttrNumberGetAttrOffset(Anum_continuous_aggs_bucket_function_function)]);
-
-		Assert(OidIsValid(bf->bucket_function));
+		bf->bucket_function = DatumGetObjectId(
+			DirectFunctionCall1(regprocedurein, CStringGetDatum(bucket_function_str)));
 
 		bf->bucket_time_based = ts_continuous_agg_bucket_on_interval(bf->bucket_function);
 

tsl/src/continuous_aggs/create.c

@@ -208,7 +208,7 @@ create_bucket_function_catalog_entry(int32 matht_id, Oid bucket_function, const
 
 	/* Bucket function */
 	values[AttrNumberGetAttrOffset(Anum_continuous_aggs_bucket_function_function)] =
-		ObjectIdGetDatum(bucket_function);
+		CStringGetTextDatum(format_procedure_qualified(bucket_function));
 
 	/* Bucket width */
 	values[AttrNumberGetAttrOffset(Anum_continuous_aggs_bucket_function_bucket_width)] =

tsl/src/continuous_aggs/utils.c

@@ -8,6 +8,7 @@
 #include <commands/view.h>
 #include <storage/lmgr.h>
 #include <utils/acl.h>
+#include <utils/regproc.h>
 #include <utils/timestamp.h>
 
 #include "extension.h"
@@ -308,7 +309,7 @@ cagg_time_bucket_update(TupleInfo *ti, void *data)
 
 	/* Update the bucket function */
 	values[AttrNumberGetAttrOffset(Anum_continuous_aggs_bucket_function_function)] =
-		ObjectIdGetDatum(cagg->bucket_function->bucket_function);
+		CStringGetTextDatum(format_procedure_qualified(cagg->bucket_function->bucket_function));
 	doReplace[AttrNumberGetAttrOffset(Anum_continuous_aggs_bucket_function_function)] = true;
 
 	/* Set new origin if not already present. Time_bucket and time_bucket_ng use different