hide function pointer

Author: zhangyue-hashdata

src/backend/executor/execExpr.c

@@ -2928,7 +2928,7 @@ ExecInitWholeRowVar(ExprEvalStep *scratch, Var *variable, ExprState *state)
 					ExecInitJunkFilter(subplan->plan->targetlist,
 									   ExecInitExtraTupleSlot(parent->state, NULL,
 															  &TTSOpsVirtual),
-									   ExecFilterJunk);
+									   NULL);
 			}
 		}
 	}

src/backend/executor/execExprInterp.c

@@ -4205,10 +4205,7 @@ ExecEvalWholeRowVar(ExprState *state, ExprEvalStep *op, ExprContext *econtext)
 
 	/* Apply the junkfilter if any */
 	if (op->d.wholerow.junkFilter != NULL)
-	{
-		JunkFilter *junkfilter = op->d.wholerow.junkFilter;
-		slot = junkfilter->jf_execFilterJunkFunc(junkfilter, slot);
-	}
+		slot = ExecFilterJunk(op->d.wholerow.junkFilter, slot);
 
 	/*
 	 * If first time through, obtain tuple descriptor and check compatibility.

src/backend/executor/execJunk.c

@@ -16,6 +16,9 @@
 
 #include "executor/executor.h"
 
+static TupleTableSlot *ExecFilterJunkInternal(JunkFilter *junkfilter,
+											  TupleTableSlot *slot);
+
 /*-------------------------------------------------------------------------
  *		XXX this stuff should be rewritten to take advantage
  *			of ExecProject() and the ProjectionInfo node.
@@ -121,8 +124,9 @@ ExecInitJunkFilter(List *targetList, TupleTableSlot *slot,
 	junkfilter->jf_cleanTupType = cleanTupType;
 	junkfilter->jf_cleanMap = cleanMap;
 	junkfilter->jf_resultSlot = slot;
-	junkfilter->jf_execFilterJunkFunc =
-		execFilterJunkFunc ? execFilterJunkFunc : ExecFilterJunk;
+
+	Assert(execFilterJunkFunc != ExecFilterJunk);
+	junkfilter->jf_execFilterJunkFunc = execFilterJunkFunc;
 
 	return junkfilter;
 }
@@ -201,8 +205,9 @@ ExecInitJunkFilterConversion(List *targetList,
 	junkfilter->jf_cleanTupType = cleanTupType;
 	junkfilter->jf_cleanMap = cleanMap;
 	junkfilter->jf_resultSlot = slot;
-	junkfilter->jf_execFilterJunkFunc =
-		execFilterJunkFunc ? execFilterJunkFunc : ExecFilterJunk;
+
+	Assert(execFilterJunkFunc != ExecFilterJunk);
+	junkfilter->jf_execFilterJunkFunc = execFilterJunkFunc;
 
 	return junkfilter;
 }
@@ -252,6 +257,15 @@ ExecFindJunkAttributeInTlist(List *targetlist, const char *attrName)
  */
 TupleTableSlot *
 ExecFilterJunk(JunkFilter *junkfilter, TupleTableSlot *slot)
+{
+	if (junkfilter->jf_execFilterJunkFunc)
+		return junkfilter->jf_execFilterJunkFunc(junkfilter, slot);
+
+	return ExecFilterJunkInternal(junkfilter, slot);
+}
+
+static TupleTableSlot *
+ExecFilterJunkInternal(JunkFilter *junkfilter, TupleTableSlot *slot)
 {
 	TupleTableSlot *resultSlot;
 	AttrNumber *cleanMap;

src/backend/executor/execMain.c

@@ -2028,7 +2028,7 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 			slot = ExecInitExtraTupleSlot(estate, NULL, &TTSOpsVirtual);
 			j = ExecInitJunkFilter(planstate->plan->targetlist,
 								   slot,
-								   ExecFilterJunk);
+								   NULL);
 			estate->es_junkFilter = j;
 
 			/* Want to return the cleaned tuple type */
@@ -2798,7 +2798,7 @@ ExecutePlan(EState *estate,
 		 * because that tuple slot has the wrong descriptor.)
 		 */
 		if (estate->es_junkFilter != NULL)
-			slot = estate->es_junkFilter->jf_execFilterJunkFunc(estate->es_junkFilter, slot);
+			slot = ExecFilterJunk(estate->es_junkFilter, slot);
 
 		if (operation != CMD_SELECT && Gp_role == GP_ROLE_EXECUTE && !Gp_is_writer)
 		{

src/backend/executor/functions.c

@@ -896,9 +896,9 @@ init_sql_fcache(FunctionCallInfo fcinfo, Oid collation, bool lazyEvalOK)
 			fcache->junkFilter = ExecInitJunkFilterConversion(resulttlist,
 															  rettupdesc,
 															  slot,
-															  ExecFilterJunk);
+															  NULL);
 		else
-			fcache->junkFilter = ExecInitJunkFilter(resulttlist, slot, ExecFilterJunk);
+			fcache->junkFilter = ExecInitJunkFilter(resulttlist, slot, NULL);
 	}
 
 	if (fcache->returnsTuple)
@@ -2226,7 +2226,7 @@ sqlfunction_receive(TupleTableSlot *slot, DestReceiver *self)
 	DR_sqlfunction *myState = (DR_sqlfunction *) self;
 
 	/* Filter tuple as needed */
-	slot = myState->filter->jf_execFilterJunkFunc(myState->filter, slot);
+	slot = ExecFilterJunk(myState->filter, slot);
 
 	/* Store the filtered tuple into the tuplestore */
 	tuplestore_puttupleslot(myState->tstore, slot);

src/backend/executor/nodeTableFunction.c

@@ -396,7 +396,7 @@ ExecInitTableFunction(TableFunctionScan *node, EState *estate, int eflags)
 	scanstate->inputscan->junkfilter =
 		ExecInitJunkFilter(subplan->plan->targetlist, 
 						   NULL  /* slot */,
-						   ExecFilterJunk);
+						   NULL);
 	BlessTupleDesc(scanstate->inputscan->junkfilter->jf_cleanTupType);
 
 	/*
@@ -525,7 +525,7 @@ AnyTable_GetNextTuple(AnyTable t)
 	 * ----------------------------------------
 	 */
 
-	slot = t->junkfilter->jf_execFilterJunkFunc(t->junkfilter, t->econtext->ecxt_outertuple);
+	slot = ExecFilterJunk(t->junkfilter, t->econtext->ecxt_outertuple);
 	return ExecCopySlotHeapTuple(slot);
 }