Merge branch 'master' into callbacks

Author: funbringer

src/hooks.c

@@ -99,19 +99,21 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 		paramsel *= wrap->paramsel;
 	}
 
-	/* Check that innerrel's RestrictInfo contains partitioned column */
+	/* Check that innerrel's RestrictInfos contain partitioned column */
 	innerrel_rinfo_contains_part_attr =
 		get_partitioned_attr_clauses(innerrel->baserestrictinfo,
 									 inner_prel, innerrel->relid) != NULL;
 
 	foreach (lc, innerrel->pathlist)
 	{
+		AppendPath	   *cur_inner_path = (AppendPath *) lfirst(lc);
 		Path		   *outer,
 					   *inner;
 		NestPath	   *nest_path;		/* NestLoop we're creating */
 		ParamPathInfo  *ppi;			/* parameterization info */
 		Relids			inner_required;	/* required paremeterization relids */
-		AppendPath	   *cur_inner_path = (AppendPath *) lfirst(lc);
+		List		   *filtered_joinclauses = NIL;
+		ListCell	   *rinfo_lc;
 
 		if (!IsA(cur_inner_path, AppendPath))
 			continue;
@@ -136,8 +138,7 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 												   innerrel->relid))))
 			continue;
 
-		inner = create_runtimeappend_path(root, cur_inner_path,
-										  ppi, paramsel);
+		inner = create_runtimeappend_path(root, cur_inner_path, ppi, paramsel);
 
 		initial_cost_nestloop(root, &workspace, jointype,
 							  outer, inner, /* built paths */
@@ -151,7 +152,29 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 										 pathkeys,
 										 calc_nestloop_required_outer(outer, inner));
 
-		/* Finally we can add new NestLoop path */
+		/* Discard all clauses that are to be evaluated by 'inner' */
+		foreach (rinfo_lc, extra->restrictlist)
+		{
+			RestrictInfo *rinfo = (RestrictInfo *) lfirst(rinfo_lc);
+
+			Assert(IsA(rinfo, RestrictInfo));
+			if (!join_clause_is_movable_to(rinfo, inner->parent))
+				filtered_joinclauses = lappend(filtered_joinclauses, rinfo);
+		}
+
+		/*
+		 * Override 'rows' value produced by standard estimator.
+		 * Currently we use get_parameterized_joinrel_size() since
+		 * it works just fine, but this might change some day.
+		 */
+		nest_path->path.rows = get_parameterized_joinrel_size(root,
+															  joinrel,
+															  outer->rows,
+															  inner->rows,
+															  extra->sjinfo,
+															  filtered_joinclauses);
+
+		/* Finally we can add the new NestLoop path */
 		add_path(joinrel, (Path *) nest_path);
 	}
 }
@@ -342,8 +365,16 @@ pathman_rel_pathlist_hook(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTb
 													   ppi, paramsel);
 			else if (IsA(cur_path, MergeAppendPath) &&
 					 pg_pathman_enable_runtime_merge_append)
+			{
+				/* Check struct layout compatibility */
+				if (offsetof(AppendPath, subpaths) !=
+						offsetof(MergeAppendPath, subpaths))
+					elog(FATAL, "Struct layouts of AppendPath and "
+								"MergeAppendPath differ");
+
 				inner_path = create_runtimemergeappend_path(root, cur_path,
 															ppi, paramsel);
+			}
 
 			if (inner_path)
 				add_path(rel, inner_path);

src/nodes_common.c

@@ -259,7 +259,7 @@ get_partitioned_attr_clauses(List *restrictinfo_list,
 							 Index partitioned_rel)
 {
 #define AdjustAttno(attno) \
-	( (AttrNumber) (part_attno + FirstLowInvalidHeapAttributeNumber) )
+	( (AttrNumber) (attno + FirstLowInvalidHeapAttributeNumber) )
 
 	List	   *result = NIL;
 	ListCell   *l;

src/pg_pathman.c

@@ -544,6 +544,7 @@ append_child_relation(PlannerInfo *root, RelOptInfo *rel, Index rti,
 	/* Recalc parent relation tuples count */
 	rel->tuples += childrel->tuples;
 
+	/* Close child relations, but keep locks */
 	heap_close(newrelation, NoLock);
 
 
@@ -1510,7 +1511,6 @@ handle_boolexpr(const BoolExpr *expr, WalkerContext *context)
 		switch (expr->boolop)
 		{
 			case OR_EXPR:
-				// finish_least_greatest(arg, context);
 				result->rangeset = irange_list_union(result->rangeset, arg->rangeset);
 				break;
 			case AND_EXPR:
@@ -1671,7 +1671,6 @@ set_plain_rel_pathlist(PlannerInfo *root, RelOptInfo *rel, RangeTblEntry *rte)
 	path = create_seqscan_path(root, rel, required_outer);
 #endif
 	add_path(rel, path);
-	// set_pathkeys(root, rel, path);
 
 	/* Consider index scans */
 	create_index_paths(root, rel);