Merge branch 'master' into hash

funbringer · funbringer · commit 869013290591 · 2016-05-20T16:21:20.000+03:00
diff --git a/src/hooks.c b/src/hooks.c
@@ -44,6 +44,7 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 	ListCell		   *lc;
 	double				paramsel;
 	WalkerContext		context;
+	bool				innerrel_rinfo_contains_part_attr;
 
 	if (set_join_pathlist_next)
 		set_join_pathlist_next(root, joinrel, outerrel,
@@ -92,6 +93,11 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 		paramsel *= wrap->paramsel;
 	}
 
+	innerrel_rinfo_contains_part_attr =
+		check_rinfo_for_partitioned_attr(innerrel->baserestrictinfo,
+										 innerrel->relid,
+										 inner_prel->attnum);
+
 	foreach (lc, innerrel->pathlist)
 	{
 		AppendPath	   *cur_inner_path = (AppendPath *) lfirst(lc);
@@ -107,6 +113,16 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 
 		ppi = get_baserel_parampathinfo(root, innerrel, inner_required);
 
+		/*
+		 * Skip if neither rel->baserestrictinfo nor
+		 * 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))))
+			continue;
+
 		inner = create_runtimeappend_path(root, cur_inner_path,
 										  ppi,
 										  paramsel);
@@ -162,6 +178,7 @@ pathman_rel_pathlist_hook(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTb
 		double			paramsel = 1.0;
 		WalkerContext	context;
 		int				i;
+		bool			rel_rinfo_contains_part_attr = false;
 
 		if (prel->parttype == PT_RANGE)
 		{
@@ -280,6 +297,11 @@ pathman_rel_pathlist_hook(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTb
 		if (!clause_contains_params((Node *) get_actual_clauses(rel->baserestrictinfo)))
 			return;
 
+		rel_rinfo_contains_part_attr =
+			check_rinfo_for_partitioned_attr(rel->baserestrictinfo,
+											 rel->relid,
+											 prel->attnum);
+
 		foreach (lc, rel->pathlist)
 		{
 			AppendPath	   *cur_path = (AppendPath *) lfirst(lc);
@@ -295,6 +317,16 @@ pathman_rel_pathlist_hook(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTb
 				continue;
 			}
 
+			/*
+			 * Skip if neither rel->baserestrictinfo nor
+			 * 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))))
+				continue;
+
 			if (IsA(cur_path, AppendPath) && pg_pathman_enable_runtimeappend)
 				inner_path = create_runtimeappend_path(root, cur_path,
 													   ppi, paramsel);
diff --git a/src/utils.c b/src/utils.c
@@ -10,6 +10,8 @@
 #include "utils.h"
 #include "nodes/nodeFuncs.h"
 #include "nodes/makefuncs.h"
+#include "optimizer/var.h"
+#include "optimizer/restrictinfo.h"
 #include "parser/parse_param.h"
 #include "utils/builtins.h"
 #include "rewrite/rewriteManip.h"
@@ -109,3 +111,33 @@ 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;
+}
diff --git a/src/utils.h b/src/utils.h
@@ -27,4 +27,8 @@ bool clause_contains_params(Node *clause);
 List * build_index_tlist(PlannerInfo *root, IndexOptInfo *index,
 						 Relation heapRelation);
 
+bool check_rinfo_for_partitioned_attr(List *rinfo,
+									  Index varno,
+									  AttrNumber varattno);
+
 #endif
