improve function set_init_callback(), other fixes

funbringer · funbringer · commit 338a2cd6d5ed · 2017-02-09T20:21:29.000+03:00
diff --git a/expected/pathman_callbacks.out b/expected/pathman_callbacks.out
@@ -150,7 +150,7 @@ INSERT INTO abc VALUES (201, 0);
 WARNING:  callback arg: {"parent": "abc", "parttype": "2", "partition": "abc_3", "range_max": "301", "range_min": "201", "parent_schema": "public", "partition_schema": "public"}
 DROP FUNCTION callbacks.abc_on_part_created_callback(jsonb);
 INSERT INTO abc VALUES (301, 0);
-ERROR:  create_partitions_internal(): callback function "]callbacks.abc_on_part_created_callback(jsonb)" doesn't exist
+ERROR:  callback function "callbacks.abc_on_part_created_callback(jsonb)" does not exist
 CREATE OR REPLACE FUNCTION callbacks.abc_on_part_created_callback(
 	args JSONB)
 RETURNS VOID AS $$
diff --git a/init.sql b/init.sql
@@ -158,19 +158,23 @@ CREATE OR REPLACE FUNCTION @extschema@.set_init_callback(
 RETURNS VOID AS
 $$
 DECLARE
-	regproc_text	TEXT;
+	regproc_text	TEXT := NULL;
+
 BEGIN
+
+	/* Fetch schema-qualified name of callback */
 	IF callback != 0 THEN
-		EXECUTE 'SELECT quote_ident(nspname) || ''.'' || quote_ident(proname)'
-				'	|| ''('' || (SELECT string_agg(x.argtype::regtype::text, '','')'
-				'				 FROM unnest(proargtypes) AS x(argtype))'
-				'	|| '')'''
-				'FROM pg_proc p JOIN pg_namespace n ON n.oid=p.pronamespace WHERE p.oid=$1'
-			INTO regproc_text
-			USING callback;
-	ELSE
-		regproc_text := NULL;
+		SELECT quote_ident(nspname) || '.' ||
+			   quote_ident(proname) || '(' ||
+					(SELECT string_agg(x.argtype::REGTYPE::TEXT, ',')
+					 FROM unnest(proargtypes) AS x(argtype)) ||
+			   ')'
+		FROM pg_catalog.pg_proc p JOIN pg_catalog.pg_namespace n
+		ON n.oid = p.pronamespace
+		WHERE p.oid = callback
+		INTO regproc_text; /* <= result */
 	END IF;
+
 	PERFORM @extschema@.pathman_set_param(relation, 'init_callback', regproc_text);
 END
 $$
diff --git a/src/partition_creation.c b/src/partition_creation.c
@@ -78,7 +78,7 @@ static ObjectAddress create_table_using_stmt(CreateStmt *create_stmt,
 static void copy_foreign_keys(Oid parent_relid, Oid partition_oid);
 static void postprocess_child_table_and_atts(Oid parent_relid, Oid partition_relid);
 
-static Oid text2regprocedure(text *proname_args);
+static Oid text_to_regprocedure(text *proname_args);
 
 static Constraint *make_constraint_common(char *name, Node *raw_expr);
 
@@ -400,19 +400,20 @@ create_partitions_for_value_internal(Oid relid, Datum value, Oid value_type)
 	{
 		ErrorData *edata;
 
+		/* Simply rethrow ERROR if we're in backend */
+		if (!IsBackgroundWorker)
+			PG_RE_THROW();
+
 		/* Switch to the original context & copy edata */
 		MemoryContextSwitchTo(old_mcxt);
 		edata = CopyErrorData();
 		FlushErrorState();
 
-		if (IsBackgroundWorker)
-			ereport(LOG,
-					(errmsg("create_partitions_internal(): %s [%u]", edata->message, MyProcPid),
-					 (edata->detail) ? errdetail("%s", edata->detail) : 0));
-		else
-			ereport(ERROR,
-					(errmsg("create_partitions_internal(): %s", edata->message),
-					 (edata->detail) ? errdetail("%s", edata->detail) : 0));
+		/* Produce log message if we're in BGW */
+		ereport(LOG,
+				(errmsg(CppAsString(create_partitions_for_value_internal) ": %s [%u]",
+						edata->message, MyProcPid),
+				(edata->detail) ? errdetail("%s", edata->detail) : 0));
 
 		FreeErrorData(edata);
 
@@ -1391,34 +1392,6 @@ make_int_value_struct(int int_val)
 	return val;
 }
 
-/*
- * Utility function that converts signature of procedure into regprocedure.
- *
- * Precondition: proc_signature != NULL.
- *
- * Returns InvalidOid if proname_args is not found.
- * Raise error if it's incorrect.
- */
-static Oid
-text2regprocedure(text *proc_signature)
-{
-	FunctionCallInfoData fcinfo;
-	Datum           result;
-
-	InitFunctionCallInfoData(fcinfo, NULL, 1, InvalidOid, NULL, NULL);
-
-#if PG_VERSION_NUM >= 90600
-	fcinfo.arg[0] = PointerGetDatum(proc_signature);
-#else
-	fcinfo.arg[0] = CStringGetDatum(text_to_cstring(proc_signature));
-#endif
-	fcinfo.argnull[0] = false;
-
-	result = to_regprocedure(&fcinfo);
-
-	return DatumGetObjectId(result);
-}
-
 
 /*
  * ---------------------
@@ -1467,14 +1440,14 @@ invoke_init_callback_internal(init_callback_params *cb_params)
 			/* Cache init_callback's Oid */
 			if (init_cb_datum)
 			{
-				cb_params->callback = text2regprocedure(
-						DatumGetTextP(init_cb_datum));
+				/* Try fetching callback's Oid */
+				cb_params->callback = text_to_regprocedure(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))));
+							 errmsg("callback function \"%s\" does not exist",
+									TextDatumGetCString(init_cb_datum))));
 			}
 			else
 				cb_params->callback = InvalidOid;
@@ -1609,3 +1582,31 @@ validate_part_callback(Oid procid, bool emit_error)
 
 	return is_ok;
 }
+
+/*
+ * Utility function that converts signature of procedure into regprocedure.
+ *
+ * Precondition: proc_signature != NULL.
+ *
+ * Returns InvalidOid if proname_args is not found.
+ * Raise error if it's incorrect.
+ */
+static Oid
+text_to_regprocedure(text *proc_signature)
+{
+	FunctionCallInfoData	fcinfo;
+	Datum					result;
+
+	InitFunctionCallInfoData(fcinfo, NULL, 1, InvalidOid, NULL, NULL);
+
+#if PG_VERSION_NUM >= 90600
+	fcinfo.arg[0] = PointerGetDatum(proc_signature);
+#else
+	fcinfo.arg[0] = CStringGetDatum(text_to_cstring(proc_signature));
+#endif
+	fcinfo.argnull[0] = false;
+
+	result = to_regprocedure(&fcinfo);
+
+	return DatumGetObjectId(result);
+}
