From 9aa7a22f190fdbcacbcf5d71089b056eb06c54b4 Mon Sep 17 00:00:00 2001
From: Heikki Linnakangas <hlinnakangas@pivotal.io>
Date: Thu, 11 Feb 2016 11:20:17 +0200
Subject: [PATCH] Remove unnecessary #includes.

In cdbcat.h, include only the header files that are actually needed for
the single function prototype in that file. And don't include cdbcat.h
unnecessarily. A couple of .c files were including cdbcat.h to get
GpPolicy, but that's actually defined in catalog/gp_policy.h, so #include
that directly instead where needed.
---
 src/backend/cdb/cdbllize.c         | 1 -
 src/backend/cdb/cdbpathlocus.c     | 2 +-
 src/backend/cdb/cdbutil.c          | 1 -
 src/backend/commands/dbcommands.c  | 1 -
 src/backend/commands/schemacmds.c  | 1 -
 src/backend/commands/sequence.c    | 1 -
 src/backend/commands/tablecmds.c   | 1 -
 src/backend/commands/user.c        | 1 -
 src/backend/executor/execMain.c    | 1 -
 src/backend/utils/cache/relcache.c | 2 +-
 src/include/cdb/cdbcat.h           | 6 ++----
 11 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/src/backend/cdb/cdbllize.c b/src/backend/cdb/cdbllize.c
index 67b31e7afe..9ec054e9cf 100644
--- a/src/backend/cdb/cdbllize.c
+++ b/src/backend/cdb/cdbllize.c
@@ -35,7 +35,6 @@
 #include "cdb/cdbplan.h"
 #include "cdb/cdbpullup.h"
 #include "cdb/cdbllize.h"
-#include "cdb/cdbcat.h"
 #include "cdb/cdbmutate.h"
 #include "optimizer/tlist.h"
 
diff --git a/src/backend/cdb/cdbpathlocus.c b/src/backend/cdb/cdbpathlocus.c
index 6a8d3069b1..b3e9d7e033 100644
--- a/src/backend/cdb/cdbpathlocus.c
+++ b/src/backend/cdb/cdbpathlocus.c
@@ -12,7 +12,7 @@
 extern "C" {
 #endif
 
-#include "cdb/cdbcat.h"         /* GpPolicy */
+#include "catalog/gp_policy.h"         /* GpPolicy */
 #include "cdb/cdbdef.h"         /* CdbSwap() */
 #include "cdb/cdbpullup.h"      /* cdbpullup_missing_var_walker() */
 #include "nodes/makefuncs.h"    /* makeVar() */
diff --git a/src/backend/cdb/cdbutil.c b/src/backend/cdb/cdbutil.c
index 28414129de..b086e5fd00 100644
--- a/src/backend/cdb/cdbutil.c
+++ b/src/backend/cdb/cdbutil.c
@@ -29,7 +29,6 @@
 #include "utils/memutils.h"
 #include "catalog/gp_configuration.h"
 #include "catalog/gp_segment_config.h"
-#include "cdb/cdbcat.h"
 #include "cdb/cdbutil.h"
 #include "nodes/execnodes.h"	/* Slice, SliceTable */
 #include "cdb/cdbmotion.h"
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index 245092d51f..cbd8fd4e53 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -66,7 +66,6 @@
 #include "cdb/cdbsreh.h"
 #include "cdb/cdbsrlz.h"
 #include "cdb/cdbvars.h"
-#include "cdb/cdbcat.h"
 #include "cdb/cdbpersistentdatabase.h"
 #include "cdb/cdbpersistentrelation.h"
 #include "cdb/cdbmirroredfilesysobj.h"
diff --git a/src/backend/commands/schemacmds.c b/src/backend/commands/schemacmds.c
index fb1d2be77a..d0e5747e7d 100644
--- a/src/backend/commands/schemacmds.c
+++ b/src/backend/commands/schemacmds.c
@@ -36,7 +36,6 @@
 #include "cdb/cdbdisp.h"
 #include "cdb/cdbsrlz.h"
 #include "cdb/cdbvars.h"
-#include "cdb/cdbcat.h"
 
 static void AlterSchemaOwner_internal(cqContext  *pcqCtx, 
 									  HeapTuple tup, Relation rel, Oid newOwnerId);
diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c
index 843a4a8068..fefe7003c0 100644
--- a/src/backend/commands/sequence.c
+++ b/src/backend/commands/sequence.c
@@ -39,7 +39,6 @@
 #include "cdb/cdbdisp.h"
 #include "cdb/cdbsrlz.h"
 #include "cdb/cdbvars.h"
-#include "cdb/cdbcat.h"
 #include "cdb/cdbmotion.h"
 #include "cdb/ml_ipc.h"
 
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index d323cc4f56..544cf3f54c 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -110,7 +110,6 @@
 #include "cdb/cdbdisp.h"
 #include "cdb/cdbsrlz.h"
 #include "cdb/cdbvars.h"
-#include "cdb/cdbcat.h"
 #include "cdb/cdbrelsize.h"
 #include "cdb/cdboidsync.h"
 #include "cdb/cdbsreh.h"
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index 5f38970ec3..874015c139 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -45,7 +45,6 @@
 #include "cdb/cdbdisp.h"
 #include "cdb/cdbsrlz.h"
 #include "cdb/cdbvars.h"
-#include "cdb/cdbcat.h"
 
 
 typedef struct genericPair
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 2b54e45e7c..46b6d458d1 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -82,7 +82,6 @@
 
 #include "cdb/cdbappendonlyam.h"
 #include "cdb/cdbaocsam.h"
-#include "cdb/cdbcat.h"
 #include "cdb/cdbdisp.h"
 #include "cdb/cdbdispatchresult.h"
 #include "cdb/cdbexplain.h"             /* cdbexplain_sendExecStats() */
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index a7d60733a3..a6215a0485 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -73,7 +73,7 @@
 #include "utils/syscache.h"
 #include "utils/typcache.h"
 
-#include "cdb/cdbcat.h"         /* GpPolicy */
+#include "catalog/gp_policy.h"         /* GpPolicy */
 #include "cdb/cdbtm.h"
 #include "cdb/cdbvars.h"        /* Gp_role */
 #include "cdb/cdbmirroredflatfile.h"
diff --git a/src/include/cdb/cdbcat.h b/src/include/cdb/cdbcat.h
index c9be55e291..826e8c8d37 100644
--- a/src/include/cdb/cdbcat.h
+++ b/src/include/cdb/cdbcat.h
@@ -11,10 +11,8 @@
 #ifndef CDBCAT_H
 #define CDBCAT_H
 
-#include "access/genam.h"
-#include "access/heapam.h"
-#include "catalog/gp_id.h"
-#include "catalog/gp_policy.h"
+#include "access/attnum.h"
+#include "utils/relcache.h"
 
 extern void checkPolicyForUniqueIndex(Relation rel, AttrNumber *indattr,
 									  int nidxatts, bool isprimary, 
-- 
GitLab