remove useless includes, raise warning if PostgreSQL <= 9.5.4

funbringer · funbringer · commit 4efb205d1876 · 2016-08-23T14:24:36.000+03:00
diff --git a/src/hooks.c b/src/hooks.c
@@ -12,12 +12,13 @@
 #include "init.h"
 #include "runtimeappend.h"
 #include "runtime_merge_append.h"
+#include "partition_filter.h"
 #include "utils.h"
 
 #include "miscadmin.h"
 #include "optimizer/cost.h"
 #include "optimizer/restrictinfo.h"
-#include "partition_filter.h"
+#include "utils/typcache.h"
 
 
 set_join_pathlist_hook_type		set_join_pathlist_next = NULL;
diff --git a/src/init.c b/src/init.c
@@ -20,10 +20,10 @@
 #include "access/htup_details.h"
 #include "access/sysattr.h"
 #include "catalog/indexing.h"
+#include "catalog/pg_constraint.h"
+#include "catalog/pg_inherits.h"
 #include "catalog/pg_inherits_fn.h"
 #include "catalog/pg_type.h"
-#include "catalog/pg_inherits.h"
-#include "catalog/pg_constraint.h"
 #include "executor/spi.h"
 #include "miscadmin.h"
 #include "optimizer/clauses.h"
diff --git a/src/pathman.h b/src/pathman.h
@@ -11,15 +11,11 @@
 #ifndef PATHMAN_H
 #define PATHMAN_H
 
-#include "dsm_array.h"
 #include "init.h"
 #include "relation_info.h"
 #include "rangeset.h"
 
 #include "postgres.h"
-#include "utils/date.h"
-#include "utils/snapshot.h"
-#include "utils/typcache.h"
 #include "nodes/makefuncs.h"
 #include "nodes/primnodes.h"
 #include "nodes/execnodes.h"
@@ -28,16 +24,18 @@
 
 
 /* Check PostgreSQL version (9.5.4 contains an important fix for BGW) */
-#if PG_VERSION_NUM < 90504
-	#error "Cannot build pg_pathman with PostgreSQL version lower than 9.5.4"
+#if PG_VERSION_NUM < 90503
+	#error "Cannot build pg_pathman with PostgreSQL version lower than 9.5.3"
+#elif PG_VERSION_NUM < 90504
+	#warning "It is STRONGLY recommended to use pg_pathman with PostgreSQL 9.5.4 since it contains important fixes"
 #endif
 
 /* Get CString representation of Datum (simple wrapper) */
 #ifdef USE_ASSERT_CHECKING
-#include "utils.h"
-#define DebugPrintDatum(datum, typid) ( datum_to_cstring((datum), (typid)) )
+	#include "utils.h"
+	#define DebugPrintDatum(datum, typid) ( datum_to_cstring((datum), (typid)) )
 #else
-#define DebugPrintDatum(datum, typid) ( "[use --enable-cassert]" )
+	#define DebugPrintDatum(datum, typid) ( "[use --enable-cassert]" )
 #endif
 
 
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -41,6 +41,7 @@
 #include "utils/syscache.h"
 #include "utils/selfuncs.h"
 #include "utils/snapmgr.h"
+#include "utils/typcache.h"
 
 
 PG_MODULE_MAGIC;
diff --git a/src/relation_info.c b/src/relation_info.c
@@ -24,6 +24,7 @@
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/snapmgr.h"
+#include "utils/typcache.h"
 
 
 /*
diff --git a/src/utils.c b/src/utils.c
@@ -15,24 +15,18 @@
 #include "access/sysattr.h"
 #include "access/xact.h"
 #include "catalog/heap.h"
-#include "catalog/namespace.h"
 #include "catalog/pg_type.h"
 #include "catalog/pg_extension.h"
 #include "commands/extension.h"
-#include "executor/spi.h"
-#include "fmgr.h"
 #include "miscadmin.h"
-#include "nodes/nodeFuncs.h"
-#include "nodes/makefuncs.h"
 #include "optimizer/var.h"
 #include "optimizer/restrictinfo.h"
 #include "parser/parse_oper.h"
-#include "rewrite/rewriteManip.h"
 #include "utils/builtins.h"
-#include "utils/memutils.h"
+#include "utils/fmgroids.h"
 #include "utils/lsyscache.h"
 #include "utils/syscache.h"
-#include "utils/fmgroids.h"
+#include "utils/typcache.h"
 
 
 #define TABLEOID_STR(subst) ( "pathman_tableoid" subst )
