remove redundant includes

funbringer · funbringer · commit 9d8590c090f0 · 2016-06-01T17:04:16.000+03:00
diff --git a/src/dsm_array.c b/src/dsm_array.c
@@ -12,8 +12,6 @@
 #include "pathman.h"
 #include "storage/shmem.h"
 #include "storage/dsm.h"
-#include "storage/lwlock.h"
-#include <stdint.h>
 
 
 static dsm_segment *segment = NULL;
@@ -95,7 +93,7 @@ init_dsm_segment(size_t blocks_count, size_t block_size)
 		ret = false;
 		segment = dsm_attach(dsm_cfg->segment_handle);
 	}
-	
+
 	/*
 	 * If segment hasn't been created yet or has already been destroyed
 	 * (it happens when last session detaches segment) then create new one
diff --git a/src/hooks.c b/src/hooks.c
@@ -10,7 +10,6 @@
 #include "postgres.h"
 #include "optimizer/cost.h"
 #include "optimizer/restrictinfo.h"
-#include "utils/guc.h"
 #include "pathman.h"
 #include "hooks.h"
 #include "partition_filter.h"
diff --git a/src/init.c b/src/init.c
@@ -11,15 +11,12 @@
 #include "miscadmin.h"
 #include "executor/spi.h"
 #include "catalog/pg_type.h"
-#include "catalog/pg_class.h"
 #include "catalog/pg_constraint.h"
-#include "catalog/pg_operator.h"
 #include "access/htup_details.h"
 #include "utils/syscache.h"
 #include "utils/builtins.h"
 #include "utils/typcache.h"
 #include "utils/lsyscache.h"
-#include "utils/bytea.h"
 #include "utils/snapmgr.h"
 #include "optimizer/clauses.h"
 
diff --git a/src/nodes_common.c b/src/nodes_common.c
@@ -8,7 +8,6 @@
  * ------------------------------------------------------------------------
  */
 #include "postgres.h"
-#include "optimizer/paths.h"
 #include "nodes_common.h"
 #include "runtimeappend.h"
 #include "optimizer/restrictinfo.h"
diff --git a/src/partition_filter.c b/src/partition_filter.c
@@ -1,7 +1,6 @@
 #include "partition_filter.h"
 #include "utils.h"
 #include "utils/guc.h"
-#include "utils/lsyscache.h"
 #include "nodes/nodeFuncs.h"
 
 
diff --git a/src/partition_filter.h b/src/partition_filter.h
@@ -2,8 +2,6 @@
 #define RUNTIME_INSERT_H
 
 #include "postgres.h"
-#include "optimizer/paths.h"
-#include "optimizer/pathnode.h"
 
 #include "pathman.h"
 #include "nodes_common.h"
diff --git a/src/pathman.h b/src/pathman.h
@@ -180,6 +180,12 @@ alloc_irange(IndexRange irange)
 #define llast_irange(list)				( lfirst_irange(list_tail(list)) )
 #define linitial_irange(list)			( lfirst_irange(list_head(list)) )
 
+
+extern HTAB	   *relations;
+extern HTAB	   *range_restrictions;
+extern bool		initialization_needed;
+
+
 /* rangeset.c */
 bool irange_intersects(IndexRange a, IndexRange b);
 bool irange_conjuncted(IndexRange a, IndexRange b);
@@ -202,10 +208,6 @@ void *dsm_array_get_pointer(const DsmArray* arr);
 dsm_handle get_dsm_array_segment(void);
 void attach_dsm_array_segment(void);
 
-HTAB *relations;
-HTAB *range_restrictions;
-bool initialization_needed;
-
 /* initialization functions */
 Size pathman_memsize(void);
 void init_shmem_config(void);
diff --git a/src/pg_pathman.c b/src/pg_pathman.c
@@ -25,18 +25,15 @@
 #include "optimizer/cost.h"
 #include "parser/analyze.h"
 #include "utils/hsearch.h"
-#include "utils/tqual.h"
 #include "utils/rel.h"
 #include "utils/elog.h"
 #include "utils/array.h"
-#include "utils/date.h"
 #include "utils/guc.h"
 #include "utils/lsyscache.h"
 #include "utils/selfuncs.h"
 #include "access/heapam.h"
 #include "access/nbtree.h"
 #include "storage/ipc.h"
-#include "catalog/pg_operator.h"
 #include "catalog/pg_type.h"
 #include "foreign/fdwapi.h"
 #include "hooks.h"
@@ -47,16 +44,19 @@
 
 PG_MODULE_MAGIC;
 
+
 typedef struct
 {
 	Oid old_varno;
 	Oid new_varno;
 } change_varno_context;
 
+
 bool			inheritance_disabled;
 bool			pg_pathman_enable;
 PathmanState   *pmstate;
 
+
 /* pg module functions */
 void _PG_init(void);
 
diff --git a/src/pl_funcs.c b/src/pl_funcs.c
@@ -8,15 +8,10 @@
  * ------------------------------------------------------------------------
  */
 #include "pathman.h"
+#include "access/nbtree.h"
 #include "utils/lsyscache.h"
 #include "utils/typcache.h"
 #include "utils/array.h"
-#include "utils/snapmgr.h"
-#include "access/nbtree.h"
-#include "access/xact.h"
-#include "catalog/pg_type.h"
-#include "executor/spi.h"
-#include "storage/lmgr.h"
 #include "utils.h"
 
 
diff --git a/src/runtime_merge_append.c b/src/runtime_merge_append.c
@@ -12,9 +12,7 @@
 
 #include "pathman.h"
 
-#include "optimizer/clauses.h"
 #include "optimizer/cost.h"
-#include "optimizer/restrictinfo.h"
 #include "optimizer/planmain.h"
 #include "optimizer/tlist.h"
 #include "optimizer/var.h"
diff --git a/src/utils.c b/src/utils.c
@@ -14,11 +14,8 @@
 #include "nodes/makefuncs.h"
 #include "optimizer/var.h"
 #include "optimizer/restrictinfo.h"
-#include "parser/parse_param.h"
-#include "utils/builtins.h"
 #include "utils/snapmgr.h"
 #include "utils/lsyscache.h"
-#include "rewrite/rewriteManip.h"
 #include "catalog/heap.h"
 
 
