small fixes here and there

Author: funbringer

src/partition_creation.c

@@ -432,29 +432,28 @@ create_partitions_for_value_internal(Oid relid, Datum value, Oid value_type,
 			}
 		}
 		else
-			elog(ERROR, "pg_pathman's config does not contain relation \"%s\"",
+			elog(ERROR, "table \"%s\" is not partitioned",
 				 get_rel_name_or_relid(relid));
 	}
 	PG_CATCH();
 	{
-		ErrorData *edata;
+		ErrorData *error;
 
 		/* Simply rethrow ERROR if we're in backend */
 		if (!is_background_worker)
 			PG_RE_THROW();
 
 		/* Switch to the original context & copy edata */
 		MemoryContextSwitchTo(old_mcxt);
-		edata = CopyErrorData();
+		error = CopyErrorData();
 		FlushErrorState();
 
 		/* 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));
+		error->elevel	= LOG;
+		error->message	= psprintf(CppAsString(create_partitions_for_value_internal)
+								   ": %s [%u]", error->message, MyProcPid);
 
-		FreeErrorData(edata);
+		ReThrowError(error);
 
 		/* Reset 'partid' in case of error */
 		partid = InvalidOid;

src/partition_filter.c

@@ -439,7 +439,7 @@ select_partition_for_insert(Datum value, Oid value_type,
 		else if (nparts == 0)
 		{
 			 selected_partid = create_partitions_for_value(parent_relid,
-														   value, prel->ev_type);
+														   value, value_type);
 
 			 /* get_pathman_relation_info() will refresh this entry */
 			 invalidate_pathman_relation_info(parent_relid, NULL);

src/pl_funcs.c

@@ -765,7 +765,6 @@ add_to_pathman_config(PG_FUNCTION_ARGS)
 	Datum				expr_datum;
 
 	PathmanInitState	init_state;
-	MemoryContext		old_mcxt = CurrentMemoryContext;
 
 	if (!PG_ARGISNULL(0))
 	{
@@ -887,20 +886,11 @@ add_to_pathman_config(PG_FUNCTION_ARGS)
 		}
 		PG_CATCH();
 		{
-			ErrorData *edata;
-
-			/* Switch to the original context & copy edata */
-			MemoryContextSwitchTo(old_mcxt);
-			edata = CopyErrorData();
-			FlushErrorState();
-
 			/* We have to restore all changed flags */
 			restore_pathman_init_state(&init_state);
 
-			/* Show error message */
-			elog(ERROR, "%s", edata->message);
-
-			FreeErrorData(edata);
+			/* Rethrow ERROR */
+			PG_RE_THROW();
 		}
 		PG_END_TRY();
 	}
@@ -1262,11 +1252,11 @@ pathman_update_trigger_func(PG_FUNCTION_ARGS)
 		elog(ERROR, ERR_PART_ATTR_MULTIPLE);
 	else if (nparts == 0)
 	{
-		 target_relid = create_partitions_for_value(PrelParentRelid(prel),
+		 target_relid = create_partitions_for_value(parent_relid,
 													value, value_type);
 
 		 /* get_pathman_relation_info() will refresh this entry */
-		 invalidate_pathman_relation_info(PrelParentRelid(prel), NULL);
+		 invalidate_pathman_relation_info(parent_relid, NULL);
 	}
 	else target_relid = parts[0];