[BABEL-4673] Remove newly added pivot fields in fcinfo

Removed newly added pivot fields in fcinfo and set the fcinfo->context
to pivot data when the FuncExpr is a bbf_pivot function

Task: BABEL-4673
Signed-off-by: Yanjie Xu <[email protected]>

Author: RIC06X

src/backend/executor/execSRF.c

@@ -204,10 +204,12 @@ ExecMakeTableFunctionResult(SetExprState *setexpr,
 		InitFunctionCallInfoData(*fcinfo, NULL, 0, InvalidOid, NULL, NULL);
 	}
 
-	if (sql_dialect == SQL_DIALECT_TSQL && IsA(setexpr->expr, FuncExpr))
+	/* if current FuncExpr is a bbf_pivot function, we set the fcinfo context to pivot data */
+	if (sql_dialect == SQL_DIALECT_TSQL && IsA(setexpr->expr, FuncExpr) 
+			&& ((FuncExpr*) setexpr->expr)->pivot_parsetree != NIL
+			&& ((FuncExpr*) setexpr->expr)->pivot_extrainfo != NIL)
 	{
-		fcinfo->pivot_parsetree = ((FuncExpr*) setexpr->expr)->pivot_parsetree;
-		fcinfo->pivot_extrainfo = ((FuncExpr*) setexpr->expr)->pivot_extrainfo;
+		fcinfo->context = (Node *) list_make2(((FuncExpr*) setexpr->expr)->pivot_parsetree, ((FuncExpr*) setexpr->expr)->pivot_extrainfo);
 	}
 
 	/*

src/include/fmgr.h

@@ -92,9 +92,7 @@ typedef struct FunctionCallInfoBaseData
 #define FIELDNO_FUNCTIONCALLINFODATA_ISNULL 4
 	bool		isnull;			/* function must set true if result is NULL */
 	short		nargs;			/* # arguments actually passed */
-	List	   *pivot_parsetree; /* bbf_pivot function required rewritted parsetrees */
-	List	   *pivot_extrainfo; /* bbf_pivot function required aggregation function and source sql string */
-#define FIELDNO_FUNCTIONCALLINFODATA_ARGS 8
+#define FIELDNO_FUNCTIONCALLINFODATA_ARGS 6
 	NullableDatum args[FLEXIBLE_ARRAY_MEMBER];
 } FunctionCallInfoBaseData;
 
@@ -158,8 +156,6 @@ extern void fmgr_symbol(Oid functionId, char **mod, char **fn);
 		(Fcinfo).fncollation = (Collation); \
 		(Fcinfo).isnull = false; \
 		(Fcinfo).nargs = (Nargs); \
-		(Fcinfo).pivot_parsetree = NIL; \
-		(Fcinfo).pivot_extrainfo = NIL; \
 	} while (0)
 
 /*