Merge branch 'master' into pg_pathman_intro

Author: funbringer

src/hooks.c

@@ -369,8 +369,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

@@ -497,6 +497,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);