resolve conflicts caused by a merge of PostgreSQL 9.6 compatibility fixes

Author: funbringer

.travis.yml

@@ -14,6 +14,8 @@ before_install:
   - sudo sh ./travis/apt.postgresql.org.sh
 
 env:
+  - PGVERSION=9.6 CHECK_CODE=true
+  - PGVERSION=9.6 CHECK_CODE=false
   - PGVERSION=9.5 CHECK_CODE=true
   - PGVERSION=9.5 CHECK_CODE=false
 

Makefile

@@ -4,7 +4,7 @@ MODULE_big = pg_pathman
 OBJS = src/init.o src/relation_info.o src/utils.o src/partition_filter.o src/runtimeappend.o \
 	src/runtime_merge_append.o src/pg_pathman.o src/dsm_array.o src/rangeset.o src/pl_funcs.o \
 	src/pathman_workers.o src/hooks.o src/nodes_common.o src/xact_handling.o src/copy_stmt_hooking.o \
-	$(WIN32RES)
+	src/pg_compat.o $(WIN32RES)
 
 EXTENSION = pg_pathman
 EXTVERSION = 1.0

range.sql

@@ -91,6 +91,7 @@ DECLARE
 	v_rows_count		INTEGER;
 	v_max				p_start_value%TYPE;
 	v_cur_value			p_start_value%TYPE := p_start_value;
+	p_end_value			p_start_value%TYPE;
 	i					INTEGER;
 
 BEGIN
@@ -132,12 +133,19 @@ BEGIN
 	 * and specifies partition count as 0 then do not check boundaries
 	 */
 	IF p_count != 0 THEN
+		/* compute right bound of partitioning through additions */
+		p_end_value := p_start_value;
+		FOR i IN 1..p_count
+		LOOP
+			p_end_value := p_end_value + p_interval;
+		END LOOP;
+
 		/* Check boundaries */
 		EXECUTE format('SELECT @extschema@.check_boundaries(''%s'', ''%s'', ''%s'', ''%s''::%s)',
 					   parent_relid,
 					   p_attribute,
 					   p_start_value,
-					   p_start_value + p_interval * p_count,
+					   p_end_value,
 					   @extschema@.get_base_type(pg_typeof(p_start_value))::TEXT);
 	END IF;
 
@@ -195,6 +203,7 @@ DECLARE
 	v_rows_count		INTEGER;
 	v_max				p_start_value%TYPE;
 	v_cur_value			p_start_value%TYPE := p_start_value;
+	p_end_value			p_start_value%TYPE;
 	i					INTEGER;
 
 BEGIN
@@ -240,11 +249,18 @@ BEGIN
 	 * and specifies partition count as 0 then do not check boundaries
 	 */
 	IF p_count != 0 THEN
+		/* compute right bound of partitioning through additions */
+		p_end_value := p_start_value;
+		FOR i IN 1..p_count
+		LOOP
+			p_end_value := p_end_value + p_interval;
+		END LOOP;
+
 		/* check boundaries */
 		PERFORM @extschema@.check_boundaries(parent_relid,
 											 p_attribute,
 											 p_start_value,
-											 p_start_value + p_interval * p_count);
+											 p_end_value);
 	END IF;
 
 	/* Create sequence for child partitions names */

src/hooks.c

@@ -12,6 +12,7 @@
 #include "hooks.h"
 #include "init.h"
 #include "partition_filter.h"
+#include "pg_compat.h"
 #include "runtimeappend.h"
 #include "runtime_merge_append.h"
 #include "utils.h"
@@ -169,12 +170,12 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 		 * 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);
+		nest_path->path.rows = get_parameterized_joinrel_size_compat(root,
+																	 joinrel,
+																	 outer,
+																	 inner,
+																	 extra->sjinfo,
+																	 filtered_joinclauses);
 
 		/* Finally we can add the new NestLoop path */
 		add_path(joinrel, (Path *) nest_path);
@@ -183,7 +184,10 @@ pathman_join_pathlist_hook(PlannerInfo *root,
 
 /* Cope with simple relations */
 void
-pathman_rel_pathlist_hook(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTblEntry *rte)
+pathman_rel_pathlist_hook(PlannerInfo *root,
+						  RelOptInfo *rel,
+						  Index rti,
+						  RangeTblEntry *rte)
 {
 	const PartRelationInfo *prel;
 	RangeTblEntry		  **new_rte_array;
@@ -315,15 +319,16 @@ pathman_rel_pathlist_hook(PlannerInfo *root, RelOptInfo *rel, Index rti, RangeTb
 			IndexRange	irange = lfirst_irange(lc);
 
 			for (i = irange.ir_lower; i <= irange.ir_upper; i++)
-				append_child_relation(root, rel, rti, rte, i, children[i], wrappers);
+				append_child_relation(root, rel, rti, rte, i, children[i],
+									  wrappers);
 		}
 
 		/* Clear old path list */
 		list_free(rel->pathlist);
 
 		rel->pathlist = NIL;
 		set_append_rel_pathlist(root, rel, rti, rte, pathkeyAsc, pathkeyDesc);
-		set_append_rel_size(root, rel, rti, rte);
+		set_append_rel_size_compat(root, rel, rti, rte);
 
 		/* No need to go further (both nodes are disabled), return */
 		if (!(pg_pathman_enable_runtimeappend ||

src/init.c

@@ -38,6 +38,10 @@
 #include "utils/syscache.h"
 #include "utils/typcache.h"
 
+#if PG_VERSION_NUM >= 90600
+#include "catalog/pg_constraint_fn.h"
+#endif
+
 
 /* Help user in case of emergency */
 #define INIT_ERROR_HINT "pg_pathman will be disabled to allow you to resolve this issue"

src/nodes_common.h

@@ -17,6 +17,10 @@
 #include "commands/explain.h"
 #include "optimizer/planner.h"
 
+#if PG_VERSION_NUM >= 90600
+#include "nodes/extensible.h"
+#endif
+
 
 /*
  * Common structure for storing selected

src/partition_filter.h

@@ -18,6 +18,10 @@
 #include "commands/explain.h"
 #include "optimizer/planner.h"
 
+#if PG_VERSION_NUM >= 90600
+#include "nodes/extensible.h"
+#endif
+
 
 #define ERR_PART_ATTR_NULL		"partitioned column's value should not be NULL"
 #define ERR_PART_ATTR_NO_PART	"no suitable partition for key '%s'"

src/pg_compat.c

@@ -0,0 +1,114 @@
+/* ------------------------------------------------------------------------
+ *
+ * pg_compat.c
+ *		Compatibility tools
+ *
+ * Copyright (c) 2016, Postgres Professional
+ *
+ * ------------------------------------------------------------------------
+ */
+
+#include "pg_compat.h"
+
+#include "optimizer/pathnode.h"
+#include "port.h"
+#include "utils.h"
+
+#include <math.h>
+
+
+void
+set_append_rel_size_compat(PlannerInfo *root, RelOptInfo *rel,
+						   Index rti, RangeTblEntry *rte)
+{
+	double		parent_rows = 0;
+	double		parent_size = 0;
+	ListCell   *l;
+
+	foreach(l, root->append_rel_list)
+	{
+		AppendRelInfo  *appinfo = (AppendRelInfo *) lfirst(l);
+		Index			childRTindex,
+						parentRTindex = rti;
+		RelOptInfo	   *childrel;
+
+		/* append_rel_list contains all append rels; ignore others */
+		if (appinfo->parent_relid != parentRTindex)
+			continue;
+
+		childRTindex = appinfo->child_relid;
+
+		childrel = find_base_rel(root, childRTindex);
+		Assert(childrel->reloptkind == RELOPT_OTHER_MEMBER_REL);
+
+		/*
+		 * Accumulate size information from each live child.
+		 */
+		Assert(childrel->rows > 0);
+
+		parent_rows += childrel->rows;
+#if PG_VERSION_NUM >= 90600
+		parent_size += childrel->reltarget->width * childrel->rows;
+#else
+		parent_size += childrel->width * childrel->rows;
+#endif
+	}
+
+	rel->rows = parent_rows;
+#if PG_VERSION_NUM >= 90600
+	rel->reltarget->width = rint(parent_size / parent_rows);
+#else
+	rel->width = rint(parent_size / parent_rows);
+#endif
+	rel->tuples = parent_rows;
+}
+
+extern
+void copy_targetlist_compat(RelOptInfo *dest, RelOptInfo *rel)
+{
+	ListCell	   *lc;
+
+#if PG_VERSION_NUM >= 90600
+	dest->reltarget->exprs = NIL;
+	foreach(lc, rel->reltarget->exprs)
+#else
+	dest->reltargetlist = NIL;
+	foreach(lc, rel->reltargetlist)
+#endif
+	{
+		Node *new_target;
+		Node *node;
+
+		node = (Node *) lfirst(lc);
+		new_target = copyObject(node);
+		change_varnos(new_target, rel->relid, dest->relid);
+#if PG_VERSION_NUM >= 90600
+		dest->reltarget->exprs = lappend(dest->reltarget->exprs, new_target);
+#else
+		dest->reltargetlist = lappend(dest->reltargetlist, new_target);
+#endif
+	}
+}
+
+#if PG_VERSION_NUM >= 90600
+/*
+ * make_result
+ *	  Build a Result plan node
+ */
+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;
+}
+#endif

src/pg_compat.h

@@ -0,0 +1,74 @@
+/* ------------------------------------------------------------------------
+ *
+ * pg_compat.h
+ *		Compatibility tools
+ *
+ * Copyright (c) 2016, Postgres Professional
+ *
+ * ------------------------------------------------------------------------
+ */
+
+#ifndef PG_COMPAT_H
+#define PG_COMPAT_H
+
+#include "postgres.h"
+
+#include "nodes/relation.h"
+#include "nodes/pg_list.h"
+#include "optimizer/cost.h"
+#include "optimizer/paths.h"
+
+
+extern void set_append_rel_size_compat(PlannerInfo *root, RelOptInfo *rel,
+									   Index rti, RangeTblEntry *rte);
+extern void copy_targetlist_compat(RelOptInfo *dest, RelOptInfo *rel);
+
+#if PG_VERSION_NUM >= 90600
+
+#define get_parameterized_joinrel_size_compat(root, rel, outer_path, \
+											  inner_path, sjinfo, \
+											  restrict_clauses) \
+		get_parameterized_joinrel_size(root, rel, outer_path, \
+									   inner_path, sjinfo, \
+									   restrict_clauses)
+
+#define check_index_predicates_compat(rool, rel) \
+		check_index_predicates(root, rel)
+
+#define create_append_path_compat(rel, subpaths, required_outer, parallel_workers) \
+		create_append_path(rel, subpaths, required_outer, parallel_workers)
+
+#define pull_var_clause_compat(node, aggbehavior, phbehavior) \
+		pull_var_clause(node, aggbehavior | phbehavior)
+
+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, \
+											  sjinfo, restrict_clauses) \
+		get_parameterized_joinrel_size(root, rel, \
+									   (outer_path)->rows, \
+									   (inner_path)->rows, \
+									   sjinfo, restrict_clauses)
+
+#define check_index_predicates_compat(rool, rel) \
+		check_partial_indexes(root, rel)
+
+#define create_append_path_compat(rel, subpaths, required_outer, parallel_workers) \
+		create_append_path(rel, subpaths, required_outer)
+
+#define pull_var_clause_compat(node, aggbehavior, phbehavior) \
+		pull_var_clause(node, aggbehavior, phbehavior)
+
+#define make_result_compat(root, tlist, resconstantqual, subplan) \
+		make_result(root, tlist, resconstantqual, subplan)
+
+#endif
+
+
+#endif /* PG_COMPAT_H */