[BABEL-4673] Clean up added fields in FuncCall, FuncExpr

Added a new Node type BbfPivotData.
Replaced pivot related fields with generic Node * fields in FuncCall and
FuncExpr.

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

Author: RIC06X

src/backend/executor/execSRF.c

@@ -25,6 +25,7 @@
 #include "funcapi.h"
 #include "miscadmin.h"
 #include "nodes/nodeFuncs.h"
+#include "nodes/parsenodes.h"
 #include "parser/parser.h"
 #include "parser/parse_coerce.h"
 #include "pgstat.h"
@@ -206,10 +207,10 @@ ExecMakeTableFunctionResult(SetExprState *setexpr,
 
 	/* 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)
+			&& ((FuncExpr*) setexpr->expr)->context != NULL
+			&& (IsA(((FuncExpr*) setexpr->expr)->context, BbfPivotData)))
 	{
-		fcinfo->context = (Node *) list_make2(((FuncExpr*) setexpr->expr)->pivot_parsetree, ((FuncExpr*) setexpr->expr)->pivot_extrainfo);
+		fcinfo->context = ((FuncExpr*) setexpr->expr)->context;
 	}
 
 	/*

src/backend/nodes/gen_node_support.pl

@@ -107,7 +107,7 @@ sub elem
 # ABI stability during development.
 
 my $last_nodetag = 'WindowObjectData';
-my $last_nodetag_no = 455;
+my $last_nodetag_no = 456;
 
 # output file names
 my @output_files;

src/backend/nodes/makefuncs.c

@@ -534,8 +534,7 @@ makeFuncExpr(Oid funcid, Oid rettype, List *args,
 	funcexpr->inputcollid = inputcollid;
 	funcexpr->args = args;
 	funcexpr->location = -1;
-	funcexpr->pivot_parsetree = NIL;
-	funcexpr->pivot_extrainfo = NIL;
+	funcexpr->context = NULL;
 
 	return funcexpr;
 }
@@ -602,8 +601,7 @@ makeFuncCall(List *name, List *args, CoercionForm funcformat, int location)
 	n->func_variadic = false;
 	n->funcformat = funcformat;
 	n->location = location;
-	n->pivot_parsetree = NIL;
-	n->pivot_extrainfo = NIL;
+	n->context = NULL;
 	return n;
 }
 

src/backend/optimizer/util/clauses.c

@@ -2601,8 +2601,7 @@ eval_const_expressions_mutator(Node *node,
 				newexpr->inputcollid = expr->inputcollid;
 				newexpr->args = args;
 				newexpr->location = expr->location;
-				newexpr->pivot_parsetree = expr->pivot_parsetree;
-				newexpr->pivot_extrainfo = expr->pivot_extrainfo;
+				newexpr->context = expr->context;
 				return (Node *) newexpr;
 			}
 		case T_OpExpr:
@@ -4564,8 +4563,7 @@ evaluate_function(Oid funcid, Oid result_type, int32 result_typmod,
 	newexpr->inputcollid = input_collid;
 	newexpr->args = args;
 	newexpr->location = -1;
-	newexpr->pivot_parsetree = NIL;
-	newexpr->pivot_extrainfo = NIL;
+	newexpr->context = NULL;
 
 	return evaluate_expr((Expr *) newexpr, result_type, result_typmod,
 						 result_collid);
@@ -4678,8 +4676,7 @@ inline_function(Oid funcid, Oid result_type, Oid result_collid,
 	fexpr->inputcollid = input_collid;
 	fexpr->args = args;
 	fexpr->location = -1;
-	fexpr->pivot_parsetree = NIL;
-	fexpr->pivot_extrainfo = NIL;
+	fexpr->context = NULL;
 
 	/* Fetch the function body */
 	tmp = SysCacheGetAttrNotNull(PROCOID, func_tuple, Anum_pg_proc_prosrc);

src/backend/parser/parse_func.c

@@ -765,17 +765,10 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
 		/* funccollid and inputcollid will be set by parse_collate.c */
 		funcexpr->args = fargs;
 		funcexpr->location = location;
+		funcexpr->context = NULL;
+		
 		if (fn != NULL)
-		{
-			funcexpr->pivot_parsetree = copyObject(fn->pivot_parsetree);
-			funcexpr->pivot_extrainfo = copyObject(fn->pivot_extrainfo);
-		}
-		else
-		{
-			funcexpr->pivot_parsetree = NIL;
-			funcexpr->pivot_extrainfo = NIL;
-		}
-
+			funcexpr->context = copyObject(fn->context);
 
 		retval = (Node *) funcexpr;
 	}

src/include/nodes/parsenodes.h

@@ -432,8 +432,7 @@ typedef struct FuncCall
 	bool		func_variadic;	/* last argument was labeled VARIADIC */
 	CoercionForm funcformat;	/* how to display this node */
 	int			location;		/* token location, or -1 if unknown */
-	List	   *pivot_parsetree; /* bbf_pivot function required rewritted parsetrees */
-	List	   *pivot_extrainfo; /* bbf_pivot function required aggregation function and source sql string */
+	Node 	   *context;		/* pass necessary info through planner and executor */
 } FuncCall;
 
 /*
@@ -4084,4 +4083,21 @@ typedef struct DropSubscriptionStmt
 	DropBehavior behavior;		/* RESTRICT or CASCADE behavior */
 } DropSubscriptionStmt;
 
+/*
+ * BbfPivotData 
+ *		struct node to carry extra tsql pivot data produced by analyzer.  
+ */
+typedef struct BbfPivotData
+{
+	NodeTag 	type;
+	/* reconstructed source sql parsetree from tsql pivot stmt */
+	Node	   *source_sql_parsetree; 
+	/* reconstructed catagory sql parsetree from tsql pivot stmt */
+	Node	   *category_sql_parsetree;
+	/* original tsql pivot stmt string */
+	char 	   *tsql_definition;
+	/* aggregate function name for bbf_pivot function determine NULL or 0 for output */
+	char	   *agg_func_name;
+}BbfPivotData;
+
 #endif							/* PARSENODES_H */

src/include/nodes/primnodes.h

@@ -695,10 +695,8 @@ typedef struct FuncExpr
 	List	   *args;
 	/* token location, or -1 if unknown */
 	int			location;
-	/* bbf_pivot function required rewritted parsetrees */
-	List 	   *pivot_parsetree pg_node_attr(query_jumble_ignore, read_write_ignore, read_as(NULL));
-	/* bbf_pivot function required aggregation function name and source sql string */
-	List 	   *pivot_extrainfo pg_node_attr(query_jumble_ignore, read_write_ignore, read_as(NULL));
+	/* pass necessary info through planner and executor */
+	Node 	   *context pg_node_attr(query_jumble_ignore, read_write_ignore, read_as(NULL));
 } FuncExpr;
 
 /*

src/tools/pgindent/typedefs.list

@@ -242,6 +242,7 @@ BaseBackupCmd
 BaseBackupTargetHandle
 BaseBackupTargetType
 BasicArchiveData
+BbfPivotData
 BeginDirectModify_function
 BeginForeignInsert_function
 BeginForeignModify_function