clean pg_compat.c & pg_compat.h, add PostgreSQL 9.6 to Travis CI

funbringer · funbringer · commit e678c3e9e9b1 · 2016-09-23T19:40:29.000+03:00
diff --git a/.travis.yml b/.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
 
diff --git a/src/init.c b/src/init.c
@@ -22,7 +22,6 @@
 #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"
@@ -38,6 +37,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"
diff --git a/src/nodes_common.h b/src/nodes_common.h
@@ -16,7 +16,10 @@
 #include "postgres.h"
 #include "commands/explain.h"
 #include "optimizer/planner.h"
+
+#if PG_VERSION_NUM >= 90600
 #include "nodes/extensible.h"
+#endif
 
 
 /*
diff --git a/src/partition_filter.h b/src/partition_filter.h
@@ -17,7 +17,11 @@
 #include "postgres.h"
 #include "commands/explain.h"
 #include "optimizer/planner.h"
+
+#if PG_VERSION_NUM >= 90600
 #include "nodes/extensible.h"
+#endif
+
 
 typedef struct
 {
diff --git a/src/pg_compat.c b/src/pg_compat.c
@@ -1,3 +1,13 @@
+/* ------------------------------------------------------------------------
+ *
+ * pg_compat.c
+ *		Compatibility tools
+ *
+ * Copyright (c) 2016, Postgres Professional
+ *
+ * ------------------------------------------------------------------------
+ */
+
 #include "pg_compat.h"
 
 #include "optimizer/pathnode.h"
@@ -6,23 +16,6 @@
 
 #include <math.h>
 
-/*
-double
-get_parameterized_joinrel_size_compat(PlannerInfo *root, RelOptInfo *rel,
-									  Path *outer_path, Path *inner_path,
-									  SpecialJoinInfo *sjinfo,
-									  List *restrict_clauses)
-{
-#if PG_VERSION_NUM >= 90600
-	return get_parameterized_joinrel_size(root, rel, outer_path, inner_path,
-										  sjinfo, restrict_clauses);
-#else
-	return get_parameterized_joinrel_size(root, rel, outer_path->rows,
-										  inner_path->rows, sjinfo,
-#endif
-										  restrict_clauses);
-}
-*/
 
 void
 set_append_rel_size_compat(PlannerInfo *root, RelOptInfo *rel,
diff --git a/src/pg_compat.h b/src/pg_compat.h
@@ -1,3 +1,13 @@
+/* ------------------------------------------------------------------------
+ *
+ * pg_compat.h
+ *		Compatibility tools
+ *
+ * Copyright (c) 2016, Postgres Professional
+ *
+ * ------------------------------------------------------------------------
+ */
+
 #ifndef PG_COMPAT_H
 #define PG_COMPAT_H
 
@@ -8,38 +18,24 @@
 #include "optimizer/cost.h"
 #include "optimizer/paths.h"
 
-/*
-extern double get_parameterized_joinrel_size_compat(PlannerInfo *root,
-													RelOptInfo *rel,
-													Path *outer_path,
-													Path *inner_path,
-													SpecialJoinInfo *sjinfo,
-													List *restrict_clauses);
-*/
+
 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, \
+#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, \
+		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) \
+#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) \
@@ -49,26 +45,21 @@ extern Result *make_result(List *tlist, Node *resconstantqual, Plan *subplan);
 #define make_result_compat(root, tlist, resconstantqual, subplan) \
 		make_result(tlist, resconstantqual, subplan)
 
-#else
+#else /* PG_VERSION_NUM >= 90500 */
 
-#define get_parameterized_joinrel_size_compat(root, \
-											  rel, \
+#define get_parameterized_joinrel_size_compat(root, rel, \
 											  outer_path, \
 											  inner_path, \
-											  sjinfo, \
-											  restrict_clauses) \
-		get_parameterized_joinrel_size(root, \
-									   rel, \
+											  sjinfo, restrict_clauses) \
+		get_parameterized_joinrel_size(root, rel, \
 									   (outer_path)->rows, \
 									   (inner_path)->rows, \
-									   sjinfo, \
-									   restrict_clauses)
+									   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) \
+#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) \
@@ -79,4 +70,5 @@ extern Result *make_result(List *tlist, Node *resconstantqual, Plan *subplan);
 
 #endif
 
-#endif
+
+#endif /* PG_COMPAT_H */
