Migrate extansion to 9.6

Author: Maksim Milyutin

src/hooks.c

@@ -169,8 +169,8 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 		 */
 		nest_path->path.rows = get_parameterized_joinrel_size(root,
 															  joinrel,
-															  outer->rows,
-															  inner->rows,
+															  outer,
+															  inner,
 															  extra->sjinfo,
 															  filtered_joinclauses);
 

src/init.c

@@ -22,6 +22,7 @@
 #include "access/sysattr.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_constraint.h"
+#include "catalog/pg_constraint_fn.h"
 #include "catalog/pg_inherits.h"
 #include "catalog/pg_inherits_fn.h"
 #include "catalog/pg_type.h"

src/nodes_common.h

@@ -16,6 +16,7 @@
 #include "postgres.h"
 #include "commands/explain.h"
 #include "optimizer/planner.h"
+#include "nodes/extensible.h"
 
 
 /*

src/partition_filter.h

@@ -17,7 +17,7 @@
 #include "postgres.h"
 #include "commands/explain.h"
 #include "optimizer/planner.h"
-
+#include "nodes/extensible.h"
 
 typedef struct
 {

src/pg_pathman.c

@@ -376,11 +376,11 @@ set_append_rel_size(PlannerInfo *root, RelOptInfo *rel,
 		Assert(childrel->rows > 0);
 
 		parent_rows += childrel->rows;
-		parent_size += childrel->width * childrel->rows;
+		parent_size += childrel->reltarget->width * childrel->rows;
 	}
 
 	rel->rows = parent_rows;
-	rel->width = rint(parent_size / parent_rows);
+	rel->reltarget->width = rint(parent_size / parent_rows);
 	rel->tuples = parent_rows;
 }
 
@@ -423,15 +423,19 @@ append_child_relation(PlannerInfo *root, RelOptInfo *rel, Index rti,
 	childrel = build_simple_rel(root, childRTindex, RELOPT_OTHER_MEMBER_REL);
 
 	/* Copy targetlist */
-	childrel->reltargetlist = NIL;
-	foreach(lc, rel->reltargetlist)
+	childrel->reltarget->exprs = NIL;
+	childrel->reltarget->sortgrouprefs = (Index *) palloc(
+						list_length(rel->reltarget->exprs) * sizeof(Index));
+	foreach(lc, rel->reltarget->exprs)
 	{
 		Node *new_target;
 
 		node = (Node *) lfirst(lc);
 		new_target = copyObject(node);
 		change_varnos(new_target, rel->relid, childrel->relid);
-		childrel->reltargetlist = lappend(childrel->reltargetlist, new_target);
+		childrel->reltarget->exprs = lappend(childrel->reltarget->exprs,
+											 new_target);
+		/* childrel->reltarget->sortgrouprefs[i++] =  */
 	}
 
 	/* Copy attr_needed & attr_widths */
@@ -1640,7 +1644,7 @@ set_plain_rel_size(PlannerInfo *root, RelOptInfo *rel, RangeTblEntry *rte)
 	 * Test any partial indexes of rel for applicability.  We must do this
 	 * first since partial unique indexes can affect size estimates.
 	 */
-	check_partial_indexes(root, rel);
+	check_index_predicates(root, rel);
 
 	/* Mark rel with estimated output rows, width, etc */
 	set_baserel_size_estimates(root, rel);
@@ -1854,7 +1858,7 @@ set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
 	 * if we have zero or one live subpath due to constraint exclusion.)
 	 */
 	if (subpaths_valid)
-		add_path(rel, (Path *) create_append_path(rel, subpaths, NULL));
+		add_path(rel, (Path *) create_append_path(rel, subpaths, NULL, 0));
 
 	/*
 	 * Also build unparameterized MergeAppend paths based on the collected
@@ -1905,7 +1909,7 @@ set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
 
 		if (subpaths_valid)
 			add_path(rel, (Path *)
-					 create_append_path(rel, subpaths, required_outer));
+					 create_append_path(rel, subpaths, required_outer, 0));
 	}
 }
 
@@ -2083,13 +2087,13 @@ generate_mergeappend_paths(PlannerInfo *root, RelOptInfo *rel,
 		{
 			Path *path;
 
-			path = (Path *) create_append_path(rel, startup_subpaths, NULL);
+			path = (Path *) create_append_path(rel, startup_subpaths, NULL, 0);
 			path->pathkeys = pathkeys;
 			add_path(rel, path);
 
 			if (startup_neq_total)
 			{
-				path = (Path *) create_append_path(rel, total_subpaths, NULL);
+				path = (Path *) create_append_path(rel, total_subpaths, NULL, 0);
 				path->pathkeys = pathkeys;
 				add_path(rel, path);
 			}
@@ -2103,14 +2107,14 @@ generate_mergeappend_paths(PlannerInfo *root, RelOptInfo *rel,
 			Path *path;
 
 			path = (Path *) create_append_path(rel,
-								list_reverse(startup_subpaths), NULL);
+								list_reverse(startup_subpaths), NULL, 0);
 			path->pathkeys = pathkeys;
 			add_path(rel, path);
 
 			if (startup_neq_total)
 			{
 				path = (Path *) create_append_path(rel,
-								list_reverse(total_subpaths), NULL);
+								list_reverse(total_subpaths), NULL, 0);
 				path->pathkeys = pathkeys;
 				add_path(rel, path);
 			}

src/runtime_merge_append.c

@@ -15,6 +15,7 @@
 #include "catalog/pg_collation.h"
 #include "miscadmin.h"
 #include "nodes/nodeFuncs.h"
+#include "nodes/plannodes.h"
 #include "optimizer/clauses.h"
 #include "optimizer/cost.h"
 #include "optimizer/planmain.h"
@@ -601,6 +602,27 @@ find_ec_member_for_tle(EquivalenceClass *ec,
 	return NULL;
 }
 
+/*
+ * make_result
+ *	  Build a Result plan node
+ */
+static Result *
+make_result(List *tlist,
+			Node *resconstantqual,
+			Plan *subplan)
+{
+	Result	   *node = makeNode(Result);
+	Plan	   *plan = &node->plan;
+
+	plan->targetlist = tlist;
+	plan->qual = NIL;
+	plan->lefttree = subplan;
+	plan->righttree = NULL;
+	node->resconstantqual = resconstantqual;
+
+	return node;
+}
+
 static Plan *
 prepare_sort_from_pathkeys(PlannerInfo *root, Plan *lefttree, List *pathkeys,
 						   Relids relids,
@@ -727,6 +749,7 @@ prepare_sort_from_pathkeys(PlannerInfo *root, Plan *lefttree, List *pathkeys,
 				EquivalenceMember *em = (EquivalenceMember *) lfirst(j);
 				List	   *exprvars;
 				ListCell   *k;
+				int			varflag;
 
 				/*
 				 * We shouldn't be trying to sort by an equivalence class that
@@ -745,9 +768,8 @@ prepare_sort_from_pathkeys(PlannerInfo *root, Plan *lefttree, List *pathkeys,
 					continue;
 
 				sortexpr = em->em_expr;
-				exprvars = pull_var_clause((Node *) sortexpr,
-										   PVC_INCLUDE_AGGREGATES,
-										   PVC_INCLUDE_PLACEHOLDERS);
+				varflag = PVC_INCLUDE_AGGREGATES | PVC_INCLUDE_PLACEHOLDERS;
+				exprvars = pull_var_clause((Node *) sortexpr, varflag);
 				foreach(k, exprvars)
 				{
 					if (!tlist_member_ignore_relabel(lfirst(k), tlist))
@@ -771,8 +793,7 @@ prepare_sort_from_pathkeys(PlannerInfo *root, Plan *lefttree, List *pathkeys,
 			{
 				/* copy needed so we don't modify input's tlist below */
 				tlist = copyObject(tlist);
-				lefttree = (Plan *) make_result(root, tlist, NULL,
-												lefttree);
+				lefttree = (Plan *) make_result(tlist, NULL, lefttree);
 			}
 
 			/* Don't bother testing is_projection_capable_plan again */