Add CTE/VIEW/JOIN support for PIVOT

Modified internal PIVOT information analyzer -> executor passing design.
Supported CTE/VIEW/JOIN as well as function/procedure for PIVOT
operator.

Task: BABEL-4713, BABEL-4714, 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 "parser/parser.h"
 #include "parser/parse_coerce.h"
 #include "pgstat.h"
 #include "utils/acl.h"
@@ -203,6 +204,12 @@ ExecMakeTableFunctionResult(SetExprState *setexpr,
 		InitFunctionCallInfoData(*fcinfo, NULL, 0, InvalidOid, NULL, NULL);
 	}
 
+	if (sql_dialect == SQL_DIALECT_TSQL && IsA(setexpr->expr, FuncExpr))
+	{
+		fcinfo->pivot_parsetree = ((FuncExpr*) setexpr->expr)->pivot_parsetree;
+		fcinfo->pivot_extrainfo = ((FuncExpr*) setexpr->expr)->pivot_extrainfo;
+	}
+		
 	/*
 	 * Switch to short-lived context for calling the function or expression.
 	 */

src/backend/executor/functions.c

@@ -1936,8 +1936,6 @@ check_sql_fn_retval(List *queryTreeLists,
 		newquery->querySource = parse->querySource;
 		newquery->canSetTag = true;
 		newquery->targetList = upper_tlist;
-		newquery->isPivot = false;
-		newquery->pivotInfoList = NIL;
 
 		/* We need a moderately realistic colnames list for the subquery RTE */
 		colnames = NIL;

src/backend/nodes/makefuncs.c

@@ -534,6 +534,8 @@ makeFuncExpr(Oid funcid, Oid rettype, List *args,
 	funcexpr->inputcollid = inputcollid;
 	funcexpr->args = args;
 	funcexpr->location = -1;
+	funcexpr->pivot_parsetree = NIL;
+	funcexpr->pivot_extrainfo = NIL;
 
 	return funcexpr;
 }
@@ -600,6 +602,8 @@ 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;
 	return n;
 }
 

src/backend/optimizer/plan/planner.c

@@ -6553,8 +6553,6 @@ plan_cluster_use_sort(Oid tableOid, Oid indexOid)
 	/* Set up mostly-dummy planner state */
 	query = makeNode(Query);
 	query->commandType = CMD_SELECT;
-	query->isPivot = false;
-	query->pivotInfoList = NIL;
 
 	glob = makeNode(PlannerGlobal);
 
@@ -6677,9 +6675,7 @@ plan_create_index_workers(Oid tableOid, Oid indexOid)
 	/* Set up largely-dummy planner state */
 	query = makeNode(Query);
 	query->commandType = CMD_SELECT;
-	query->isPivot = false;
-	query->pivotInfoList = NIL;
-	
+
 	glob = makeNode(PlannerGlobal);
 
 	root = makeNode(PlannerInfo);

src/backend/optimizer/util/clauses.c

@@ -2601,6 +2601,8 @@ 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;
 				return (Node *) newexpr;
 			}
 		case T_OpExpr:
@@ -4562,6 +4564,8 @@ 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;
 
 	return evaluate_expr((Expr *) newexpr, result_type, result_typmod,
 						 result_collid);
@@ -4674,6 +4678,8 @@ 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;
 
 	/* Fetch the function body */
 	tmp = SysCacheGetAttrNotNull(PROCOID, func_tuple, Anum_pg_proc_prosrc);

src/backend/parser/analyze.c

@@ -407,23 +407,11 @@ transformStmt(ParseState *pstate, Node *parseTree)
 				SelectStmt *n = (SelectStmt *) parseTree;
 
 				if (n->valuesLists)
-				{
 					result = transformValuesClause(pstate, n);
-					result->isPivot = false;	
-					result->pivotInfoList = NIL;
-				}
-					
 				else if (n->op == SETOP_NONE)
-				{
 					result = transformSelectStmt(pstate, n);
-				}
 				else
-				{
 					result = transformSetOperationStmt(pstate, n);
-					result->isPivot = false;	
-					result->pivotInfoList = NIL;
-				}
-					
 			}
 			break;
 
@@ -471,11 +459,6 @@ transformStmt(ParseState *pstate, Node *parseTree)
 			break;
 	}
 
-	if (nodeTag(parseTree) != T_SelectStmt)
-	{
-		result->isPivot = false;
-		result->pivotInfoList = NIL;
-	}
 	/* Mark as original query until we learn differently */
 	result->querySource = QSRC_ORIGINAL;
 	result->canSetTag = true;
@@ -1467,12 +1450,9 @@ transformSelectStmt(ParseState *pstate, SelectStmt *stmt)
 	/* make WINDOW info available for window functions, too */
 	pstate->p_windowdefs = stmt->windowClause;
 
-	qry->isPivot = false;
-	qry->pivotInfoList = NIL;
-	
 	if (stmt->isPivot && transform_pivot_clause_hook)
 	{
-		(*transform_pivot_clause_hook)(qry, pstate, stmt);					
+		(*transform_pivot_clause_hook)(pstate, stmt);
 	}
 
 	/* process the FROM clause */

src/backend/parser/parse_func.c

@@ -765,6 +765,17 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
 		/* funccollid and inputcollid will be set by parse_collate.c */
 		funcexpr->args = fargs;
 		funcexpr->location = location;
+		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;
+		}
+
 
 		retval = (Node *) funcexpr;
 	}

src/backend/parser/parse_utilcmd.c

@@ -3096,8 +3096,6 @@ transformRuleStmt(RuleStmt *stmt, const char *queryString,
 		nothing_qry->rtable = pstate->p_rtable;
 		nothing_qry->rteperminfos = pstate->p_rteperminfos;
 		nothing_qry->jointree = makeFromExpr(NIL, NULL);	/* no join wanted */
-		nothing_qry->isPivot = false;
-		nothing_qry->pivotInfoList = NIL;
 
 		*actions = list_make1(nothing_qry);
 	}

src/backend/rewrite/rewriteHandler.c

@@ -48,9 +48,6 @@
 
 bbfViewHasInsteadofTrigger_hook_type bbfViewHasInsteadofTrigger_hook = NULL; /** BBF Hook to check Instead Of trigger on View */
 
-/* Hooks for restoring PIVOT info from previously created view */
-rewrite_pivot_view_hook_type rewrite_pivot_view_hook = NULL;
-
 /* We use a list of these to detect recursion in RewriteQuery */
 typedef struct rewrite_event
 {
@@ -1829,16 +1826,6 @@ ApplyRetrieveRule(Query *parsetree,
 	 */
 	rule_action = copyObject(linitial(rule->actions));
 
-	/* 
-	 * If action query is a pivot stmt, we save the pivot related info to 
-	 * tsql_outmost_context
-	 */
-	if (sql_dialect == SQL_DIALECT_TSQL && rule_action->isPivot && rewrite_pivot_view_hook)
-	{
-		/* save information to tsql_outmost_context */
-		(*rewrite_pivot_view_hook)(rule_action);
-	}
-
 	AcquireRewriteLocks(rule_action, true, (rc != NULL));
 
 	/*

src/backend/rewrite/rewriteSearchCycle.c

@@ -279,8 +279,6 @@ rewriteSearchAndCycle(CommonTableExpr *cte)
 	newq1 = makeNode(Query);
 	newq1->commandType = CMD_SELECT;
 	newq1->canSetTag = true;
-	newq1->isPivot = false;
-	newq1->pivotInfoList = NIL;
 
 	newrte = makeNode(RangeTblEntry);
 	newrte->rtekind = RTE_SUBQUERY;
@@ -368,8 +366,6 @@ rewriteSearchAndCycle(CommonTableExpr *cte)
 	newq2 = makeNode(Query);
 	newq2->commandType = CMD_SELECT;
 	newq2->canSetTag = true;
-	newq2->isPivot = false;
-	newq2->pivotInfoList = NIL;
 
 	newrte = makeNode(RangeTblEntry);
 	newrte->rtekind = RTE_SUBQUERY;

src/include/fmgr.h

@@ -18,6 +18,7 @@
 #ifndef FMGR_H
 #define FMGR_H
 
+#include "nodes/pg_list.h"
 /* We don't want to include primnodes.h here, so make some stub references */
 typedef struct Node *fmNodePtr;
 typedef struct Aggref *fmAggrefPtr;
@@ -91,6 +92,8 @@ 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 6
 	NullableDatum args[FLEXIBLE_ARRAY_MEMBER];
 } FunctionCallInfoBaseData;
@@ -155,6 +158,8 @@ 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)
 
 /*

src/include/nodes/parsenodes.h

@@ -235,9 +235,6 @@ typedef struct Query
 	int			stmt_location;
 	/* length in bytes; 0 means "rest of string" */
 	int			stmt_len pg_node_attr(query_jumble_ignore);
-
-	bool		isPivot pg_node_attr(query_jumble_ignore);
-	List		*pivotInfoList pg_node_attr(query_jumble_ignore);
 } Query;
 
 
@@ -435,6 +432,8 @@ 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 */
 } FuncCall;
 
 /*

src/include/nodes/primnodes.h

@@ -695,6 +695,10 @@ 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);
+	/* bbf_pivot function required aggregation function name and source sql string */
+	List 	   *pivot_extrainfo pg_node_attr(query_jumble_ignore);
 } FuncExpr;
 
 /*

src/include/parser/analyze.h

@@ -65,7 +65,7 @@ typedef void (*pre_transform_setop_sort_clause_hook_type) (ParseState *pstate, Q
 extern PGDLLEXPORT pre_transform_setop_sort_clause_hook_type pre_transform_setop_sort_clause_hook;
 
 /* Hook for transform pivot clause in tsql select stmt */
-typedef void (*transform_pivot_clause_hook_type)(Query *qry, ParseState *pstate, SelectStmt *stmt);
+typedef void (*transform_pivot_clause_hook_type)(ParseState *pstate, SelectStmt *stmt);
 extern PGDLLEXPORT transform_pivot_clause_hook_type transform_pivot_clause_hook;
 
 extern Query *parse_analyze_fixedparams(RawStmt *parseTree, const char *sourceText,

src/include/rewrite/rewriteHandler.h

@@ -32,8 +32,4 @@ extern int	relation_is_updatable(Oid reloid,
 								  bool include_triggers,
 								  Bitmapset *include_cols);
 
-/* Hooks for restoring PIVOT info from previously created view */
-typedef void (*rewrite_pivot_view_hook_type)(Query *qry);
-extern PGDLLEXPORT rewrite_pivot_view_hook_type rewrite_pivot_view_hook;
-
 #endif							/* REWRITEHANDLER_H */