Merge branch 'master' into rework_query_walkers

funbringer · funbringer · commit ae81df25a687 · 2016-09-08T17:02:35.000+03:00
diff --git a/src/hooks.c b/src/hooks.c
@@ -101,9 +101,8 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 
 	/* Check that innerrel's RestrictInfo contains partitioned column */
 	innerrel_rinfo_contains_part_attr =
-		check_rinfo_for_partitioned_attr(innerrel->baserestrictinfo,
-										 innerrel->relid,
-										 inner_prel->attnum);
+		get_partitioned_attr_clauses(innerrel->baserestrictinfo,
+									 inner_prel, innerrel->relid) != NULL;
 
 	foreach (lc, innerrel->pathlist)
 	{
@@ -132,9 +131,9 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 		 * ppi->ppi_clauses reference partition attribute
 		 */
 		if (!(innerrel_rinfo_contains_part_attr ||
-			  (ppi && check_rinfo_for_partitioned_attr(ppi->ppi_clauses,
-													   innerrel->relid,
-													   inner_prel->attnum))))
+			  (ppi && get_partitioned_attr_clauses(ppi->ppi_clauses,
+												   inner_prel,
+												   innerrel->relid))))
 			continue;
 
 		inner = create_runtimeappend_path(root, cur_inner_path,
@@ -310,10 +309,10 @@ pathman_rel_pathlist_hook(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTb
 		if (!clause_contains_params((Node *) get_actual_clauses(rel->baserestrictinfo)))
 			return;
 
+		/* Check that rel's RestrictInfo contains partitioned column */
 		rel_rinfo_contains_part_attr =
-			check_rinfo_for_partitioned_attr(rel->baserestrictinfo,
-											 rel->relid,
-											 prel->attnum);
+			get_partitioned_attr_clauses(rel->baserestrictinfo,
+										 prel, rel->relid) != NULL;
 
 		foreach (lc, rel->pathlist)
 		{
@@ -334,9 +333,8 @@ pathman_rel_pathlist_hook(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTb
 			 * ppi->ppi_clauses reference partition attribute
 			 */
 			if (!(rel_rinfo_contains_part_attr ||
-				  (ppi && check_rinfo_for_partitioned_attr(ppi->ppi_clauses,
-														   rel->relid,
-														   prel->attnum))))
+				  (ppi && get_partitioned_attr_clauses(ppi->ppi_clauses,
+													   prel, rel->relid))))
 				continue;
 
 			if (IsA(cur_path, AppendPath) && pg_pathman_enable_runtimeappend)
diff --git a/src/nodes_common.c b/src/nodes_common.c
@@ -12,7 +12,9 @@
 #include "runtimeappend.h"
 #include "utils.h"
 
+#include "access/sysattr.h"
 #include "optimizer/restrictinfo.h"
+#include "optimizer/var.h"
 #include "utils/memutils.h"
 
 
@@ -248,6 +250,38 @@ unpack_runtimeappend_private(RuntimeAppendState *scan_state, CustomScan *cscan)
 	scan_state->enable_parent = (bool) linitial_int(lthird(runtimeappend_private));
 }
 
+/*
+ * Filter all available clauses and extract relevant ones.
+ */
+List *
+get_partitioned_attr_clauses(List *restrictinfo_list,
+							 const PartRelationInfo *prel,
+							 Index partitioned_rel)
+{
+#define AdjustAttno(attno) \
+	( (AttrNumber) (part_attno + FirstLowInvalidHeapAttributeNumber) )
+
+	List	   *result = NIL;
+	ListCell   *l;
+
+	foreach(l, restrictinfo_list)
+	{
+		RestrictInfo   *rinfo = (RestrictInfo *) lfirst(l);
+		Bitmapset	   *varattnos = NULL;
+		int				part_attno;
+
+		Assert(IsA(rinfo, RestrictInfo));
+		pull_varattnos((Node *) rinfo->clause, partitioned_rel, &varattnos);
+
+		if (bms_get_singleton_member(varattnos, &part_attno) &&
+			AdjustAttno(part_attno) == prel->attnum)
+		{
+			result = lappend(result, rinfo->clause);
+		}
+	}
+	return result;
+}
+
 
 /* Transform partition ranges into plain array of partition Oids */
 Oid *
@@ -385,7 +419,7 @@ create_append_plan_common(PlannerInfo *root, RelOptInfo *rel,
 			Plan		   *child_plan = (Plan *) lfirst(lc2);
 			RelOptInfo 	   *child_rel = ((Path *) lfirst(lc1))->parent;
 
-			/* Replace rel's  tlist with a matching one */
+			/* Replace rel's tlist with a matching one */
 			if (!cscan->scan.plan.targetlist)
 				tlist = replace_tlist_varnos(child_plan->targetlist, rel);
 
@@ -407,7 +441,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_actual_clauses(clauses);
+	cscan->custom_exprs = get_partitioned_attr_clauses(clauses, prel, rel->relid);
 	cscan->custom_plans = custom_plans;
 	cscan->methods = scan_methods;
 
diff --git a/src/nodes_common.h b/src/nodes_common.h
@@ -60,6 +60,10 @@ clear_plan_states(CustomScanState *scan_state)
 	}
 }
 
+List * get_partitioned_attr_clauses(List *restrictinfo_list,
+									const PartRelationInfo *prel,
+									Index partitioned_rel);
+
 Oid * get_partition_oids(List *ranges, int *n, const PartRelationInfo *prel,
 						 bool include_parent);
 
diff --git a/src/utils.c b/src/utils.c
@@ -42,25 +42,6 @@ static void lock_rows_visitor(Plan *plan, void *context);
 static bool rowmark_add_tableoids_walker(Node *node, void *context);
 
 
-/*
- * Execute 'cb_proc' on 'xact_context' reset.
- */
-void
-execute_on_xact_mcxt_reset(MemoryContext xact_context,
-						   MemoryContextCallbackFunction cb_proc,
-						   void *arg)
-{
-	MemoryContextCallback *mcxt_cb = MemoryContextAlloc(xact_context,
-														sizeof(MemoryContextCallback));
-
-	/* Initialize MemoryContextCallback */
-	mcxt_cb->arg = arg;
-	mcxt_cb->func = cb_proc;
-	mcxt_cb->next = NULL;
-
-	MemoryContextRegisterResetCallback(xact_context, mcxt_cb);
-}
-
 /*
  * Check whether clause contains PARAMs or not
  */
@@ -251,36 +232,6 @@ build_index_tlist(PlannerInfo *root, IndexOptInfo *index,
 	return tlist;
 }
 
-/*
- * We should ensure that 'rel->baserestrictinfo' or 'ppi->ppi_clauses' contain
- * Var which corresponds to partition attribute before creating RuntimeXXX
- * paths since they are used by create_scan_plan() to form 'scan_clauses'
- * that are passed to create_customscan_plan().
- */
-bool
-check_rinfo_for_partitioned_attr(List *rinfo, Index varno, AttrNumber varattno)
-{
-	List	   *vars;
-	List	   *clauses;
-	ListCell   *lc;
-
-	clauses = get_actual_clauses(rinfo);
-
-	vars = pull_var_clause((Node *) clauses,
-						   PVC_REJECT_AGGREGATES,
-						   PVC_REJECT_PLACEHOLDERS);
-
-	foreach (lc, vars)
-	{
-		Var *var = (Var *) lfirst(lc);
-
-		if (var->varno == varno && var->varoattno == varattno)
-			return true;
-	}
-
-	return false;
-}
-
 /*
  * Get BTORDER_PROC for two types described by Oids
  */
diff --git a/src/utils.h b/src/utils.h
@@ -49,9 +49,6 @@ void postprocess_lock_rows(List *rtable, Plan *plan);
 bool clause_contains_params(Node *clause);
 bool is_date_type_internal(Oid typid);
 bool is_string_type_internal(Oid typid);
-bool check_rinfo_for_partitioned_attr(List *rinfo,
-									  Index varno,
-									  AttrNumber varattno);
 
 /*
  * Misc.
@@ -67,9 +64,6 @@ Oid get_binary_operator_oid(char *opname, Oid arg1, Oid arg2);
 void fill_type_cmp_fmgr_info(FmgrInfo *finfo,
 							 Oid type1,
 							 Oid type2);
-void execute_on_xact_mcxt_reset(MemoryContext xact_context,
-								MemoryContextCallbackFunction cb_proc,
-								void *arg);
 char * datum_to_cstring(Datum datum, Oid typid);
 
 

Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,10 @@ clear_plan_states(CustomScanState *scan_state)`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
	`63`	`+List * get_partitioned_attr_clauses(List *restrictinfo_list,`
	`64`	`+ const PartRelationInfo *prel,`
	`65`	`+ Index partitioned_rel);`
	`66`	`+`
`63`	`67`	`Oid * get_partition_oids(List ranges, int n, const PartRelationInfo *prel,`
`64`	`68`	`bool include_parent);`
`65`	`69`