PG_TRY without PG_RE_THROW is no-no: remove it from is_tuple_convertible.

arssher · arssher · commit 50c8348639a2 · 2019-04-01T17:59:37.000+03:00
Noticed by errordata_stack_depth overflow: log wasn't flushed.
diff --git a/hash.sql b/hash.sql
@@ -94,9 +94,11 @@ BEGIN
 	END IF;
 
 	/* Check that new partition has an equal structure as parent does */
-	IF NOT @extschema@.is_tuple_convertible(parent_relid, new_partition) THEN
+	BEGIN
+		PERFORM @extschema@.is_tuple_convertible(parent_relid, new_partition);
+	EXCEPTION WHEN OTHERS THEN
 		RAISE EXCEPTION 'partition must have a compatible tuple format';
-	END IF;
+	END;
 
 	/* Check that table is partitioned */
 	IF @extschema@.get_partition_key(parent_relid) IS NULL THEN
diff --git a/range.sql b/range.sql
@@ -639,9 +639,11 @@ BEGIN
 	/* Check range overlap */
 	PERFORM @extschema@.check_range_available(parent_relid, start_value, end_value);
 
-	IF NOT @extschema@.is_tuple_convertible(parent_relid, partition_relid) THEN
+	BEGIN
+		PERFORM @extschema@.is_tuple_convertible(parent_relid, partition_relid);
+	EXCEPTION WHEN OTHERS THEN
 		RAISE EXCEPTION 'partition must have a compatible tuple format';
-	END IF;
+	END;
 
 	part_expr := @extschema@.get_partition_key(parent_relid);
 	part_type := @extschema@.get_partition_type(parent_relid);
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
@@ -661,38 +661,32 @@ is_date_type(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(is_date_type_internal(PG_GETARG_OID(0)));
 }
 
+/*
+ * Bail out with ERROR if rel1 tuple can't be converted to rel2 tuple.
+ */
 Datum
 is_tuple_convertible(PG_FUNCTION_ARGS)
 {
 	Relation	rel1,
 				rel2;
-	bool		res = true;
+	void *map; /* we don't actually need it */
 
 	rel1 = heap_open(PG_GETARG_OID(0), AccessShareLock);
 	rel2 = heap_open(PG_GETARG_OID(1), AccessShareLock);
 
-	PG_TRY();
-	{
-		void *map; /* we don't actually need it */
-
-		/* Try to build a conversion map */
-		map = convert_tuples_by_name_map(RelationGetDescr(rel1),
-										 RelationGetDescr(rel2),
-										 ERR_PART_DESC_CONVERT);
+	/* Try to build a conversion map */
+	map = convert_tuples_by_name_map(RelationGetDescr(rel1),
+									 RelationGetDescr(rel2),
+									 ERR_PART_DESC_CONVERT);
 
-		/* Now free map */
-		pfree(map);
-	}
-	PG_CATCH();
-	{
-		res = false;
-	}
-	PG_END_TRY();
+	/* Now free map */
+	pfree(map);
 
 	heap_close(rel1, AccessShareLock);
 	heap_close(rel2, AccessShareLock);
 
-	PG_RETURN_BOOL(res);
+	/* still return true to avoid changing tests */
+	PG_RETURN_BOOL(true);
 }
 
 

-Original file line number
+Diff line change
 	END IF;
 	/* Check that new partition has an equal structure as parent does */
 -	IF NOT @[email protected]_tuple_convertible(parent_relid, new_partition) THEN
 +	BEGIN
 +		PERFORM @[email protected]_tuple_convertible(parent_relid, new_partition);
 +	EXCEPTION WHEN OTHERS THEN
 		RAISE EXCEPTION 'partition must have a compatible tuple format';
 -	END IF;
 +	END;
 	/* Check that table is partitioned */
 	IF @[email protected]_partition_key(parent_relid) IS NULL THEN