restore function clause_contains_params() and get rid of 'found_params' in WalkerContext

funbringer · funbringer · commit e50016d4158e · 2017-05-04T16:25:51.000+03:00
diff --git a/src/hooks.c b/src/hooks.c
@@ -81,10 +81,10 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 	const PartRelationInfo *inner_prel;
 	List				   *joinclauses,
 						   *otherclauses;
-	ListCell			   *lc;
 	WalkerContext			context;
 	double					paramsel;
-	Node				   *expr;
+	Node				   *part_expr;
+	ListCell			   *lc;
 
 	/* Call hooks set by other extensions */
 	if (set_join_pathlist_next)
@@ -130,14 +130,14 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 	}
 
 	/* Make copy of partitioning expression and fix Var's  varno attributes */
-	expr = PrelExpressionForRelid(inner_prel, innerrel->relid);
+	part_expr = PrelExpressionForRelid(inner_prel, innerrel->relid);
 
 	paramsel = 1.0;
 	foreach (lc, joinclauses)
 	{
 		WrapperNode *wrap;
 
-		InitWalkerContext(&context, expr, inner_prel, NULL, false);
+		InitWalkerContext(&context, part_expr, inner_prel, NULL, false);
 		wrap = walk_expr_tree((Expr *) lfirst(lc), &context);
 		paramsel *= wrap->paramsel;
 	}
@@ -308,13 +308,13 @@ pathman_rel_pathlist_hook(PlannerInfo *root,
 					   *pathkeyDesc = NULL;
 		double			paramsel = 1.0;			/* default part selectivity */
 		WalkerContext	context;
-		Node		   *expr;
-		bool			modify_append_nodes;
+		Node		   *part_expr;
+		List		   *part_clauses;
 		ListCell	   *lc;
 		int				i;
 
 		/* Make copy of partitioning expression and fix Var's  varno attributes */
-		expr = PrelExpressionForRelid(prel, rti);
+		part_expr = PrelExpressionForRelid(prel, rti);
 
 		if (prel->parttype == PT_RANGE)
 		{
@@ -328,11 +328,11 @@ pathman_rel_pathlist_hook(PlannerInfo *root,
 			tce = lookup_type_cache(prel->atttype, TYPECACHE_LT_OPR | TYPECACHE_GT_OPR);
 
 			/* Make pathkeys */
-			pathkeys = build_expression_pathkey(root, (Expr *) expr, NULL,
+			pathkeys = build_expression_pathkey(root, (Expr *) part_expr, NULL,
 												tce->lt_opr, NULL, false);
 			if (pathkeys)
 				pathkeyAsc = (PathKey *) linitial(pathkeys);
-			pathkeys = build_expression_pathkey(root, (Expr *) expr, NULL,
+			pathkeys = build_expression_pathkey(root, (Expr *) part_expr, NULL,
 												tce->gt_opr, NULL, false);
 			if (pathkeys)
 				pathkeyDesc = (PathKey *) linitial(pathkeys);
@@ -345,7 +345,7 @@ pathman_rel_pathlist_hook(PlannerInfo *root,
 		ranges = list_make1_irange_full(prel, IR_COMPLETE);
 
 		/* Make wrappers over restrictions and collect final rangeset */
-		InitWalkerContext(&context, expr, prel, NULL, false);
+		InitWalkerContext(&context, part_expr, prel, NULL, false);
 		wrappers = NIL;
 		foreach(lc, rel->baserestrictinfo)
 		{
@@ -359,12 +359,6 @@ pathman_rel_pathlist_hook(PlannerInfo *root,
 			ranges = irange_list_intersection(ranges, wrap->rangeset);
 		}
 
-		/*
-		 * Walker should been have filled these parameter while checking.
-		 * Runtime[Merge]Append is pointless if there are no params in clauses.
-		 */
-		modify_append_nodes = context.found_params;
-
 		/* Get number of selected partitions */
 		irange_len = irange_list_length(ranges);
 		if (prel->enable_parent)
@@ -441,7 +435,13 @@ pathman_rel_pathlist_hook(PlannerInfo *root,
 			  pg_pathman_enable_runtime_merge_append))
 			return;
 
-		if (!modify_append_nodes)
+		/* Get partitioning-related clauses */
+		part_clauses = get_partitioning_clauses(list_union(rel->baserestrictinfo,
+														   rel->joininfo),
+												prel, rti);
+
+		/* Skip if there's no PARAMs in partitioning-related clauses */
+		if (!clause_contains_params((Node *) part_clauses))
 			return;
 
 		/* Generate Runtime[Merge]Append paths if needed */
@@ -462,12 +462,6 @@ pathman_rel_pathlist_hook(PlannerInfo *root,
 			/* Get existing parameterization */
 			ppi = get_appendrel_parampathinfo(rel, inner_required);
 
-			/* Skip if there are no partitioning clauses */
-			if (!get_partitioning_clauses(list_union(rel->baserestrictinfo,
-													 rel->joininfo),
-										  prel, rti))
-				return;
-
 			if (IsA(cur_path, AppendPath) && pg_pathman_enable_runtimeappend)
 				inner_path = create_runtimeappend_path(root, cur_path,
 													   ppi, paramsel);
diff --git a/src/include/pathman.h b/src/include/pathman.h
@@ -148,8 +148,6 @@ typedef struct
 	const PartRelationInfo *prel;			/* main partitioning structure */
 	ExprContext			   *econtext;		/* for ExecEvalExpr() */
 	bool					for_insert;		/* are we in PartitionFilter now? */
-	bool					found_params;	/* mark if left or right argument
-											   of clause is Param */
 } WalkerContext;
 
 /* Usual initialization procedure for WalkerContext */
@@ -159,7 +157,6 @@ typedef struct
 		(context)->prel = (prel_info); \
 		(context)->econtext = (ecxt); \
 		(context)->for_insert = (for_ins); \
-		(context)->found_params = (false); \
 	} while (0)
 
 /* Check that WalkerContext contains ExprContext (plan execution stage) */
diff --git a/src/nodes_common.c b/src/nodes_common.c
@@ -323,7 +323,7 @@ clause_contains_prel_expr(Node *node, Node *prel_expr)
 	if (node == NULL)
 		return false;
 
-	if (match_expr_to_operand(node, prel_expr))
+	if (match_expr_to_operand(prel_expr, node))
 			return true;
 
 	return expression_tree_walker(node, clause_contains_prel_expr, prel_expr);
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -65,7 +65,7 @@ static void handle_binary_opexpr_param(const PartRelationInfo *prel,
 									   WrapperNode *result,
 									   const Node *varnode);
 
-static bool pull_var_param(const WalkerContext *ctx,
+static bool pull_var_param(const WalkerContext *context,
 						   const OpExpr *expr,
 						   Node **var_ptr,
 						   Node **param_ptr);
@@ -1012,9 +1012,6 @@ handle_opexpr(const OpExpr *expr, WalkerContext *context)
 			}
 			else if (IsA(param, Param) || IsA(param, Var))
 			{
-				if (IsA(param, Param))
-					context->found_params = true;
-
 				handle_binary_opexpr_param(prel, result, var);
 				return result;
 			}
@@ -1140,22 +1137,22 @@ handle_binary_opexpr_param(const PartRelationInfo *prel,
  * NOTE: returns false if partition key is not in expression.
  */
 static bool
-pull_var_param(const WalkerContext *ctx,
+pull_var_param(const WalkerContext *context,
 			   const OpExpr *expr,
 			   Node **var_ptr,
 			   Node **param_ptr)
 {
 	Node   *left = linitial(expr->args),
 		   *right = lsecond(expr->args);
 
-	if (match_expr_to_operand(left, ctx->prel_expr))
+	if (match_expr_to_operand(context->prel_expr, left))
 	{
 		*var_ptr = left;
 		*param_ptr = right;
 		return true;
 	}
 
-	if (match_expr_to_operand(right, ctx->prel_expr))
+	if (match_expr_to_operand(context->prel_expr, right))
 	{
 		*var_ptr = right;
 		*param_ptr = left;
diff --git a/src/utils.c b/src/utils.c
@@ -34,6 +34,31 @@
 #include "utils/typcache.h"
 
 
+static bool
+clause_contains_params_walker(Node *node, void *context)
+{
+	if (node == NULL)
+		return false;
+
+	if (IsA(node, Param))
+		return true;
+
+	return expression_tree_walker(node,
+								  clause_contains_params_walker,
+								  context);
+}
+
+/*
+ * Check whether clause contains PARAMs or not.
+ */
+bool
+clause_contains_params(Node *clause)
+{
+	return expression_tree_walker(clause,
+								  clause_contains_params_walker,
+								  NULL);
+}
+
 /*
  * Check if this is a "date"-related type.
  */
