remove useless junkfilters

Author: funbringer

Diff for: src/hooks.c

@@ -967,8 +967,8 @@ pathman_executor_hook(QueryDesc *queryDesc,
 
 	if (IsA(state, ModifyTableState))
 	{
-		ModifyTableState	*mt_state = (ModifyTableState *) state;
-		int					 i;
+		ModifyTableState   *mt_state = (ModifyTableState *) state;
+		int					i;
 
 		for (i = 0; i < mt_state->mt_nplans; i++)
 		{
@@ -980,8 +980,8 @@ pathman_executor_hook(QueryDesc *queryDesc,
 				ResultRelInfo *rri = &mt_state->resultRelInfo[i];
 
 				/*
-				 * We unset junkfilter to disable junk
-				 * cleaning in ExecModifyTable.
+				 * HACK: We unset junkfilter to disable
+				 * junk cleaning in ExecModifyTable.
 				 */
 				rri->ri_junkFilter = NULL;
 

Diff for: src/include/partition_filter.h

@@ -43,7 +43,6 @@ typedef struct
 	Oid					partid;				/* partition's relid */
 	ResultRelInfo	   *result_rel_info;	/* cached ResultRelInfo */
 	TupleConversionMap *tuple_map;			/* tuple mapping (parent => child) */
-	JunkFilter		   *junkfilter;			/* junkfilter for cached ResultRelInfo */
 	bool				has_children;		/* hint that it might have children */
 	ExprState		   *expr_state;			/* children have their own expressions */
 } ResultRelInfoHolder;
@@ -107,15 +106,12 @@ typedef struct
 
 	Plan			   *subplan;				/* proxy variable to store subplan */
 	ResultPartsStorage	result_parts;			/* partition ResultRelInfo cache */
+	CmdType				command_type;
 
 	bool				warning_triggered;		/* warning message counter */
 
-	TupleTableSlot	   *tup_convert_slot;		/* slot for rebuilt tuples */
-	CmdType				command_type;
-
 	TupleTableSlot     *subplan_slot;			/* slot that was returned from subplan */
-	JunkFilter		   *junkfilter;				/* junkfilter for subplan_slot */
-
+	TupleTableSlot	   *tup_convert_slot;		/* slot for rebuilt tuples */
 	ExprContext		   *tup_convert_econtext;	/* ExprContext for projections */
 } PartitionFilterState;