improve function pathman_update_trigger_func_move_tuple()

funbringer · funbringer · commit 992a7ad6f4cf · 2017-04-05T19:39:40.000+03:00
diff --git a/src/partition_filter.c b/src/partition_filter.c
@@ -344,7 +344,7 @@ build_part_tuple_map(Relation parent_rel, Relation child_rel)
 	TupleDesc			child_tupdesc,
 						parent_tupdesc;
 
-	/* Use fake 'tdtypeid' in order to fool convert_tuples_by_name() */
+	/* HACK: use fake 'tdtypeid' in order to fool convert_tuples_by_name() */
 	child_tupdesc = CreateTupleDescCopy(RelationGetDescr(child_rel));
 	child_tupdesc->tdtypeid = InvalidOid;
 
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
@@ -1212,11 +1212,18 @@ pathman_update_trigger_func_move_tuple(Relation source_rel,
 									   HeapTuple old_tuple,
 									   HeapTuple new_tuple)
 {
-	TupleDesc				source_tupdesc = RelationGetDescr(source_rel),
-							target_tupdesc = RelationGetDescr(target_rel);
+	TupleDesc				source_tupdesc,
+							target_tupdesc;
 	HeapTuple				target_tuple;
 	TupleConversionMap	   *conversion_map;
 
+	/* HACK: use fake 'tdtypeid' in order to fool convert_tuples_by_name() */
+	source_tupdesc = CreateTupleDescCopy(RelationGetDescr(source_rel));
+	source_tupdesc->tdtypeid = InvalidOid;
+
+	target_tupdesc = CreateTupleDescCopy(RelationGetDescr(target_rel));
+	target_tupdesc->tdtypeid = InvalidOid;
+
 	/* Build tuple conversion map */
 	conversion_map = convert_tuples_by_name(source_tupdesc,
 											target_tupdesc,
@@ -1286,6 +1293,10 @@ pathman_update_trigger_func_move_tuple(Relation source_rel,
 	}
 	/* Else emit error */
 	else elog(ERROR, "could not connect using SPI");
+
+	/* At last, free these temporary tuple descs */
+	FreeTupleDesc(source_tupdesc);
+	FreeTupleDesc(target_tupdesc);
 }
 
 /* Create UPDATE triggers for all partitions */
