Replace column type of pathman_config_params from oid to text

Maksim Milyutin · Maksim Milyutin · commit b8f179d300fb · 2017-01-23T14:17:33.000+03:00
diff --git a/expected/pathman_permissions.out b/expected/pathman_permissions.out
@@ -41,7 +41,7 @@ SELECT * FROM pathman_config;
 SELECT * FROM pathman_config_params;
          partrel         | enable_parent | auto | init_callback | spawn_using_bgw 
 -------------------------+---------------+------+---------------+-----------------
- permissions.user1_table | f             | t    | -             | f
+ permissions.user1_table | f             | t    |               | f
 (1 row)
 
 /* Should fail */
diff --git a/hash.sql b/hash.sql
@@ -141,7 +141,7 @@ BEGIN
 
 	/* Fetch init_callback from 'params' table */
 	WITH stub_callback(stub) as (values (0))
-	SELECT coalesce(init_callback, 0::REGPROCEDURE)
+	SELECT coalesce(init_callback, NULL)
 	FROM stub_callback
 	LEFT JOIN @extschema@.pathman_config_params AS params
 	ON params.partrel = parent_relid
diff --git a/init.sql b/init.sql
@@ -34,24 +34,25 @@ CREATE TABLE IF NOT EXISTS @extschema@.pathman_config (
  * NOTE: this function is used in CHECK CONSTRAINT.
  */
 CREATE OR REPLACE FUNCTION @extschema@.validate_part_callback(
-	callback		REGPROC,
+	callback		TEXT,
 	raise_error		BOOL DEFAULT TRUE)
 RETURNS BOOL AS 'pg_pathman', 'validate_part_callback_pl'
-LANGUAGE C STRICT;
+LANGUAGE C;
 
 
 /*
  * Optional parameters for partitioned tables.
  *		partrel - regclass (relation type, stored as Oid)
  *		enable_parent - add parent table to plan
  *		auto - enable automatic partition creation
- *		init_callback - cb to be executed on partition creation
+ *		init_callback - text signature of cb to be executed on partition
+ * 						creation
  */
 CREATE TABLE IF NOT EXISTS @extschema@.pathman_config_params (
 	partrel			REGCLASS NOT NULL PRIMARY KEY,
 	enable_parent	BOOLEAN NOT NULL DEFAULT FALSE,
 	auto			BOOLEAN NOT NULL DEFAULT TRUE,
-	init_callback	REGPROCEDURE NOT NULL DEFAULT 0,
+	init_callback	TEXT,
 	spawn_using_bgw	BOOLEAN NOT NULL DEFAULT FALSE
 
 	CHECK (@extschema@.validate_part_callback(init_callback)) /* check signature */
@@ -118,7 +119,7 @@ BEGIN
 	USING relation, value;
 END
 $$
-LANGUAGE plpgsql STRICT;
+LANGUAGE plpgsql;
 
 /*
  * Include\exclude parent relation in query plan.
@@ -157,7 +158,11 @@ CREATE OR REPLACE FUNCTION @extschema@.set_init_callback(
 RETURNS VOID AS
 $$
 BEGIN
-	PERFORM @extschema@.pathman_set_param(relation, 'init_callback', callback);
+	PERFORM @extschema@.pathman_set_param(relation, 'init_callback',
+		CASE WHEN callback <> 0
+			THEN regprocedureout(callback)::text
+			ELSE NULL END);
+
 END
 $$
 LANGUAGE plpgsql STRICT;
diff --git a/range.sql b/range.sql
@@ -1051,7 +1051,7 @@ BEGIN
 
 	/* Fetch init_callback from 'params' table */
 	WITH stub_callback(stub) as (values (0))
-	SELECT coalesce(init_callback, 0::REGPROCEDURE)
+	SELECT coalesce(init_callback, NULL)
 	FROM stub_callback
 	LEFT JOIN @extschema@.pathman_config_params AS params
 	ON params.partrel = parent_relid
diff --git a/src/init.c b/src/init.c
@@ -750,7 +750,6 @@ read_pathman_params(Oid relid, Datum *values, bool *isnull)
 		Assert(!isnull[Anum_pathman_config_params_partrel - 1]);
 		Assert(!isnull[Anum_pathman_config_params_enable_parent - 1]);
 		Assert(!isnull[Anum_pathman_config_params_auto - 1]);
-		Assert(!isnull[Anum_pathman_config_params_init_callback - 1]);
 		Assert(!isnull[Anum_pathman_config_params_spawn_using_bgw - 1]);
 	}
 
diff --git a/src/partition_creation.c b/src/partition_creation.c
@@ -78,6 +78,8 @@ static ObjectAddress create_table_using_stmt(CreateStmt *create_stmt,
 static void copy_foreign_keys(Oid parent_relid, Oid partition_oid);
 static void copy_acl_privileges(Oid parent_relid, Oid partition_relid);
 
+static Oid text2regprocedure(text *proname_args);
+
 static Constraint *make_constraint_common(char *name, Node *raw_expr);
 
 static Value make_string_value_struct(char *str);
@@ -1377,6 +1379,34 @@ make_int_value_struct(int int_val)
 	return val;
 }
 
+/*
+ * Utility function that converts signature of procedure into regprocedure.
+ *
+ * Precondition: proname_args != NULL.
+ *
+ * Returns InvalidOid if proname_args is not found.
+ * Raise error if it's incorrect.
+ */
+static Oid
+text2regprocedure(text *proname_args)
+{
+	FunctionCallInfoData fcinfo;
+	Datum           result;
+
+	InitFunctionCallInfoData(fcinfo, NULL, 1, InvalidOid, NULL, NULL);
+
+#if PG_VERSION_NUM >= 90600
+	fcinfo.arg[0] = PointerGetDatum(proname_args);
+#else
+	fcinfo.arg[0] = CStringGetDatum(text_to_cstring(proname_args));
+#endif
+	fcinfo.argnull[0] = false;
+
+	result = to_regprocedure(&fcinfo);
+
+	return DatumGetObjectId(result);
+}
+
 
 /*
  * ---------------------
@@ -1416,14 +1446,26 @@ invoke_init_callback_internal(init_callback_params *cb_params)
 		/* Search for init_callback entry in PATHMAN_CONFIG_PARAMS */
 		if (read_pathman_params(parent_oid, param_values, param_isnull))
 		{
-			Datum		init_cb_datum; /* Oid of init_callback */
+			Datum		init_cb_datum; /* signature of init_callback */
 			AttrNumber	init_cb_attno = Anum_pathman_config_params_init_callback;
 
-			/* Extract Datum storing callback's Oid */
+			/* Extract Datum storing callback's signature */
 			init_cb_datum = param_values[init_cb_attno - 1];
 
 			/* Cache init_callback's Oid */
-			cb_params->callback = DatumGetObjectId(init_cb_datum);
+			if (init_cb_datum)
+			{
+				cb_params->callback = text2regprocedure(
+						DatumGetTextP(init_cb_datum));
+
+				if (!RegProcedureIsValid(cb_params->callback))
+					ereport(ERROR,
+							(errcode(ERRCODE_INTEGRITY_CONSTRAINT_VIOLATION),
+							 errmsg("callback function \"%s\" doesn't exist",
+								 DatumGetCString(init_cb_datum))));
+			}
+			else
+				cb_params->callback = InvalidOid;
 			cb_params->callback_is_cached = true;
 		}
 	}
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
@@ -792,7 +792,17 @@ prevent_relation_modification(PG_FUNCTION_ARGS)
 Datum
 validate_part_callback_pl(PG_FUNCTION_ARGS)
 {
-	PG_RETURN_BOOL(validate_part_callback(PG_GETARG_OID(0), PG_GETARG_BOOL(1)));
+	const char	   *cb_cstring;
+	Oid				cb_oid;
+
+	if (PG_ARGISNULL(0))
+		PG_RETURN_BOOL(true);
+
+	cb_cstring = text_to_cstring(PG_GETARG_TEXT_P(0));
+	cb_oid = DatumGetObjectId(DirectFunctionCall1(regprocedurein,
+				CStringGetDatum(cb_cstring)));
+
+	PG_RETURN_BOOL(validate_part_callback(cb_oid, PG_GETARG_BOOL(1)));
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -750,7 +750,6 @@ read_pathman_params(Oid relid, Datum values, bool isnull)`
`750`	`750`	`Assert(!isnull[Anum_pathman_config_params_partrel - 1]);`
`751`	`751`	`Assert(!isnull[Anum_pathman_config_params_enable_parent - 1]);`
`752`	`752`	`Assert(!isnull[Anum_pathman_config_params_auto - 1]);`
`753`		`- Assert(!isnull[Anum_pathman_config_params_init_callback - 1]);`
`754`	`753`	`Assert(!isnull[Anum_pathman_config_params_spawn_using_bgw - 1]);`
`755`	`754`	`}`
`756`	`755`