Merge branch 'rel_1_2_beta' of github.com:funbringer/pg_pathman into rel_1_2_beta

funbringer · funbringer · commit f72269605883 · 2016-11-05T02:25:45.000+03:00
diff --git a/src/hooks.c b/src/hooks.c
@@ -218,7 +218,7 @@ pathman_rel_pathlist_hook(PlannerInfo *root,
 	/* Proceed iff relation 'rel' is partitioned */
 	if ((prel = get_pathman_relation_info(rte->relid)) != NULL)
 	{
-		Relation		parent_rel;				/* parent's relation (heap */
+		Relation		parent_rel;				/* parent's relation (heap) */
 		Oid			   *children;				/* selected children oids */
 		List		   *ranges,					/* a list of IndexRanges */
 					   *wrappers,				/* a list of WrapperNodes */
diff --git a/src/pg_compat.c b/src/pg_compat.c
@@ -58,7 +58,9 @@ set_append_rel_size_compat(PlannerInfo *root, RelOptInfo *rel, Index rti)
 #endif
 	}
 
+	/* Set 'rows' for append relation */
 	rel->rows = parent_rows;
+
 #if PG_VERSION_NUM >= 90600
 	rel->reltarget->width = rint(parent_size / parent_rows);
 #else
@@ -314,4 +316,37 @@ create_plain_partial_paths(PlannerInfo *root, RelOptInfo *rel)
 	/* Add an unordered partial path based on a parallel sequential scan. */
 	add_partial_path(rel, create_seqscan_path(root, rel, NULL, parallel_workers));
 }
-#endif
+
+
+#else /* PG_VERSION_NUM >= 90500 */
+
+/*
+ * set_dummy_rel_pathlist
+ *	  Build a dummy path for a relation that's been excluded by constraints
+ *
+ * Rather than inventing a special "dummy" path type, we represent this as an
+ * AppendPath with no members (see also IS_DUMMY_PATH/IS_DUMMY_REL macros).
+ */
+void
+set_dummy_rel_pathlist(RelOptInfo *rel)
+{
+	/* Set dummy size estimates --- we leave attr_widths[] as zeroes */
+	rel->rows = 0;
+	rel->width = 0;
+
+	/* Discard any pre-existing paths; no further need for them */
+	rel->pathlist = NIL;
+
+	add_path(rel, (Path *) create_append_path(rel, NIL, NULL));
+
+	/*
+	 * We set the cheapest path immediately, to ensure that IS_DUMMY_REL()
+	 * will recognize the relation as dummy if anyone asks.  This is redundant
+	 * when we're called from set_rel_size(), but not when called from
+	 * elsewhere, and doing it twice is harmless anyway.
+	 */
+	set_cheapest(rel);
+}
+
+
+#endif /* PG_VERSION_NUM >= 90600 */
diff --git a/src/pg_compat.h b/src/pg_compat.h
@@ -23,8 +23,10 @@ void set_append_rel_size_compat(PlannerInfo *root, RelOptInfo *rel, Index rti);
 void adjust_targetlist_compat(PlannerInfo *root, RelOptInfo *dest,
 							  RelOptInfo *rel, AppendRelInfo *appinfo);
 
+
 #if PG_VERSION_NUM >= 90600
 
+
 #define get_parameterized_joinrel_size_compat(root, rel, outer_path, \
 											  inner_path, sjinfo, \
 											  restrict_clauses) \
@@ -54,8 +56,10 @@ extern Result *make_result(List *tlist, Node *resconstantqual, Plan *subplan);
 #define make_result_compat(root, tlist, resconstantqual, subplan) \
 		make_result(tlist, resconstantqual, subplan)
 
+
 #else /* PG_VERSION_NUM >= 90500 */
 
+
 #define get_parameterized_joinrel_size_compat(root, rel, \
 											  outer_path, \
 											  inner_path, \
@@ -81,7 +85,10 @@ extern Result *make_result(List *tlist, Node *resconstantqual, Plan *subplan);
 
 #define create_plain_partial_paths_compat(root, rel) ((void) true)
 
-#endif
+void set_dummy_rel_pathlist(RelOptInfo *rel);
+
+
+#endif /* PG_VERSION_NUM */
 
 
 #endif /* PG_COMPAT_H */
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -33,6 +33,7 @@
 #include "fmgr.h"
 #include "miscadmin.h"
 #include "optimizer/clauses.h"
+#include "optimizer/plancat.h"
 #include "optimizer/prep.h"
 #include "optimizer/restrictinfo.h"
 #include "optimizer/cost.h"
@@ -276,6 +277,8 @@ append_child_relation(PlannerInfo *root, Relation parent_relation,
 	Index			childRTindex;
 	PlanRowMark	   *parent_rowmark,
 				   *child_rowmark;
+	Node		   *childqual;
+	List		   *childquals;
 	ListCell	   *lc,
 				   *lc2;
 
@@ -323,10 +326,9 @@ append_child_relation(PlannerInfo *root, Relation parent_relation,
 	 * Copy restrictions. If it's not the parent table, copy only
 	 * those restrictions that are related to this partition.
 	 */
-	child_rel->baserestrictinfo = NIL;
 	if (parent_rte->relid != child_oid)
 	{
-		List *childquals = NIL;
+		childquals = NIL;
 
 		forboth(lc, wrappers, lc2, parent_rel->baserestrictinfo)
 		{
@@ -345,24 +347,39 @@ append_child_relation(PlannerInfo *root, Relation parent_relation,
 			Assert(new_clause);
 			childquals = lappend(childquals, new_clause);
 		}
-
-		childquals = (List *) adjust_appendrel_attrs(root,
-													 (Node *) childquals,
-													 appinfo);
-		childquals = make_restrictinfos_from_actual_clauses(root, childquals);
-		child_rel->baserestrictinfo = childquals;
 	}
 	/* If it's the parent table, copy all restrictions */
-	else
+	else childquals = get_all_actual_clauses(parent_rel->baserestrictinfo);
+
+	/* Now it's time to change varnos and rebuld quals */
+	childquals = (List *) adjust_appendrel_attrs(root,
+												 (Node *) childquals,
+												 appinfo);
+	childqual = eval_const_expressions(root, (Node *)
+									   make_ands_explicit(childquals));
+	if (childqual && IsA(childqual, Const) &&
+		(((Const *) childqual)->constisnull ||
+		 !DatumGetBool(((Const *) childqual)->constvalue)))
 	{
-		List *childquals = NIL;
-
-		childquals = get_all_actual_clauses(parent_rel->baserestrictinfo);
-		childquals = (List *) adjust_appendrel_attrs(root,
-													 (Node *) childquals,
-													 appinfo);
-		childquals = make_restrictinfos_from_actual_clauses(root, childquals);
-		child_rel->baserestrictinfo = childquals;
+		/*
+		 * Restriction reduces to constant FALSE or constant NULL after
+		 * substitution, so this child need not be scanned.
+		 */
+		set_dummy_rel_pathlist(child_rel);
+	}
+	childquals = make_ands_implicit((Expr *) childqual);
+	childquals = make_restrictinfos_from_actual_clauses(root, childquals);
+
+	/* Set new shiny childquals */
+	child_rel->baserestrictinfo = childquals;
+
+	if (relation_excluded_by_constraints(root, child_rel, child_rte))
+	{
+		/*
+		 * This child need not be scanned, so we can omit it from the
+		 * appendrel.
+		 */
+		set_dummy_rel_pathlist(child_rel);
 	}
 
 	/*
@@ -373,9 +390,6 @@ append_child_relation(PlannerInfo *root, Relation parent_relation,
 		add_child_rel_equivalences(root, appinfo, parent_rel, child_rel);
 	child_rel->has_eclass_joins = parent_rel->has_eclass_joins;
 
-	/* Recalc parent relation tuples count */
-	parent_rel->tuples += child_rel->tuples;
-
 	/* Close child relations, but keep locks */
 	heap_close(child_relation, NoLock);
 
@@ -1666,8 +1680,8 @@ set_plain_rel_size(PlannerInfo *root, RelOptInfo *rel, RangeTblEntry *rte)
 static void
 set_plain_rel_pathlist(PlannerInfo *root, RelOptInfo *rel, RangeTblEntry *rte)
 {
-	Relids		required_outer;
-	Path *path;
+	Relids	required_outer;
+	Path   *path;
 
 	/*
 	 * We don't support pushing join clauses into the quals of a seqscan, but
@@ -1753,11 +1767,11 @@ set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel, Index rti,
 	 */
 	foreach(l, root->append_rel_list)
 	{
-		AppendRelInfo *appinfo = (AppendRelInfo *) lfirst(l);
-		Index		childRTindex;
-		RangeTblEntry *childRTE;
-		RelOptInfo *childrel;
-		ListCell   *lcp;
+		AppendRelInfo  *appinfo = (AppendRelInfo *) lfirst(l);
+		Index			childRTindex;
+		RangeTblEntry  *childRTE;
+		RelOptInfo	   *childrel;
+		ListCell	   *lcp;
 
 		/* append_rel_list contains all append rels; ignore others */
 		if (appinfo->parent_relid != parentRTindex)
@@ -1780,24 +1794,34 @@ set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel, Index rti,
 			set_rel_consider_parallel_compat(root, childrel, childRTE);
 #endif
 
-		/*
-		 * Compute the child's access paths.
-		 */
+		/* Compute child's access paths & sizes */
 		if (childRTE->relkind == RELKIND_FOREIGN_TABLE)
 		{
+			/* childrel->rows should be >= 1 */
 			set_foreign_size(root, childrel, childRTE);
+
+			/* If child IS dummy, ignore it */
+			if (IS_DUMMY_REL(childrel))
+				continue;
+
 			set_foreign_pathlist(root, childrel, childRTE);
 		}
 		else
 		{
+			/* childrel->rows should be >= 1 */
 			set_plain_rel_size(root, childrel, childRTE);
+
+			/* If child IS dummy, ignore it */
+			if (IS_DUMMY_REL(childrel))
+				continue;
+
 			set_plain_rel_pathlist(root, childrel, childRTE);
 		}
+
+		/* Set cheapest path for child */
 		set_cheapest(childrel);
 
-		/*
-		 * If child is dummy, ignore it.
-		 */
+		/* If child BECAME dummy, ignore it */
 		if (IS_DUMMY_REL(childrel))
 			continue;
 

Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ pathman_rel_pathlist_hook(PlannerInfo *root,`
`218`	`218`	`/* Proceed iff relation 'rel' is partitioned */`
`219`	`219`	`if ((prel = get_pathman_relation_info(rte->relid)) != NULL)`
`220`	`220`	`{`
`221`		`- Relation parent_rel; /* parent's relation (heap */`
	`221`	`+ Relation parent_rel; /* parent's relation (heap) */`
`222`	`222`	`Oid children; / selected children oids */`
`223`	`223`	`List ranges, / a list of IndexRanges */`
`224`	`224`	`wrappers, / a list of WrapperNodes */`