From 2386471e54afc3de310683464cf958a8d5e9570a Mon Sep 17 00:00:00 2001 From: Venkatesh Raghavan Date: Fri, 20 Nov 2015 17:20:06 -0800 Subject: [PATCH] HAWQ-148. Restructuring optimizer directory --- src/backend/gpopt/CGPOptimizer.cpp | 2 +- src/backend/gpopt/gpdbwrappers.cpp | 2 +- .../gpopt/relcache/CMDProviderRelcache.cpp | 4 +- .../translate/CMappingColIdVarPlStmt.cpp | 9 ++- .../gpopt/translate/CMappingColIdVarQuery.cpp | 2 +- .../gpopt/translate/CMappingVarColId.cpp | 6 +- .../gpopt/translate/CQueryMutators.cpp | 6 +- .../translate/CTranslatorDXLToPlStmt.cpp | 22 +++---- .../gpopt/translate/CTranslatorDXLToQuery.cpp | 7 +-- .../translate/CTranslatorDXLToScalar.cpp | 26 ++++---- .../translate/CTranslatorPlStmtToDXL.cpp | 16 ++--- .../gpopt/translate/CTranslatorQueryToDXL.cpp | 29 +++++---- .../translate/CTranslatorRelcacheToDXL.cpp | 41 ++++++------ .../translate/CTranslatorScalarToDXL.cpp | 24 +++---- .../gpopt/translate/CTranslatorUtils.cpp | 63 +++++++++---------- .../gpopt/utils/CConstExprEvaluatorProxy.cpp | 11 ++-- src/backend/gpopt/utils/COptTasks.cpp | 52 +++++++-------- .../gpopt/config/CConfigParamMapping.h | 2 +- .../gpopt/relcache/CMDProviderRelcache.h | 9 ++- src/include/gpopt/translate/CCTEListEntry.h | 2 +- .../gpopt/translate/CContextDXLToPlStmt.h | 7 +-- .../translate/CDXLTranslateContextBaseTable.h | 4 +- src/include/gpopt/translate/CGPDBAttInfo.h | 2 +- .../translate/CMappingElementColIdParamId.h | 5 +- .../gpopt/translate/CMappingElementColIdTE.h | 2 +- .../gpopt/translate/CMappingParamIdScalarId.h | 2 +- .../gpopt/translate/CMappingVarColId.h | 7 +-- src/include/gpopt/translate/CQueryMutators.h | 6 +- .../gpopt/translate/CStateDXLToQuery.h | 4 +- .../gpopt/translate/CTranslatorDXLToPlStmt.h | 8 +-- .../gpopt/translate/CTranslatorDXLToQuery.h | 4 +- .../gpopt/translate/CTranslatorDXLToScalar.h | 7 ++- .../gpopt/translate/CTranslatorPlStmtToDXL.h | 6 +- .../gpopt/translate/CTranslatorQueryToDXL.h | 5 +- .../translate/CTranslatorRelcacheToDXL.h | 37 +++++------ .../gpopt/translate/CTranslatorScalarToDXL.h | 10 +-- .../gpopt/translate/CTranslatorUtils.h | 14 ++--- src/include/gpopt/utils/COptClient.h | 2 +- src/include/gpopt/utils/COptServer.h | 2 +- 39 files changed, 233 insertions(+), 236 deletions(-) diff --git a/src/backend/gpopt/CGPOptimizer.cpp b/src/backend/gpopt/CGPOptimizer.cpp index 8f628f905a..a126986597 100644 --- a/src/backend/gpopt/CGPOptimizer.cpp +++ b/src/backend/gpopt/CGPOptimizer.cpp @@ -21,7 +21,7 @@ #include "gpopt/utils/COptTasks.h" // the following headers are needed to reference optimizer library initializers -#include "init.h" +#include "naucrates/init.h" #include "gpopt/init.h" #include "gpos/_api.h" diff --git a/src/backend/gpopt/gpdbwrappers.cpp b/src/backend/gpopt/gpdbwrappers.cpp index 1f6a549562..b791ef65fc 100644 --- a/src/backend/gpopt/gpdbwrappers.cpp +++ b/src/backend/gpopt/gpdbwrappers.cpp @@ -212,7 +212,7 @@ #include "gpos/error/CException.h" #include "gpos/error/CAutoExceptionStack.h" -#include "exception.h" +#include "naucrates/exception.h" #include "gpopt/gpdbwrappers.h" diff --git a/src/backend/gpopt/relcache/CMDProviderRelcache.cpp b/src/backend/gpopt/relcache/CMDProviderRelcache.cpp index 2cf97fa87a..561e5ca738 100644 --- a/src/backend/gpopt/relcache/CMDProviderRelcache.cpp +++ b/src/backend/gpopt/relcache/CMDProviderRelcache.cpp @@ -24,9 +24,9 @@ #include "gpos/io/COstreamString.h" -#include "dxl/CDXLUtils.h" +#include "naucrates/dxl/CDXLUtils.h" -#include "exception.h" +#include "naucrates/exception.h" using namespace gpos; using namespace gpdxl; diff --git a/src/backend/gpopt/translate/CMappingColIdVarPlStmt.cpp b/src/backend/gpopt/translate/CMappingColIdVarPlStmt.cpp index 941b80ee67..093084917d 100644 --- a/src/backend/gpopt/translate/CMappingColIdVarPlStmt.cpp +++ b/src/backend/gpopt/translate/CMappingColIdVarPlStmt.cpp @@ -23,15 +23,14 @@ #include "gpopt/translate/CMappingColIdVarPlStmt.h" #include "gpopt/translate/CDXLTranslateContextBaseTable.h" -#include "exception.h" + +#include "naucrates/exception.h" +#include "naucrates/md/CMDIdGPDB.h" +#include "naucrates/dxl/operators/CDXLScalarIdent.h" #include "gpos/base.h" #include "gpos/common/CAutoP.h" -#include "dxl/operators/CDXLScalarIdent.h" - -#include "md/CMDIdGPDB.h" - #include "gpopt/gpdbwrappers.h" using namespace gpdxl; diff --git a/src/backend/gpopt/translate/CMappingColIdVarQuery.cpp b/src/backend/gpopt/translate/CMappingColIdVarQuery.cpp index df037bc86a..cb1dbbbe30 100644 --- a/src/backend/gpopt/translate/CMappingColIdVarQuery.cpp +++ b/src/backend/gpopt/translate/CMappingColIdVarQuery.cpp @@ -28,7 +28,7 @@ #include "nodes/makefuncs.h" #include "nodes/primnodes.h" -#include "dxl/operators/CDXLScalarIdent.h" +#include "naucrates/dxl/operators/CDXLScalarIdent.h" #include "gpopt/gpdbwrappers.h" diff --git a/src/backend/gpopt/translate/CMappingVarColId.cpp b/src/backend/gpopt/translate/CMappingVarColId.cpp index ce8f50d567..ea5f524270 100644 --- a/src/backend/gpopt/translate/CMappingVarColId.cpp +++ b/src/backend/gpopt/translate/CMappingVarColId.cpp @@ -30,10 +30,10 @@ #include "nodes/value.h" -#include "dxl/CDXLUtils.h" -#include "gpos/error/CAutoTrace.h" +#include "naucrates/dxl/CDXLUtils.h" +#include "naucrates/md/IMDIndex.h" -#include "md/IMDIndex.h" +#include "gpos/error/CAutoTrace.h" #include "gpopt/gpdbwrappers.h" diff --git a/src/backend/gpopt/translate/CQueryMutators.cpp b/src/backend/gpopt/translate/CQueryMutators.cpp index 589bd5b5d2..68d189ec8d 100644 --- a/src/backend/gpopt/translate/CQueryMutators.cpp +++ b/src/backend/gpopt/translate/CQueryMutators.cpp @@ -29,9 +29,9 @@ #include "gpopt/translate/CQueryMutators.h" #include "gpopt/translate/CTranslatorDXLToPlStmt.h" -#include "md/IMDScalarOp.h" -#include "md/IMDAggregate.h" -#include "md/IMDTypeBool.h" +#include "naucrates/md/IMDScalarOp.h" +#include "naucrates/md/IMDAggregate.h" +#include "naucrates/md/IMDTypeBool.h" #include "gpopt/gpdbwrappers.h" diff --git a/src/backend/gpopt/translate/CTranslatorDXLToPlStmt.cpp b/src/backend/gpopt/translate/CTranslatorDXLToPlStmt.cpp index b5a13146e7..aed8240071 100644 --- a/src/backend/gpopt/translate/CTranslatorDXLToPlStmt.cpp +++ b/src/backend/gpopt/translate/CTranslatorDXLToPlStmt.cpp @@ -30,22 +30,22 @@ #include "utils/uri.h" #include "gpos/base.h" -#include "dxl/operators/CDXLNode.h" -#include "dxl/operators/CDXLDirectDispatchInfo.h" - #include "gpopt/mdcache/CMDAccessor.h" #include "gpopt/translate/CTranslatorDXLToPlStmt.h" #include "gpopt/translate/CTranslatorUtils.h" #include "gpopt/translate/CIndexQualInfo.h" -#include "md/IMDFunction.h" -#include "md/IMDScalarOp.h" -#include "md/IMDAggregate.h" -#include "md/IMDType.h" -#include "md/IMDTypeBool.h" -#include "md/IMDTypeInt4.h" -#include "md/IMDIndex.h" -#include "md/IMDRelationExternal.h" +#include "naucrates/dxl/operators/CDXLNode.h" +#include "naucrates/dxl/operators/CDXLDirectDispatchInfo.h" + +#include "naucrates/md/IMDFunction.h" +#include "naucrates/md/IMDScalarOp.h" +#include "naucrates/md/IMDAggregate.h" +#include "naucrates/md/IMDType.h" +#include "naucrates/md/IMDTypeBool.h" +#include "naucrates/md/IMDTypeInt4.h" +#include "naucrates/md/IMDIndex.h" +#include "naucrates/md/IMDRelationExternal.h" #include "gpopt/gpdbwrappers.h" diff --git a/src/backend/gpopt/translate/CTranslatorDXLToQuery.cpp b/src/backend/gpopt/translate/CTranslatorDXLToQuery.cpp index e3e88f2eb0..6732bf00c2 100644 --- a/src/backend/gpopt/translate/CTranslatorDXLToQuery.cpp +++ b/src/backend/gpopt/translate/CTranslatorDXLToQuery.cpp @@ -34,13 +34,12 @@ #include "gpos/base.h" #include "gpos/common/CBitSet.h" -#include "dxl/CDXLUtils.h" +#include "naucrates/dxl/CDXLUtils.h" +#include "naucrates/md/IMDColumn.h" +#include "naucrates/md/IMDRelation.h" #include "gpopt/mdcache/CMDAccessor.h" -#include "md/IMDColumn.h" -#include "md/IMDRelation.h" - #include "gpopt/gpdbwrappers.h" using namespace gpmd; diff --git a/src/backend/gpopt/translate/CTranslatorDXLToScalar.cpp b/src/backend/gpopt/translate/CTranslatorDXLToScalar.cpp index 1774b1c515..c2124ab2fa 100644 --- a/src/backend/gpopt/translate/CTranslatorDXLToScalar.cpp +++ b/src/backend/gpopt/translate/CTranslatorDXLToScalar.cpp @@ -24,15 +24,6 @@ #include "gpos/base.h" -#include "dxl/CDXLUtils.h" -#include "dxl/operators/CDXLDatumBool.h" -#include "dxl/operators/CDXLDatumInt2.h" -#include "dxl/operators/CDXLDatumInt4.h" -#include "dxl/operators/CDXLDatumInt8.h" -#include "dxl/operators/CDXLDatumGeneric.h" -#include "dxl/operators/CDXLDatumOid.h" -#include "dxl/xml/dxltokens.h" - #include "gpopt/mdcache/CMDAccessor.h" #include "gpopt/mdcache/CMDAccessorUtils.h" #include "gpopt/base/COptCtxt.h" @@ -42,10 +33,19 @@ #include "gpopt/translate/CTranslatorUtils.h" #include "gpopt/translate/CMappingColIdVarPlStmt.h" -#include "md/IMDAggregate.h" -#include "md/IMDFunction.h" -#include "md/IMDScalarOp.h" -#include "md/IMDTypeBool.h" +#include "naucrates/dxl/CDXLUtils.h" +#include "naucrates/dxl/operators/CDXLDatumBool.h" +#include "naucrates/dxl/operators/CDXLDatumInt2.h" +#include "naucrates/dxl/operators/CDXLDatumInt4.h" +#include "naucrates/dxl/operators/CDXLDatumInt8.h" +#include "naucrates/dxl/operators/CDXLDatumGeneric.h" +#include "naucrates/dxl/operators/CDXLDatumOid.h" +#include "naucrates/dxl/xml/dxltokens.h" + +#include "naucrates/md/IMDAggregate.h" +#include "naucrates/md/IMDFunction.h" +#include "naucrates/md/IMDScalarOp.h" +#include "naucrates/md/IMDTypeBool.h" #include "gpopt/gpdbwrappers.h" diff --git a/src/backend/gpopt/translate/CTranslatorPlStmtToDXL.cpp b/src/backend/gpopt/translate/CTranslatorPlStmtToDXL.cpp index 1f2cc352a4..23366973e7 100644 --- a/src/backend/gpopt/translate/CTranslatorPlStmtToDXL.cpp +++ b/src/backend/gpopt/translate/CTranslatorPlStmtToDXL.cpp @@ -28,19 +28,19 @@ #include "gpos/base.h" #include "gpos/string/CWStringDynamic.h" -#include "dxl/CDXLUtils.h" -#include "dxl/xml/dxltokens.h" -#include "dxl/operators/CDXLNode.h" -#include "dxl/gpdb_types.h" - #include "gpopt/mdcache/CMDAccessor.h" #include "gpopt/translate/CTranslatorPlStmtToDXL.h" #include "gpopt/translate/CTranslatorUtils.h" #include "gpopt/translate/CMappingVarColId.h" -#include "md/IMDScalarOp.h" -#include "md/IMDRelation.h" -#include "md/IMDIndex.h" +#include "naucrates/dxl/CDXLUtils.h" +#include "naucrates/dxl/xml/dxltokens.h" +#include "naucrates/dxl/operators/CDXLNode.h" +#include "naucrates/dxl/gpdb_types.h" + +#include "naucrates/md/IMDScalarOp.h" +#include "naucrates/md/IMDRelation.h" +#include "naucrates/md/IMDIndex.h" #include "gpopt/gpdbwrappers.h" diff --git a/src/backend/gpopt/translate/CTranslatorQueryToDXL.cpp b/src/backend/gpopt/translate/CTranslatorQueryToDXL.cpp index 616727ee4a..f3666fda9c 100644 --- a/src/backend/gpopt/translate/CTranslatorQueryToDXL.cpp +++ b/src/backend/gpopt/translate/CTranslatorQueryToDXL.cpp @@ -28,15 +28,6 @@ #include "gpos/base.h" #include "gpos/common/CAutoTimer.h" -#include "exception.h" - -#include "dxl/CDXLUtils.h" -#include "dxl/operators/dxlops.h" -#include "dxl/operators/CDXLScalarBooleanTest.h" -#include "dxl/operators/CDXLDatumInt8.h" - -#include "dxl/xml/dxltokens.h" - #include "gpopt/base/CUtils.h" #include "gpopt/mdcache/CMDAccessor.h" #include "gpopt/translate/CCTEListEntry.h" @@ -47,13 +38,21 @@ #include "gpopt/translate/CTranslatorDXLToPlStmt.h" #include "gpopt/translate/CTranslatorRelcacheToDXL.h" -#include "md/IMDScalarOp.h" -#include "md/IMDAggregate.h" -#include "md/IMDTypeBool.h" -#include "md/IMDTypeInt8.h" -#include "md/CMDIdGPDBCtas.h" +#include "naucrates/exception.h" + +#include "naucrates/dxl/CDXLUtils.h" +#include "naucrates/dxl/operators/dxlops.h" +#include "naucrates/dxl/operators/CDXLScalarBooleanTest.h" +#include "naucrates/dxl/operators/CDXLDatumInt8.h" +#include "naucrates/dxl/xml/dxltokens.h" + +#include "naucrates/md/IMDScalarOp.h" +#include "naucrates/md/IMDAggregate.h" +#include "naucrates/md/IMDTypeBool.h" +#include "naucrates/md/IMDTypeInt8.h" +#include "naucrates/md/CMDIdGPDBCtas.h" -#include "traceflags/traceflags.h" +#include "naucrates/traceflags/traceflags.h" #include "gpopt/gpdbwrappers.h" diff --git a/src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp b/src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp index 2800e8b7dc..3e136a4cd6 100644 --- a/src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp +++ b/src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp @@ -31,13 +31,13 @@ #define ALLOW_CharGetDatum #include "postgres.h" -#include "md/CMDIdCast.h" -#include "md/CMDIdScCmp.h" +#include "naucrates/md/CMDIdCast.h" +#include "naucrates/md/CMDIdScCmp.h" -#include "dxl/gpdb_types.h" +#include "naucrates/dxl/gpdb_types.h" -#include "md/CMDCastGPDB.h" -#include "md/CMDScCmpGPDB.h" +#include "naucrates/md/CMDCastGPDB.h" +#include "naucrates/md/CMDScCmpGPDB.h" #include "gpopt/translate/CTranslatorUtils.h" #include "gpopt/translate/CTranslatorRelcacheToDXL.h" @@ -81,29 +81,28 @@ #include "gpos/base.h" #include "gpos/error/CException.h" -#include "exception.h" -#include "dxl/CDXLUtils.h" +#include "naucrates/exception.h" -#include "dxl/xml/dxltokens.h" +#include "naucrates/dxl/CDXLUtils.h" +#include "naucrates/dxl/xml/dxltokens.h" -#include "md/CMDTypeBoolGPDB.h" -#include "md/CMDTypeGenericGPDB.h" -#include "md/CMDTypeInt2GPDB.h" -#include "md/CMDTypeInt4GPDB.h" -#include "md/CMDTypeInt8GPDB.h" -#include "md/CMDTypeOidGPDB.h" -#include "md/CMDIndexGPDB.h" -#include "md/CMDPartConstraintGPDB.h" -#include "md/CMDIdRelStats.h" -#include "md/CDXLRelStats.h" -#include "md/CMDIdColStats.h" -#include "md/CDXLColStats.h" +#include "naucrates/md/CMDTypeBoolGPDB.h" +#include "naucrates/md/CMDTypeGenericGPDB.h" +#include "naucrates/md/CMDTypeInt2GPDB.h" +#include "naucrates/md/CMDTypeInt4GPDB.h" +#include "naucrates/md/CMDTypeInt8GPDB.h" +#include "naucrates/md/CMDTypeOidGPDB.h" +#include "naucrates/md/CMDIndexGPDB.h" +#include "naucrates/md/CMDPartConstraintGPDB.h" +#include "naucrates/md/CMDIdRelStats.h" +#include "naucrates/md/CDXLRelStats.h" +#include "naucrates/md/CMDIdColStats.h" +#include "naucrates/md/CDXLColStats.h" #include "gpopt/base/CUtils.h" #include "gpopt/gpdbwrappers.h" - using namespace gpdxl; using namespace gpopt; diff --git a/src/backend/gpopt/translate/CTranslatorScalarToDXL.cpp b/src/backend/gpopt/translate/CTranslatorScalarToDXL.cpp index 01fd2cc7c7..115b274586 100644 --- a/src/backend/gpopt/translate/CTranslatorScalarToDXL.cpp +++ b/src/backend/gpopt/translate/CTranslatorScalarToDXL.cpp @@ -39,22 +39,22 @@ #include "gpos/common/CAutoP.h" #include "gpos/string/CWStringDynamic.h" -#include "dxl/operators/CDXLDatumBool.h" -#include "dxl/operators/CDXLDatumInt2.h" -#include "dxl/operators/CDXLDatumInt4.h" -#include "dxl/operators/CDXLDatumInt8.h" -#include "dxl/operators/CDXLDatumOid.h" - -#include "dxl/CDXLUtils.h" -#include "dxl/xml/dxltokens.h" +#include "naucrates/dxl/CDXLUtils.h" +#include "naucrates/dxl/xml/dxltokens.h" #include "gpopt/base/CUtils.h" #include "gpopt/mdcache/CMDAccessor.h" -#include "md/IMDAggregate.h" -#include "md/IMDScalarOp.h" -#include "md/IMDType.h" -#include "md/CMDTypeGenericGPDB.h" +#include "naucrates/dxl/operators/CDXLDatumBool.h" +#include "naucrates/dxl/operators/CDXLDatumInt2.h" +#include "naucrates/dxl/operators/CDXLDatumInt4.h" +#include "naucrates/dxl/operators/CDXLDatumInt8.h" +#include "naucrates/dxl/operators/CDXLDatumOid.h" + +#include "naucrates/md/IMDAggregate.h" +#include "naucrates/md/IMDScalarOp.h" +#include "naucrates/md/IMDType.h" +#include "naucrates/md/CMDTypeGenericGPDB.h" #include "gpopt/gpdbwrappers.h" diff --git a/src/backend/gpopt/translate/CTranslatorUtils.cpp b/src/backend/gpopt/translate/CTranslatorUtils.cpp index 715e72ce63..c9718c295e 100644 --- a/src/backend/gpopt/translate/CTranslatorUtils.cpp +++ b/src/backend/gpopt/translate/CTranslatorUtils.cpp @@ -40,40 +40,39 @@ #include "gpopt/translate/CTranslatorUtils.h" #include "gpopt/translate/CDXLTranslateContext.h" -#include "dxl/CDXLUtils.h" -#include "dxl/xml/dxltokens.h" -#include "dxl/operators/CDXLDatumOid.h" -#include "dxl/operators/CDXLDatumInt4.h" -#include "dxl/operators/CDXLNode.h" -#include "dxl/operators/CDXLSpoolInfo.h" -#include "dxl/operators/CDXLColDescr.h" -#include "dxl/gpdb_types.h" - -#include "gpopt/mdcache/CMDAccessor.h" -#include "gpopt/base/CUtils.h" - -#include "md/CMDIdColStats.h" -#include "md/CMDIdRelStats.h" -#include "md/IMDAggregate.h" -#include "md/IMDRelation.h" -#include "md/IMDTrigger.h" -#include "md/IMDIndex.h" -#include "md/IMDTypeBool.h" -#include "md/IMDTypeInt2.h" -#include "md/IMDTypeInt4.h" -#include "md/IMDTypeInt8.h" -#include "md/IMDTypeOid.h" -#include "md/CMDTypeGenericGPDB.h" - -#include "dxl/operators/CDXLDatumInt2.h" -#include "dxl/operators/CDXLDatumInt4.h" -#include "dxl/operators/CDXLDatumInt8.h" -#include "dxl/operators/CDXLDatumBool.h" -#include "dxl/operators/CDXLDatumOid.h" - -#include "traceflags/traceflags.h" +#include "naucrates/dxl/CDXLUtils.h" +#include "naucrates/dxl/xml/dxltokens.h" +#include "naucrates/dxl/operators/CDXLDatumOid.h" +#include "naucrates/dxl/operators/CDXLDatumInt4.h" +#include "naucrates/dxl/operators/CDXLNode.h" +#include "naucrates/dxl/operators/CDXLSpoolInfo.h" +#include "naucrates/dxl/operators/CDXLColDescr.h" +#include "naucrates/dxl/gpdb_types.h" + +#include "naucrates/md/CMDIdColStats.h" +#include "naucrates/md/CMDIdRelStats.h" +#include "naucrates/md/IMDAggregate.h" +#include "naucrates/md/IMDRelation.h" +#include "naucrates/md/IMDTrigger.h" +#include "naucrates/md/IMDIndex.h" +#include "naucrates/md/IMDTypeBool.h" +#include "naucrates/md/IMDTypeInt2.h" +#include "naucrates/md/IMDTypeInt4.h" +#include "naucrates/md/IMDTypeInt8.h" +#include "naucrates/md/IMDTypeOid.h" +#include "naucrates/md/CMDTypeGenericGPDB.h" + +#include "naucrates/dxl/operators/CDXLDatumInt2.h" +#include "naucrates/dxl/operators/CDXLDatumInt4.h" +#include "naucrates/dxl/operators/CDXLDatumInt8.h" +#include "naucrates/dxl/operators/CDXLDatumBool.h" +#include "naucrates/dxl/operators/CDXLDatumOid.h" + +#include "naucrates/traceflags/traceflags.h" #include "gpopt/gpdbwrappers.h" +#include "gpopt/base/CUtils.h" +#include "gpopt/mdcache/CMDAccessor.h" using namespace gpdxl; using namespace gpmd; diff --git a/src/backend/gpopt/utils/CConstExprEvaluatorProxy.cpp b/src/backend/gpopt/utils/CConstExprEvaluatorProxy.cpp index 36240abb6a..bf1e1dba44 100644 --- a/src/backend/gpopt/utils/CConstExprEvaluatorProxy.cpp +++ b/src/backend/gpopt/utils/CConstExprEvaluatorProxy.cpp @@ -27,12 +27,15 @@ #include "gpopt/utils/CConstExprEvaluatorProxy.h" -#include "dxl/operators/CDXLNode.h" -#include "exception.h" #include "gpopt/gpdbwrappers.h" #include "gpopt/translate/CTranslatorScalarToDXL.h" -#include "md/CMDIdGPDB.h" -#include "md/IMDType.h" + +#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; diff --git a/src/backend/gpopt/utils/COptTasks.cpp b/src/backend/gpopt/utils/COptTasks.cpp index b8abdce8ae..d6e451ddcc 100644 --- a/src/backend/gpopt/utils/COptTasks.cpp +++ b/src/backend/gpopt/utils/COptTasks.cpp @@ -54,9 +54,6 @@ #include "gpos/task/CAutoTraceFlag.h" #include "gpos/common/CAutoP.h" -#include "init.h" -#include "traceflags/traceflags.h" - #include "gpopt/translate/CTranslatorDXLToExpr.h" #include "gpopt/translate/CTranslatorExprToDXL.h" @@ -80,29 +77,32 @@ #include "gpopt/xforms/CXformFactory.h" #include "gpopt/exception.h" -#include "base/CQueryToDXLResult.h" - -#include "md/IMDId.h" -#include "md/CMDRelationGPDB.h" -#include "md/CMDIdRelStats.h" -#include "md/CMDIdColStats.h" - -#include "md/CSystemId.h" -#include "md/IMDRelStats.h" -#include "md/IMDColStats.h" -#include "md/IMDTypeInt8.h" -#include "md/CMDIdCast.h" -#include "md/CMDIdScCmp.h" -#include "md/CMDTypeInt8GPDB.h" - -#include "dxl/operators/CDXLNode.h" -#include "dxl/parser/CParseHandlerDXL.h" -#include "dxl/CDXLUtils.h" -#include "dxl/CIdGenerator.h" -#include "exception.h" - -#include "CCostModelGPDB.h" -#include "CCostModelGPDBLegacy.h" +#include "naucrates/init.h" +#include "naucrates/traceflags/traceflags.h" + +#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" +#include "naucrates/dxl/CDXLUtils.h" +#include "naucrates/dxl/CIdGenerator.h" +#include "naucrates/exception.h" + +#include "gpdbcost/CCostModelGPDB.h" +#include "gpdbcost/CCostModelGPDBLegacy.h" #include "gpopt/gpdbwrappers.h" diff --git a/src/include/gpopt/config/CConfigParamMapping.h b/src/include/gpopt/config/CConfigParamMapping.h index 4fdd70be1e..79122f9e9e 100644 --- a/src/include/gpopt/config/CConfigParamMapping.h +++ b/src/include/gpopt/config/CConfigParamMapping.h @@ -22,7 +22,7 @@ #include "gpos/common/CBitSet.h" #include "gpos/memory/IMemoryPool.h" -#include "traceflags/traceflags.h" +#include "naucrates/traceflags/traceflags.h" using namespace gpos; diff --git a/src/include/gpopt/relcache/CMDProviderRelcache.h b/src/include/gpopt/relcache/CMDProviderRelcache.h index d450a0bdaa..002a2005c0 100644 --- a/src/include/gpopt/relcache/CMDProviderRelcache.h +++ b/src/include/gpopt/relcache/CMDProviderRelcache.h @@ -24,11 +24,10 @@ #include "gpos/base.h" #include "gpos/string/CWStringBase.h" -#include "md/IMDId.h" -#include "md/IMDCacheObject.h" -#include "md/CSystemId.h" - -#include "md/IMDProvider.h" +#include "naucrates/md/CSystemId.h" +#include "naucrates/md/IMDId.h" +#include "naucrates/md/IMDCacheObject.h" +#include "naucrates/md/IMDProvider.h" // fwd decl namespace gpopt diff --git a/src/include/gpopt/translate/CCTEListEntry.h b/src/include/gpopt/translate/CCTEListEntry.h index d6f79c4458..3ae9e8217e 100644 --- a/src/include/gpopt/translate/CCTEListEntry.h +++ b/src/include/gpopt/translate/CCTEListEntry.h @@ -24,7 +24,7 @@ #include "gpos/common/CHashMap.h" #include "gpos/string/CWStringBase.h" -#include "dxl/operators/CDXLNode.h" +#include "naucrates/dxl/operators/CDXLNode.h" // fwd declaration struct Query; diff --git a/src/include/gpopt/translate/CContextDXLToPlStmt.h b/src/include/gpopt/translate/CContextDXLToPlStmt.h index 2ba3d94308..f92fc116c7 100644 --- a/src/include/gpopt/translate/CContextDXLToPlStmt.h +++ b/src/include/gpopt/translate/CContextDXLToPlStmt.h @@ -24,10 +24,9 @@ #include "gpopt/translate/CDXLTranslateContextBaseTable.h" #include "gpos/base.h" -#include "dxl/operators/CDXLScalarIdent.h" -#include "dxl/gpdb_types.h" - -#include "dxl/CIdGenerator.h" +#include "naucrates/dxl/gpdb_types.h" +#include "naucrates/dxl/CIdGenerator.h" +#include "naucrates/dxl/operators/CDXLScalarIdent.h" #include "gpopt/gpdbwrappers.h" diff --git a/src/include/gpopt/translate/CDXLTranslateContextBaseTable.h b/src/include/gpopt/translate/CDXLTranslateContextBaseTable.h index 647563cc48..f7113440f2 100644 --- a/src/include/gpopt/translate/CDXLTranslateContextBaseTable.h +++ b/src/include/gpopt/translate/CDXLTranslateContextBaseTable.h @@ -23,11 +23,11 @@ #include "gpos/base.h" +#include "gpos/common/CHashMap.h" #include "postgres.h" // Index -#include "dxl/gpdb_types.h" -#include "gpos/common/CHashMap.h" +#include "naucrates/dxl/gpdb_types.h" namespace gpdxl { diff --git a/src/include/gpopt/translate/CGPDBAttInfo.h b/src/include/gpopt/translate/CGPDBAttInfo.h index a05e37219d..9b47a0eec8 100644 --- a/src/include/gpopt/translate/CGPDBAttInfo.h +++ b/src/include/gpopt/translate/CGPDBAttInfo.h @@ -22,7 +22,7 @@ #include "gpos/base.h" #include "gpos/common/CRefCount.h" #include "gpos/utils.h" -#include "dxl/gpdb_types.h" +#include "naucrates/dxl/gpdb_types.h" namespace gpdxl { diff --git a/src/include/gpopt/translate/CMappingElementColIdParamId.h b/src/include/gpopt/translate/CMappingElementColIdParamId.h index b4086cfcdf..9364f467b2 100644 --- a/src/include/gpopt/translate/CMappingElementColIdParamId.h +++ b/src/include/gpopt/translate/CMappingElementColIdParamId.h @@ -21,9 +21,8 @@ #include "gpos/base.h" -#include "dxl/operators/CDXLNode.h" - -#include "md/IMDId.h" +#include "naucrates/dxl/operators/CDXLNode.h" +#include "naucrates/md/IMDId.h" namespace gpdxl { diff --git a/src/include/gpopt/translate/CMappingElementColIdTE.h b/src/include/gpopt/translate/CMappingElementColIdTE.h index 263eb39f33..a4f9448bea 100644 --- a/src/include/gpopt/translate/CMappingElementColIdTE.h +++ b/src/include/gpopt/translate/CMappingElementColIdTE.h @@ -23,7 +23,7 @@ #include "gpos/base.h" -#include "dxl/operators/CDXLNode.h" +#include "naucrates/dxl/operators/CDXLNode.h" #include "nodes/primnodes.h" // fwd decl diff --git a/src/include/gpopt/translate/CMappingParamIdScalarId.h b/src/include/gpopt/translate/CMappingParamIdScalarId.h index 975d7944d4..86c857fca7 100644 --- a/src/include/gpopt/translate/CMappingParamIdScalarId.h +++ b/src/include/gpopt/translate/CMappingParamIdScalarId.h @@ -22,7 +22,7 @@ #include "gpos/base.h" #include "gpos/common/CHashMap.h" #include "nodes/primnodes.h" -#include "dxl/operators/CDXLScalarIdent.h" +#include "naucrates/dxl/operators/CDXLScalarIdent.h" namespace gpdxl { diff --git a/src/include/gpopt/translate/CMappingVarColId.h b/src/include/gpopt/translate/CMappingVarColId.h index 3df9513714..b9458c7830 100644 --- a/src/include/gpopt/translate/CMappingVarColId.h +++ b/src/include/gpopt/translate/CMappingVarColId.h @@ -26,13 +26,12 @@ #include "gpopt/translate/CGPDBAttInfo.h" #include "gpopt/translate/CGPDBAttOptCol.h" - -#include "dxl/operators/dxlops.h" #include "gpos/common/CHashMap.h" #include "gpos/common/CHashMapIter.h" -#include "dxl/operators/dxlops.h" -#include "dxl/CIdGenerator.h" +#include "naucrates/dxl/operators/dxlops.h" +#include "naucrates/dxl/operators/dxlops.h" +#include "naucrates/dxl/CIdGenerator.h" //fwd decl struct Var; diff --git a/src/include/gpopt/translate/CQueryMutators.h b/src/include/gpopt/translate/CQueryMutators.h index f93d8df620..74e9c975a2 100644 --- a/src/include/gpopt/translate/CQueryMutators.h +++ b/src/include/gpopt/translate/CQueryMutators.h @@ -28,9 +28,9 @@ #include "gpos/base.h" -#include "dxl/operators/CDXLNode.h" -#include "md/IMDType.h" -#include "md/IMDType.h" +#include "naucrates/dxl/operators/CDXLNode.h" +#include "naucrates/md/IMDType.h" +#include "naucrates/md/IMDType.h" // fwd declarations namespace gpopt diff --git a/src/include/gpopt/translate/CStateDXLToQuery.h b/src/include/gpopt/translate/CStateDXLToQuery.h index 70ac663ea2..a249100d7c 100644 --- a/src/include/gpopt/translate/CStateDXLToQuery.h +++ b/src/include/gpopt/translate/CStateDXLToQuery.h @@ -21,8 +21,8 @@ #define GPDXL_CStateDXLToQuery_H #include "gpos/base.h" -#include "dxl/gpdb_types.h" -#include "dxl/operators/CDXLNode.h" +#include "naucrates/dxl/gpdb_types.h" +#include "naucrates/dxl/operators/CDXLNode.h" // fwd decl struct TargetEntry; diff --git a/src/include/gpopt/translate/CTranslatorDXLToPlStmt.h b/src/include/gpopt/translate/CTranslatorDXLToPlStmt.h index 90fe9be43e..17bab863de 100644 --- a/src/include/gpopt/translate/CTranslatorDXLToPlStmt.h +++ b/src/include/gpopt/translate/CTranslatorDXLToPlStmt.h @@ -26,17 +26,15 @@ #include "gpopt/translate/CDXLTranslateContextBaseTable.h" #include "gpopt/translate/CMappingColIdVarPlStmt.h" -#include "md/IMDRelationExternal.h" - #include "access/attnum.h" #include "nodes/nodes.h" #include "nodes/plannodes.h" #include "gpos/base.h" -#include "dxl/operators/dxlops.h" -#include "dxl/CIdGenerator.h" - +#include "naucrates/dxl/operators/dxlops.h" +#include "naucrates/dxl/CIdGenerator.h" +#include "naucrates/md/IMDRelationExternal.h" // fwd declarations namespace gpopt diff --git a/src/include/gpopt/translate/CTranslatorDXLToQuery.h b/src/include/gpopt/translate/CTranslatorDXLToQuery.h index 33be92349a..b857b1fb3e 100644 --- a/src/include/gpopt/translate/CTranslatorDXLToQuery.h +++ b/src/include/gpopt/translate/CTranslatorDXLToQuery.h @@ -27,9 +27,9 @@ #include "gpopt/translate/CStateDXLToQuery.h" #include "gpos/base.h" -#include "dxl/operators/dxlops.h" -#include "dxl/CIdGenerator.h" +#include "naucrates/dxl/CIdGenerator.h" +#include "naucrates/dxl/operators/dxlops.h" // fwd declarations namespace gpopt diff --git a/src/include/gpopt/translate/CTranslatorDXLToScalar.h b/src/include/gpopt/translate/CTranslatorDXLToScalar.h index 8971d3013a..94ee192b4c 100644 --- a/src/include/gpopt/translate/CTranslatorDXLToScalar.h +++ b/src/include/gpopt/translate/CTranslatorDXLToScalar.h @@ -26,9 +26,10 @@ #include "gpopt/translate/CMappingElementColIdParamId.h" #include "gpos/base.h" -#include "dxl/operators/CDXLNode.h" -#include "dxl/operators/CDXLDatum.h" -#include "dxl/operators/CDXLScalarArrayRefIndexList.h" + +#include "naucrates/dxl/operators/CDXLNode.h" +#include "naucrates/dxl/operators/CDXLDatum.h" +#include "naucrates/dxl/operators/CDXLScalarArrayRefIndexList.h" // fwd declarations namespace gpopt diff --git a/src/include/gpopt/translate/CTranslatorPlStmtToDXL.h b/src/include/gpopt/translate/CTranslatorPlStmtToDXL.h index d63c4c3dbf..e0b32ff770 100644 --- a/src/include/gpopt/translate/CTranslatorPlStmtToDXL.h +++ b/src/include/gpopt/translate/CTranslatorPlStmtToDXL.h @@ -25,10 +25,10 @@ #include "gpos/base.h" -#include "dxl/operators/dxlops.h" -#include "dxl/CIdGenerator.h" +#include "naucrates/dxl/operators/dxlops.h" +#include "naucrates/dxl/CIdGenerator.h" -#include "md/IMDIndex.h" +#include "naucrates/md/IMDIndex.h" // fwd declarations diff --git a/src/include/gpopt/translate/CTranslatorQueryToDXL.h b/src/include/gpopt/translate/CTranslatorQueryToDXL.h index e1d8dd49e3..664061b92a 100644 --- a/src/include/gpopt/translate/CTranslatorQueryToDXL.h +++ b/src/include/gpopt/translate/CTranslatorQueryToDXL.h @@ -30,8 +30,9 @@ #include "gpopt/translate/CCTEListEntry.h" #include "gpos/base.h" -#include "dxl/operators/CDXLNode.h" -#include "md/IMDType.h" + +#include "naucrates/dxl/operators/CDXLNode.h" +#include "naucrates/md/IMDType.h" // fwd declarations namespace gpopt diff --git a/src/include/gpopt/translate/CTranslatorRelcacheToDXL.h b/src/include/gpopt/translate/CTranslatorRelcacheToDXL.h index 89a7ccdba3..c207ce1d01 100644 --- a/src/include/gpopt/translate/CTranslatorRelcacheToDXL.h +++ b/src/include/gpopt/translate/CTranslatorRelcacheToDXL.h @@ -26,24 +26,25 @@ #include "postgres.h" #include "access/tupdesc.h" #include "catalog/gp_policy.h" -#include "dxl/gpdb_types.h" - -#include "md/IMDId.h" -#include "md/CMDRelationGPDB.h" -#include "md/CMDRelationExternalGPDB.h" -#include "md/CMDAggregateGPDB.h" -#include "md/CMDFunctionGPDB.h" -#include "md/CMDTriggerGPDB.h" -#include "md/CMDCheckConstraintGPDB.h" -#include "md/CMDPartConstraintGPDB.h" -#include "md/CMDScalarOpGPDB.h" -#include "md/IMDType.h" -#include "md/IMDFunction.h" -#include "md/CDXLColStats.h" -#include "statistics/CHistogram.h" -#include "statistics/CStatisticsUtils.h" -#include "md/IMDIndex.h" -#include "dxl/operators/CDXLColDescr.h" + +#include "naucrates/dxl/gpdb_types.h" +#include "naucrates/dxl/operators/CDXLColDescr.h" + +#include "naucrates/md/IMDId.h" +#include "naucrates/md/CMDRelationGPDB.h" +#include "naucrates/md/CMDRelationExternalGPDB.h" +#include "naucrates/md/CMDAggregateGPDB.h" +#include "naucrates/md/CMDFunctionGPDB.h" +#include "naucrates/md/CMDTriggerGPDB.h" +#include "naucrates/md/CMDCheckConstraintGPDB.h" +#include "naucrates/md/CMDPartConstraintGPDB.h" +#include "naucrates/md/CMDScalarOpGPDB.h" +#include "naucrates/md/IMDType.h" +#include "naucrates/md/IMDFunction.h" +#include "naucrates/md/CDXLColStats.h" +#include "naucrates/statistics/CHistogram.h" +#include "naucrates/statistics/CStatisticsUtils.h" +#include "naucrates/md/IMDIndex.h" // fwd decl struct RelationData; diff --git a/src/include/gpopt/translate/CTranslatorScalarToDXL.h b/src/include/gpopt/translate/CTranslatorScalarToDXL.h index 5dbaa3b7ec..9008f6a4a1 100644 --- a/src/include/gpopt/translate/CTranslatorScalarToDXL.h +++ b/src/include/gpopt/translate/CTranslatorScalarToDXL.h @@ -24,14 +24,16 @@ #include "postgres.h" #include "nodes/primnodes.h" -#include "dxl/operators/CDXLScalarBoolExpr.h" -#include "dxl/CIdGenerator.h" #include "gpopt/translate/CMappingVarColId.h" #include "gpopt/translate/CMappingParamIdScalarId.h" #include "gpopt/translate/CCTEListEntry.h" -#include "base/IDatum.h" -#include "md/IMDType.h" +#include "naucrates/dxl/operators/CDXLScalarBoolExpr.h" +#include "naucrates/dxl/CIdGenerator.h" + +#include "naucrates/base/IDatum.h" + +#include "naucrates/md/IMDType.h" // fwd declarations namespace gpopt diff --git a/src/include/gpopt/translate/CTranslatorUtils.h b/src/include/gpopt/translate/CTranslatorUtils.h index 879c37f28e..56c2e3dfd7 100644 --- a/src/include/gpopt/translate/CTranslatorUtils.h +++ b/src/include/gpopt/translate/CTranslatorUtils.h @@ -27,18 +27,18 @@ #include "gpos/base.h" #include "gpos/common/CBitSet.h" -#include "dxl/operators/dxlops.h" -#include "dxl/CIdGenerator.h" +#include "naucrates/dxl/operators/dxlops.h" +#include "naucrates/dxl/CIdGenerator.h" + +#include "naucrates/md/CMDRelationGPDB.h" +#include "naucrates/md/IMDType.h" + +#include "naucrates/statistics/IStatistics.h" #include "nodes/parsenodes.h" #include "access/sdir.h" #include "access/skey.h" -#include "md/CMDRelationGPDB.h" -#include "md/IMDType.h" - -#include "statistics/IStatistics.h" - // fwd declarations namespace gpopt { diff --git a/src/include/gpopt/utils/COptClient.h b/src/include/gpopt/utils/COptClient.h index f5cbd61a09..2b99706d7d 100644 --- a/src/include/gpopt/utils/COptClient.h +++ b/src/include/gpopt/utils/COptClient.h @@ -20,7 +20,7 @@ #include "gpos/base.h" -#include "md/CSystemId.h" +#include "naucrates/md/CSystemId.h" // forward declarations namespace gpopt diff --git a/src/include/gpopt/utils/COptServer.h b/src/include/gpopt/utils/COptServer.h index 98eaf0f543..ac0519bb23 100644 --- a/src/include/gpopt/utils/COptServer.h +++ b/src/include/gpopt/utils/COptServer.h @@ -18,7 +18,7 @@ #ifndef COptServer_H #define COptServer_H -#include "md/CSystemId.h" +#include "naucrates/md/CSystemId.h" #include "gpos/base.h" #include "gpos/common/CSyncHashtable.h"