Remove unnecessary includes.

src/backend/gpopt/relcache/CMDProviderRelcache.cpp

@@ -19,8 +19,6 @@
 #include "gpopt/translate/CTranslatorRelcacheToDXL.h"
 #include "gpopt/mdcache/CMDAccessor.h"
 
-#include "gpos/io/COstreamString.h"
-
 #include "naucrates/dxl/CDXLUtils.h"
 
 #include "naucrates/exception.h"

src/backend/gpopt/translate/CContextDXLToPlStmt.cpp

@@ -17,7 +17,7 @@
 //---------------------------------------------------------------------------
 
 #include "postgres.h"
-#include "nodes/makefuncs.h"
+#include "nodes/parsenodes.h"
 #include "nodes/plannodes.h"
 
 #include "gpopt/translate/CContextDXLToPlStmt.h"

src/backend/gpopt/utils/CConstExprEvaluatorProxy.cpp

@@ -15,11 +15,8 @@
 //---------------------------------------------------------------------------
 
 #include "postgres.h"
-#include "executor/executor.h"
-#include "nodes/nodes.h"
 
-#include "gpos/error/CAutoTrace.h"
-#include "gpos/memory/IMemoryPool.h"
+#include "executor/executor.h"
 
 #include "gpopt/utils/CConstExprEvaluatorProxy.h"
 
@@ -29,11 +26,6 @@
 #include "naucrates/exception.h"
 #include "naucrates/dxl/operators/CDXLNode.h"
 
-#include "naucrates/md/CMDIdGPDB.h"
-#include "naucrates/md/IMDType.h"
-
-#include "utils/guc.h"
-
 using namespace gpdxl;
 using namespace gpmd;
 using namespace gpos;

src/backend/gpopt/utils/COptTasks.cpp

@@ -37,14 +37,9 @@
 
 #include "gpos/_api.h"
 #include "gpos/common/CAutoP.h"
-#include "gpos/error/CErrorHandlerStandard.h"
-#include "gpos/error/CLoggerStream.h"
 #include "gpos/io/COstreamFile.h"
 #include "gpos/io/COstreamString.h"
 #include "gpos/memory/CAutoMemoryPool.h"
-#include "gpos/task/CWorkerPoolManager.h"
-#include "gpos/task/CAutoTaskProxy.h"
-#include "gpos/task/CTaskContext.h"
 #include "gpos/task/CAutoTraceFlag.h"
 #include "gpos/common/CAutoP.h"
 
@@ -52,22 +47,14 @@
 #include "gpopt/translate/CTranslatorExprToDXL.h"
 
 #include "gpopt/base/CAutoOptCtxt.h"
-#include "gpopt/base/CQueryContext.h"
-#include "gpopt/engine/CEngine.h"
 #include "gpopt/engine/CEnumeratorConfig.h"
 #include "gpopt/engine/CStatisticsConfig.h"
 #include "gpopt/engine/CCTEConfig.h"
 #include "gpopt/mdcache/CAutoMDAccessor.h"
 #include "gpopt/mdcache/CMDCache.h"
-#include "gpopt/minidump/CMiniDumperDXL.h"
 #include "gpopt/minidump/CMinidumperUtils.h"
-#include "gpopt/minidump/CSerializableStackTrace.h"
-#include "gpopt/minidump/CSerializableQuery.h"
-#include "gpopt/minidump/CSerializablePlan.h"
-#include "gpopt/minidump/CSerializableMDAccessor.h"
 #include "gpopt/optimizer/COptimizer.h"
 #include "gpopt/optimizer/COptimizerConfig.h"
-#include "gpopt/search/CSearchStage.h"
 #include "gpopt/xforms/CXformFactory.h"
 #include "gpopt/exception.h"
 
@@ -77,17 +64,12 @@
 #include "naucrates/base/CQueryToDXLResult.h"
 
 #include "naucrates/md/IMDId.h"
-#include "naucrates/md/CMDRelationGPDB.h"
 #include "naucrates/md/CMDIdRelStats.h"
-#include "naucrates/md/CMDIdColStats.h"
 
 #include "naucrates/md/CSystemId.h"
 #include "naucrates/md/IMDRelStats.h"
-#include "naucrates/md/IMDColStats.h"
-#include "naucrates/md/IMDTypeInt8.h"
 #include "naucrates/md/CMDIdCast.h"
 #include "naucrates/md/CMDIdScCmp.h"
-#include "naucrates/md/CMDTypeInt8GPDB.h"
 
 #include "naucrates/dxl/operators/CDXLNode.h"
 #include "naucrates/dxl/parser/CParseHandlerDXL.h"

src/backend/gpopt/utils/funcs.cpp

@@ -15,9 +15,13 @@
 
 #include <sys/stat.h>
 
-#include "gpopt/utils/CCatalogUtils.h"
+extern "C" {
+#include "postgres.h"
+#include "fmgr.h"
+#include "utils/builtins.h"
+}
+
 #include "gpopt/utils/COptTasks.h"
-#include "utils/guc.h"
 
 #include "gpos/_api.h"
 #include "gpopt/gpdbwrappers.h"

src/include/gpopt/gpdbwrappers.h

@@ -51,6 +51,9 @@ struct GpPolicy;
 struct PartitionSelector;
 struct SelectedParts;
 struct Motion;
+struct Var;
+struct Const;
+struct ArrayExpr;
 
 namespace gpdb {
 

src/include/gpopt/relcache/CMDProviderRelcache.h

@@ -23,7 +23,6 @@
 
 #include "naucrates/md/CSystemId.h"
 #include "naucrates/md/IMDId.h"
-#include "naucrates/md/IMDCacheObject.h"
 #include "naucrates/md/IMDProvider.h"
 
 // fwd decl

src/include/gpopt/translate/CCTEListEntry.h

@@ -17,9 +17,7 @@
 #define GPDXL_CCTEListEntry_H
 
 #include "gpos/base.h"
-#include "gpos/common/CDynamicPtrArray.h"
 #include "gpos/common/CHashMap.h"
-#include "gpos/string/CWStringBase.h"
 
 #include "naucrates/dxl/operators/CDXLNode.h"
 

src/include/gpopt/translate/CMappingElementColIdParamId.h

@@ -18,7 +18,6 @@
 
 #include "gpos/base.h"
 
-#include "naucrates/dxl/operators/CDXLNode.h"
 #include "naucrates/md/IMDId.h"
 
 namespace gpdxl

src/include/gpopt/translate/CMappingVarColId.h

@@ -26,7 +26,6 @@
 #include "gpos/common/CHashMap.h"
 #include "gpos/common/CHashMapIter.h"
 
-#include "naucrates/dxl/operators/dxlops.h"
 #include "naucrates/dxl/operators/dxlops.h"
 #include "naucrates/dxl/CIdGenerator.h"
 

src/include/gpopt/translate/COptColInfo.h

@@ -18,7 +18,6 @@
 
 #include "gpos/base.h"
 #include "gpos/common/CRefCount.h"
-#include "gpos/string/CWStringConst.h"
 #include "gpos/utils.h"
 
 namespace gpdxl

src/include/gpopt/translate/CQueryMutators.h

@@ -17,8 +17,6 @@
 #ifndef GPDXL_CWalkerUtils_H
 #define GPDXL_CWalkerUtils_H
 
-#define GPDXL_QUERY_ID_START 0
-
 #include "gpopt/translate/CMappingVarColId.h"
 #include "gpopt/translate/CTranslatorScalarToDXL.h"
 #include "gpopt/translate/CTranslatorUtils.h"

src/include/gpopt/translate/CTranslatorQueryToDXL.h

@@ -17,19 +17,16 @@
 #ifndef GPDXL_CTranslatorQueryToDXL_H
 #define GPDXL_CTranslatorQueryToDXL_H
 
-#define GPDXL_QUERY_ID_START 0
 #define GPDXL_CTE_ID_START 1
 #define GPDXL_COL_ID_START 1
 
 #include "gpopt/translate/CMappingVarColId.h"
 #include "gpopt/translate/CTranslatorScalarToDXL.h"
 #include "gpopt/translate/CTranslatorUtils.h"
-#include "gpopt/translate/CCTEListEntry.h"
 
 #include "gpos/base.h"
 
 #include "naucrates/dxl/operators/CDXLNode.h"
-#include "naucrates/md/IMDType.h"
 
 // fwd declarations
 namespace gpopt

src/include/gpopt/translate/CTranslatorScalarToDXL.h

@@ -24,7 +24,6 @@
 #include "gpopt/translate/CMappingVarColId.h"
 #include "gpopt/translate/CCTEListEntry.h"
 
-#include "naucrates/dxl/operators/CDXLScalarBoolExpr.h"
 #include "naucrates/dxl/CIdGenerator.h"
 
 #include "naucrates/base/IDatum.h"

src/include/gpopt/utils/COptTasks.h

@@ -46,6 +46,7 @@ namespace gpopt
 struct PlannedStmt;
 struct Query;
 struct List;
+struct MemoryContextData;
 
 using namespace gpos;
 using namespace gpdxl;
@@ -101,7 +102,7 @@ struct SOptContext
 	void Free(EPin epinInput, EPin epinOutput);
 
 	// Clone the error message in given context.
-	CHAR* CloneErrorMsg(MemoryContext context);
+	CHAR* CloneErrorMsg(struct MemoryContextData *context);
 
 	// casting function
 	static