don't call parent's triggers on children (this does not work with foreign keys anyway)

funbringer · funbringer · commit 1bcb666c60d1 · 2016-09-06T17:16:03.000+03:00
diff --git a/src/partition_filter.c b/src/partition_filter.c
@@ -232,7 +232,9 @@ partition_filter_exec(CustomScanState *node)
 		ResetExprContext(econtext);
 
 		/* Replace parent table with a suitable partition */
+		old_cxt = MemoryContextSwitchTo(estate->es_query_cxt);
 		estate->es_result_relation_info = getResultRelInfo(selected_partid, state);
+		MemoryContextSwitchTo(old_cxt);
 
 		return slot;
 	}
@@ -285,24 +287,16 @@ getResultRelInfo(Oid partid, PartitionFilterState *state)
 #define CopyToResultRelInfo(field_name) \
 	( resultRelInfo->field_name = state->savedRelInfo->field_name )
 
-#define ResizeTriggerField(field_name, field_type) \
-	do { \
-		if (resultRelInfo->field_name) \
-			pfree(resultRelInfo->field_name); \
-		resultRelInfo->field_name = (field_type *) \
-			palloc0(resultRelInfo->ri_TrigDesc->numtriggers * sizeof(field_type)); \
-	} while (0)
-
-	ResultRelInfoHolder	   *resultRelInfoHandle;
+	ResultRelInfoHolder	   *resultRelInfoHolder;
 	bool					found;
 
-	resultRelInfoHandle = hash_search(state->result_rels_table,
+	resultRelInfoHolder = hash_search(state->result_rels_table,
 									  (const void *) &partid,
 									  HASH_ENTER, &found);
 
+	/* If not found, create & cache new ResultRelInfo */
 	if (!found)
 	{
-		bool			grown_up;
 		ResultRelInfo  *resultRelInfo = (ResultRelInfo *) palloc(sizeof(ResultRelInfo));
 
 		InitResultRelInfo(resultRelInfo,
@@ -312,24 +306,6 @@ getResultRelInfo(Oid partid, PartitionFilterState *state)
 
 		ExecOpenIndices(resultRelInfo, state->onConflictAction != ONCONFLICT_NONE);
 
-		resultRelInfo->ri_TrigDesc = append_trigger_descs(resultRelInfo->ri_TrigDesc,
-														  state->savedRelInfo->ri_TrigDesc,
-														  &grown_up);
-		if (grown_up)
-		{
-			ResizeTriggerField(ri_TrigFunctions, FmgrInfo);
-			ResizeTriggerField(ri_TrigWhenExprs, List *);
-
-			if (resultRelInfo->ri_TrigInstrument)
-			{
-				pfree(resultRelInfo->ri_TrigInstrument);
-
-				resultRelInfo->ri_TrigInstrument =
-					InstrAlloc(resultRelInfo->ri_TrigDesc->numtriggers,
-							   state->css.ss.ps.state->es_instrument);
-			}
-		}
-
 		/* Copy necessary fields from saved ResultRelInfo */
 		CopyToResultRelInfo(ri_WithCheckOptions);
 		CopyToResultRelInfo(ri_WithCheckOptionExprs);
@@ -341,14 +317,15 @@ getResultRelInfo(Oid partid, PartitionFilterState *state)
 		/* ri_ConstraintExprs will be initialized by ExecRelCheck() */
 		resultRelInfo->ri_ConstraintExprs = NULL;
 
-		resultRelInfoHandle->partid = partid;
-		resultRelInfoHandle->resultRelInfo = resultRelInfo;
-
 		/* Make 'range table index' point to the parent relation */
 		resultRelInfo->ri_RangeTableIndex = state->savedRelInfo->ri_RangeTableIndex;
+
+		/* Now fill the ResultRelInfo holder */
+		resultRelInfoHolder->partid = partid;
+		resultRelInfoHolder->resultRelInfo = resultRelInfo;
 	}
 
-	return resultRelInfoHandle->resultRelInfo;
+	return resultRelInfoHolder->resultRelInfo;
 }
 
 /*
diff --git a/src/utils.c b/src/utils.c
@@ -279,81 +279,6 @@ check_rinfo_for_partitioned_attr(List *rinfo, Index varno, AttrNumber varattno)
 	return false;
 }
 
-/*
- * Append trigger info contained in 'more' to 'src', both remain unmodified.
- *
- * This allows us to execute some of main table's triggers on children.
- * See ExecInsert() for more details.
- */
-TriggerDesc *
-append_trigger_descs(TriggerDesc *src, TriggerDesc *more, bool *grown_up)
-{
-#define CopyToTriggerDesc(bool_field_name) \
-	( new_desc->bool_field_name |= (src->bool_field_name || more->bool_field_name) )
-
-	TriggerDesc    *new_desc = (TriggerDesc *) palloc0(sizeof(TriggerDesc));
-	Trigger		   *cur_trigger;
-	int				i;
-
-	/* Quick choices */
-	if (!src && !more)
-	{
-		*grown_up = false;
-		return NULL;
-	}
-	else if (!src)
-	{
-		*grown_up = true; /* expand space for new triggers */
-		return more;
-	}
-	else if (!more)
-	{
-		*grown_up = false; /* no new triggers will be added */
-		return src;
-	}
-
-	*grown_up = true;
-	new_desc->numtriggers = src->numtriggers + more->numtriggers;
-	new_desc->triggers = (Trigger *) palloc(new_desc->numtriggers * sizeof(Trigger));
-
-	cur_trigger = new_desc->triggers;
-
-	/* Copy triggers from 'a' */
-	for (i = 0; i < src->numtriggers; i++)
-		memcpy(cur_trigger++, &(src->triggers[i]), sizeof(Trigger));
-
-	/* Copy triggers from 'b' */
-	for (i = 0; i < more->numtriggers; i++)
-		memcpy(cur_trigger++, &(more->triggers[i]), sizeof(Trigger));
-
-	/* Copy insert bool flags */
-	CopyToTriggerDesc(trig_insert_before_row);
-	CopyToTriggerDesc(trig_insert_after_row);
-	CopyToTriggerDesc(trig_insert_instead_row);
-	CopyToTriggerDesc(trig_insert_before_statement);
-	CopyToTriggerDesc(trig_insert_after_statement);
-
-	/* Copy update bool flags */
-	CopyToTriggerDesc(trig_update_before_row);
-	CopyToTriggerDesc(trig_update_after_row);
-	CopyToTriggerDesc(trig_update_instead_row);
-	CopyToTriggerDesc(trig_update_before_statement);
-	CopyToTriggerDesc(trig_update_after_statement);
-
-	/* Copy delete bool flags */
-	CopyToTriggerDesc(trig_delete_before_row);
-	CopyToTriggerDesc(trig_delete_after_row);
-	CopyToTriggerDesc(trig_delete_instead_row);
-	CopyToTriggerDesc(trig_delete_before_statement);
-	CopyToTriggerDesc(trig_delete_after_statement);
-
-	/* Copy truncate bool flags */
-	CopyToTriggerDesc(trig_truncate_before_statement);
-	CopyToTriggerDesc(trig_truncate_after_statement);
-
-	return new_desc;
-}
-
 /*
  * Get BTORDER_PROC for two types described by Oids
  */
diff --git a/src/utils.h b/src/utils.h
@@ -36,9 +36,6 @@ List * build_index_tlist(PlannerInfo *root,
 						 IndexOptInfo *index,
 						 Relation heapRelation);
 void change_varnos(Node *node, Oid old_varno, Oid new_varno);
-TriggerDesc * append_trigger_descs(TriggerDesc *src,
-								   TriggerDesc *more,
-								   bool *grown_up);
 
 /*
  * Rowmark processing.
