introduce inline function PrelExpressionForRelid()

Author: funbringer

src/hooks.c

@@ -130,12 +130,7 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 	}
 
 	/* Make copy of partitioning expression and fix Var's  varno attributes */
-	expr = inner_prel->expr;
-	if (innerrel->relid != 1)
-	{
-		expr = copyObject(expr);
-		ChangeVarNodes(expr, 1, innerrel->relid, 0);
-	}
+	expr = PrelExpressionForRelid(inner_prel, innerrel->relid);
 
 	paramsel = 1.0;
 	foreach (lc, joinclauses)
@@ -196,9 +191,9 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 		innerrel->ppilist = saved_ppi_list;
 
 		/* Skip ppi->ppi_clauses don't reference partition attribute */
-		if (!(ppi && get_partitioned_attr_clauses(ppi->ppi_clauses,
-												  inner_prel,
-												  innerrel->relid)))
+		if (!(ppi && get_partitioning_clauses(ppi->ppi_clauses,
+											  inner_prel,
+											  innerrel->relid)))
 			continue;
 
 		inner = create_runtimeappend_path(root, cur_inner_path, ppi, paramsel);
@@ -319,9 +314,7 @@ pathman_rel_pathlist_hook(PlannerInfo *root,
 		bool			modify_append_nodes;
 
 		/* Make copy of partitioning expression and fix Var's  varno attributes */
-		expr = copyObject(prel->expr);
-		if (rti != 1)
-			ChangeVarNodes(expr, 1, rti, 0);
+		expr = PrelExpressionForRelid(prel, rti);
 
 		if (prel->parttype == PT_RANGE)
 		{

src/include/nodes_common.h

@@ -65,9 +65,9 @@ clear_plan_states(CustomScanState *scan_state)
 	}
 }
 
-List * get_partitioned_attr_clauses(List *restrictinfo_list,
-									const PartRelationInfo *prel,
-									Index partitioned_rel);
+List * get_partitioning_clauses(List *restrictinfo_list,
+								const PartRelationInfo *prel,
+								Index partitioned_rel);
 
 Oid * get_partition_oids(List *ranges, int *n, const PartRelationInfo *prel,
 						 bool include_parent);

src/include/relation_info.h

@@ -21,6 +21,7 @@
 #include "nodes/primnodes.h"
 #include "nodes/value.h"
 #include "port/atomics.h"
+#include "rewrite/rewriteManip.h"
 #include "storage/lock.h"
 #include "utils/datum.h"
 #include "utils/lsyscache.h"
@@ -207,7 +208,7 @@ typedef enum
 
 
 /*
- * PartRelationInfo field access macros.
+ * PartRelationInfo field access macros & functions.
  */
 
 #define PrelParentRelid(prel)		( (prel)->key )
@@ -249,6 +250,21 @@ PrelExpressionColumnNames(const PartRelationInfo *prel)
 	return columns;
 }
 
+static inline Node *
+PrelExpressionForRelid(const PartRelationInfo *prel, Index rel_index)
+{
+	Node *expr;
+
+	if (rel_index != PART_EXPR_VARNO)
+	{
+		expr = copyObject(prel->expr);
+		ChangeVarNodes(expr, PART_EXPR_VARNO, rel_index, 0);
+	}
+	else expr = prel->expr;
+
+	return expr;
+}
+
 
 const PartRelationInfo *refresh_pathman_relation_info(Oid relid,
 													  Datum *values,

src/include/utils.h

@@ -24,7 +24,7 @@
 bool clause_contains_params(Node *clause);
 bool is_date_type_internal(Oid typid);
 bool check_security_policy_internal(Oid relid, Oid role);
-bool expr_matches_operand(Node *operand, Node *expr);
+bool match_expr_to_operand(Node *expr, Node *operand);
 
 /*
  * Misc.

src/init.c

@@ -1109,7 +1109,7 @@ validate_hash_constraint(const Expr *expr,
 		hash_arg = (Node *) linitial(type_hash_proc_expr->args);
 
 		/* Check arg of TYPE_HASH_PROC() */
-		if (!expr_matches_operand(prel->expr, hash_arg))
+		if (!match_expr_to_operand(prel->expr, hash_arg))
 			return false;
 
 		/* Check that PARTITIONS_COUNT is equal to total amount of partitions */

src/nodes_common.c

@@ -315,65 +315,41 @@ unpack_runtimeappend_private(RuntimeAppendState *scan_state, CustomScan *cscan)
 	scan_state->enable_parent = (bool) linitial_int(lthird(runtimeappend_private));
 }
 
-struct check_clause_context
-{
-	Node	*prel_expr;
-	int count;
-};
 
 /* Check that one of arguments of OpExpr is expression */
 static bool
-check_clause_for_expression(Node *node, struct check_clause_context *ctx)
+clause_contains_prel_expr(Node *node, Node *prel_expr)
 {
 	if (node == NULL)
 		return false;
 
-	if (IsA(node, OpExpr))
-	{
-		OpExpr *expr	= (OpExpr *) node;
-		Node   *left	= linitial(expr->args),
-			   *right	= lsecond(expr->args);
-
-		if (expr_matches_operand(left, ctx->prel_expr))
-			ctx->count += 1;
-
-		if (expr_matches_operand(right, ctx->prel_expr))
-			ctx->count += 1;
-
-		return false;
-	}
+	if (match_expr_to_operand(node, prel_expr))
+			return true;
 
-	return expression_tree_walker(node, check_clause_for_expression, (void *) ctx);
+	return expression_tree_walker(node, clause_contains_prel_expr, prel_expr);
 }
 
 /*
  * Filter all available clauses and extract relevant ones.
  */
 List *
-get_partitioned_attr_clauses(List *restrictinfo_list,
-							 const PartRelationInfo *prel,
-							 Index partitioned_rel)
+get_partitioning_clauses(List *restrictinfo_list,
+						 const PartRelationInfo *prel,
+						 Index partitioned_rel)
 {
 	List	   *result = NIL;
 	ListCell   *l;
 
 	foreach(l, restrictinfo_list)
 	{
-		RestrictInfo				   *rinfo = (RestrictInfo *) lfirst(l);
-		struct check_clause_context		ctx;
+		RestrictInfo   *rinfo = (RestrictInfo *) lfirst(l);
+		Node		   *prel_expr;
 
 		Assert(IsA(rinfo, RestrictInfo));
 
-		ctx.count = 0;
-		ctx.prel_expr = prel->expr;
-		if (partitioned_rel != 1)
-		{
-			ctx.prel_expr = copyObject(prel->expr);
-			ChangeVarNodes(ctx.prel_expr, 1, partitioned_rel, 0);
-		}
-		check_clause_for_expression((Node *) rinfo->clause, &ctx);
+		prel_expr = PrelExpressionForRelid(prel, partitioned_rel);
 
-		if (ctx.count == 1)
+		if (clause_contains_prel_expr((Node *) rinfo->clause, prel_expr))
 			result = lappend(result, rinfo->clause);
 	}
 	return result;
@@ -591,7 +567,7 @@ create_append_plan_common(PlannerInfo *root, RelOptInfo *rel,
 	/* Since we're not scanning any real table directly */
 	cscan->scan.scanrelid = 0;
 
-	cscan->custom_exprs = get_partitioned_attr_clauses(clauses, prel, rel->relid);
+	cscan->custom_exprs = get_partitioning_clauses(clauses, prel, rel->relid);
 	cscan->custom_plans = custom_plans;
 	cscan->methods = scan_methods;
 

src/partition_filter.c

@@ -417,7 +417,7 @@ select_partition_for_insert(Datum value, Oid value_type,
 							ResultPartsStorage *parts_storage,
 							EState *estate)
 {
-	MemoryContext			old_cxt;
+	MemoryContext			old_mcxt;
 	ResultRelInfoHolder	   *rri_holder;
 	Oid						selected_partid = InvalidOid;
 	Oid					   *parts;
@@ -439,9 +439,9 @@ select_partition_for_insert(Datum value, Oid value_type,
 	else selected_partid = parts[0];
 
 	/* Replace parent table with a suitable partition */
-	old_cxt = MemoryContextSwitchTo(estate->es_query_cxt);
+	old_mcxt = MemoryContextSwitchTo(estate->es_query_cxt);
 	rri_holder = scan_result_parts_storage(selected_partid, parts_storage);
-	MemoryContextSwitchTo(old_cxt);
+	MemoryContextSwitchTo(old_mcxt);
 
 	/* Could not find suitable partition */
 	if (rri_holder == NULL)
@@ -531,12 +531,12 @@ partition_filter_create_scan_state(CustomScan *node)
 void
 partition_filter_begin(CustomScanState *node, EState *estate, int eflags)
 {
-	Index					varno = 1;
-	Node					*expr;
-	MemoryContext			 old_cxt;
-	PartitionFilterState	*state = (PartitionFilterState *) node;
-	const PartRelationInfo	*prel;
-	ListCell				*lc;
+	Index						varno = 1;
+	Node					   *expr;
+	MemoryContext				old_mcxt;
+	PartitionFilterState	   *state = (PartitionFilterState *) node;
+	const PartRelationInfo	   *prel;
+	ListCell				   *lc;
 
 	/* It's convenient to store PlanState in 'custom_ps' */
 	node->custom_ps = list_make1(ExecInitNode(state->subplan, estate, eflags));
@@ -562,9 +562,9 @@ partition_filter_begin(CustomScanState *node, EState *estate, int eflags)
 		}
 
 		/* Prepare state for expression execution */
-		old_cxt = MemoryContextSwitchTo(estate->es_query_cxt);
+		old_mcxt = MemoryContextSwitchTo(estate->es_query_cxt);
 		state->expr_state = ExecInitExpr((Expr *) expr, NULL);
-		MemoryContextSwitchTo(old_cxt);
+		MemoryContextSwitchTo(old_mcxt);
 	}
 
 	/* Init ResultRelInfo cache */
@@ -595,13 +595,13 @@ partition_filter_exec(CustomScanState *node)
 
 	if (!TupIsNull(slot))
 	{
-		MemoryContext				 old_cxt;
-		const PartRelationInfo		*prel;
-		ResultRelInfoHolder			*rri_holder;
-		bool						 isnull;
-		Datum						 value;
-		ExprDoneCond				 itemIsDone;
-		TupleTableSlot				*tmp_slot;
+		MemoryContext				old_mcxt;
+		const PartRelationInfo	   *prel;
+		ResultRelInfoHolder		   *rri_holder;
+		bool						isnull;
+		Datum						value;
+		ExprDoneCond				itemIsDone;
+		TupleTableSlot			   *tmp_slot;
 
 		/* Fetch PartRelationInfo for this partitioned relation */
 		prel = get_pathman_relation_info(state->partitioned_table);
@@ -616,7 +616,7 @@ partition_filter_exec(CustomScanState *node)
 		}
 
 		/* Switch to per-tuple context */
-		old_cxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(estate));
+		old_mcxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(estate));
 
 		/* Execute expression */
 		tmp_slot = econtext->ecxt_scantuple;
@@ -635,7 +635,7 @@ partition_filter_exec(CustomScanState *node)
 												 &state->result_parts, estate);
 
 		/* Switch back and clean up per-tuple context */
-		MemoryContextSwitchTo(old_cxt);
+		MemoryContextSwitchTo(old_mcxt);
 		ResetExprContext(econtext);
 
 		/* Magic: replace parent's ResultRelInfo with ours */

src/pg_pathman.c

@@ -867,7 +867,7 @@ handle_arrexpr(const ScalarArrayOpExpr *expr, WalkerContext *context)
 
 	Assert(exprnode != NULL);
 
-	if (!expr_matches_operand(context->prel_expr, exprnode))
+	if (!match_expr_to_operand(context->prel_expr, exprnode))
 		goto handle_arrexpr_return;
 
 	if (arraynode && IsA(arraynode, Const) &&
@@ -1145,14 +1145,14 @@ pull_var_param(const WalkerContext *ctx,
 	Node   *left = linitial(expr->args),
 		   *right = lsecond(expr->args);
 
-	if (expr_matches_operand(left, ctx->prel_expr))
+	if (match_expr_to_operand(left, ctx->prel_expr))
 	{
 		*var_ptr = left;
 		*param_ptr = right;
 		return true;
 	}
 
-	if (expr_matches_operand(right, ctx->prel_expr))
+	if (match_expr_to_operand(right, ctx->prel_expr))
 	{
 		*var_ptr = right;
 		*param_ptr = left;

src/planner_tree_modification.c

@@ -239,13 +239,13 @@ static void
 handle_modification_query(Query *parse)
 {
 	const PartRelationInfo *prel;
+	Node				   *prel_expr;
 	List				   *ranges;
 	RangeTblEntry		   *rte;
 	WrapperNode			   *wrap;
 	Expr				   *expr;
 	WalkerContext			context;
 	Index					result_rel;
-	Node				   *prel_expr;
 
 	/* Fetch index of result relation */
 	result_rel = parse->resultRelation;
@@ -277,9 +277,7 @@ handle_modification_query(Query *parse)
 	if (!expr) return;
 
 	/* Prepare partitioning expression */
-	prel_expr = copyObject(prel->expr);
-	if (result_rel != 1)
-		ChangeVarNodes(prel_expr, 1, result_rel, 0);
+	prel_expr = PrelExpressionForRelid(prel, result_rel);
 
 	/* Parse syntax tree and extract partition ranges */
 	InitWalkerContext(&context, prel_expr, prel, NULL, false);

src/utils.c

@@ -108,9 +108,9 @@ check_security_policy_internal(Oid relid, Oid role)
 
 /* Compare clause operand with expression */
 bool
-expr_matches_operand(Node *operand, Node *expr)
+match_expr_to_operand(Node *expr, Node *operand)
 {
-	/* strip relabeling for both operand and expr */
+	/* Strip relabeling for both operand and expr */
 	if (operand && IsA(operand, RelabelType))
 		operand = (Node *) ((RelabelType *) operand)->arg;