diff --git a/gpcontrib/Makefile b/gpcontrib/Makefile index f32643976df1..150bb56f2291 100644 --- a/gpcontrib/Makefile +++ b/gpcontrib/Makefile @@ -36,6 +36,9 @@ endif ifeq "$(with_zstd)" "yes" recurse_targets += zstd endif +ifeq "$(enable_orca)" "yes" + recurse_targets += gp_orca +endif $(call recurse,all install clean distclean, $(recurse_targets)) all: gpcloud orafce diff --git a/gpcontrib/gp_orca/.gitignore b/gpcontrib/gp_orca/.gitignore new file mode 100644 index 000000000000..6628455c0ad8 --- /dev/null +++ b/gpcontrib/gp_orca/.gitignore @@ -0,0 +1 @@ +/results/ diff --git a/gpcontrib/gp_orca/Makefile b/gpcontrib/gp_orca/Makefile new file mode 100644 index 000000000000..c6116f611b9d --- /dev/null +++ b/gpcontrib/gp_orca/Makefile @@ -0,0 +1,69 @@ +EXTENSION = gp_orca +MODULE_big = gp_orca + +REGRESS = "" +EXTRA_REGRESS_OPTS = --init-file=$(top_builddir)/src/test/regress/init_file + +GPOPT_OBJS = \ + gpopt/config/CConfigParamMapping.o \ + gpopt/translate/CMappingColIdVar.o gpopt/translate/CMappingVarColId.o gpopt/translate/CPartPruneStepsBuilder.o gpopt/translate/CMappingElementColIdParamId.o gpopt/translate/CMappingColIdVarPlStmt.o gpopt/translate/CDXLTranslateContextBaseTable.o gpopt/translate/CCTEListEntry.o gpopt/translate/CContextDXLToPlStmt.o gpopt/translate/CDXLTranslateContext.o gpopt/translate/CQueryMutators.o gpopt/translate/CTranslatorScalarToDXL.o gpopt/translate/CTranslatorDXLToScalar.o gpopt/translate/CTranslatorUtils.o gpopt/translate/CTranslatorRelcacheToDXL.o gpopt/translate/CContextQueryToDXL.o gpopt/translate/CTranslatorQueryToDXL.o gpopt/translate/CTranslatorDXLToPlStmt.o \ + gpopt/relcache/CMDProviderRelcache.o \ + gpopt/utils/COptTasks.o gpopt/utils/CConstExprEvaluatorProxy.o gpopt/utils/CMemoryPoolPalloc.o gpopt/utils/CMemoryPoolPallocManager.o gpopt/utils/funcs.o gpopt/utils/RelationWrapper.o \ + gpopt/CGPOptimizer.o gpopt/gpdbwrappers.o \ + +GPORCA_OBJS = \ + gporca/libgpos/src/common/CAutoTimer.o gporca/libgpos/src/common/CBitSet.o gporca/libgpos/src/common/CBitSetIter.o gporca/libgpos/src/common/CBitVector.o gporca/libgpos/src/common/CDebugCounter.o gporca/libgpos/src/common/CHeapObject.o gporca/libgpos/src/common/CMainArgs.o gporca/libgpos/src/common/CRandom.o gporca/libgpos/src/common/CStackDescriptor.o gporca/libgpos/src/common/CStackObject.o gporca/libgpos/src/common/CTimerUser.o gporca/libgpos/src/common/CWallClock.o gporca/libgpos/src/common/clibwrapper.o gporca/libgpos/src/common/syslibwrapper.o \ + gporca/libgpos/src/error/CAutoExceptionStack.o gporca/libgpos/src/error/CAutoTrace.o gporca/libgpos/src/error/CErrorContext.o gporca/libgpos/src/error/CErrorHandlerStandard.o gporca/libgpos/src/error/CException.o gporca/libgpos/src/error/CLogger.o gporca/libgpos/src/error/CLoggerStream.o gporca/libgpos/src/error/CLoggerSyslog.o gporca/libgpos/src/error/CMessage.o gporca/libgpos/src/error/CMessageRepository.o gporca/libgpos/src/error/CMessageTable.o gporca/libgpos/src/error/CMiniDumper.o gporca/libgpos/src/error/CSerializable.o gporca/libgpos/src/error/ILogger.o \ + gporca/libgpos/src/io/CFileDescriptor.o gporca/libgpos/src/io/CFileReader.o gporca/libgpos/src/io/CFileWriter.o gporca/libgpos/src/io/COstream.o gporca/libgpos/src/io/COstreamBasic.o gporca/libgpos/src/io/COstreamStdString.o gporca/libgpos/src/io/COstreamString.o gporca/libgpos/src/io/ioutils.o \ + gporca/libgpos/src/memory/CAutoMemoryPool.o gporca/libgpos/src/memory/CCacheFactory.o gporca/libgpos/src/memory/CMemoryPool.o gporca/libgpos/src/memory/CMemoryPoolManager.o gporca/libgpos/src/memory/CMemoryPoolTracker.o gporca/libgpos/src/memory/CMemoryVisitorPrint.o \ + gporca/libgpos/src/string/CStringStatic.o gporca/libgpos/src/string/CWString.o gporca/libgpos/src/string/CWStringBase.o gporca/libgpos/src/string/CWStringConst.o gporca/libgpos/src/string/CWStringDynamic.o gporca/libgpos/src/string/CWStringStatic.o \ + gporca/libgpos/src/task/CAutoSuspendAbort.o gporca/libgpos/src/task/CAutoTaskProxy.o gporca/libgpos/src/task/CAutoTraceFlag.o gporca/libgpos/src/task/CTask.o gporca/libgpos/src/task/CTaskContext.o gporca/libgpos/src/task/CTaskLocalStorage.o gporca/libgpos/src/task/CTaskSchedulerFifo.o gporca/libgpos/src/task/CWorker.o gporca/libgpos/src/task/CWorkerPoolManager.o gporca/libgpos/src/task/ITask.o gporca/libgpos/src/task/IWorker.o \ + gporca/libgpos/src/_api.o gporca/libgpos/src/utils.o \ + gporca/libgpdbcost/src/CCostModelGPDB.o gporca/libgpdbcost/src/CCostModelParamsGPDB.o gporca/libgpdbcost/src/ICostModel.o \ + gporca/libnaucrates/src/base/CDatumBoolGPDB.o gporca/libnaucrates/src/base/CDatumGenericGPDB.o gporca/libnaucrates/src/base/CDatumInt2GPDB.o gporca/libnaucrates/src/base/CDatumInt4GPDB.o gporca/libnaucrates/src/base/CDatumInt8GPDB.o gporca/libnaucrates/src/base/CDatumOidGPDB.o gporca/libnaucrates/src/base/CQueryToDXLResult.o gporca/libnaucrates/src/base/IDatum.o \ + gporca/libnaucrates/src/md/CDXLBucket.o gporca/libnaucrates/src/md/CDXLColStats.o gporca/libnaucrates/src/md/CDXLRelStats.o gporca/libnaucrates/src/md/CDXLExtStatsInfo.o gporca/libnaucrates/src/md/CDXLExtStats.o gporca/libnaucrates/src/md/CDXLStatsDerivedColumn.o gporca/libnaucrates/src/md/CDXLStatsDerivedRelation.o gporca/libnaucrates/src/md/CMDAggregateGPDB.o gporca/libnaucrates/src/md/CMDArrayCoerceCastGPDB.o gporca/libnaucrates/src/md/CMDCastGPDB.o gporca/libnaucrates/src/md/CMDCheckConstraintGPDB.o gporca/libnaucrates/src/md/CMDColumn.o gporca/libnaucrates/src/md/CMDExtStatsInfo.o gporca/libnaucrates/src/md/CMDFunctionGPDB.o gporca/libnaucrates/src/md/CMDIdCast.o gporca/libnaucrates/src/md/CMDIdColStats.o gporca/libnaucrates/src/md/CMDIdGPDB.o gporca/libnaucrates/src/md/CMDIdGPDBCtas.o gporca/libnaucrates/src/md/CMDIdRelStats.o gporca/libnaucrates/src/md/CMDIdScCmp.o gporca/libnaucrates/src/md/CMDIndexGPDB.o gporca/libnaucrates/src/md/CMDIndexInfo.o gporca/libnaucrates/src/md/CMDName.o gporca/libnaucrates/src/md/CMDProviderGeneric.o gporca/libnaucrates/src/md/CMDProviderMemory.o gporca/libnaucrates/src/md/CMDRelationCtasGPDB.o gporca/libnaucrates/src/md/CMDRelationGPDB.o gporca/libnaucrates/src/md/CMDRequest.o gporca/libnaucrates/src/md/CMDScCmpGPDB.o gporca/libnaucrates/src/md/CMDScalarOpGPDB.o gporca/libnaucrates/src/md/CMDTypeBoolGPDB.o gporca/libnaucrates/src/md/CMDTypeGenericGPDB.o gporca/libnaucrates/src/md/CMDTypeInt2GPDB.o gporca/libnaucrates/src/md/CMDTypeInt4GPDB.o gporca/libnaucrates/src/md/CMDTypeInt8GPDB.o gporca/libnaucrates/src/md/CMDTypeOidGPDB.o gporca/libnaucrates/src/md/CSystemId.o gporca/libnaucrates/src/md/IMDCacheObject.o gporca/libnaucrates/src/md/IMDIndex.o gporca/libnaucrates/src/md/IMDProvider.o gporca/libnaucrates/src/md/IMDRelation.o gporca/libnaucrates/src/md/IMDType.o \ + gporca/libnaucrates/src/operators/CDXLColDescr.o gporca/libnaucrates/src/operators/CDXLColRef.o gporca/libnaucrates/src/operators/CDXLCtasStorageOptions.o gporca/libnaucrates/src/operators/CDXLDatum.o gporca/libnaucrates/src/operators/CDXLDatumBool.o gporca/libnaucrates/src/operators/CDXLDatumGeneric.o gporca/libnaucrates/src/operators/CDXLDatumInt2.o gporca/libnaucrates/src/operators/CDXLDatumInt4.o gporca/libnaucrates/src/operators/CDXLDatumInt8.o gporca/libnaucrates/src/operators/CDXLDatumOid.o gporca/libnaucrates/src/operators/CDXLDatumStatsDoubleMappable.o gporca/libnaucrates/src/operators/CDXLDatumStatsLintMappable.o gporca/libnaucrates/src/operators/CDXLDirectDispatchInfo.o gporca/libnaucrates/src/operators/CDXLIndexDescr.o gporca/libnaucrates/src/operators/CDXLLogical.o gporca/libnaucrates/src/operators/CDXLLogicalCTAS.o gporca/libnaucrates/src/operators/CDXLLogicalCTEAnchor.o gporca/libnaucrates/src/operators/CDXLLogicalCTEConsumer.o gporca/libnaucrates/src/operators/CDXLLogicalCTEProducer.o gporca/libnaucrates/src/operators/CDXLLogicalConstTable.o gporca/libnaucrates/src/operators/CDXLLogicalDelete.o gporca/libnaucrates/src/operators/CDXLLogicalForeignGet.o gporca/libnaucrates/src/operators/CDXLLogicalGet.o gporca/libnaucrates/src/operators/CDXLLogicalGroupBy.o gporca/libnaucrates/src/operators/CDXLLogicalInsert.o gporca/libnaucrates/src/operators/CDXLLogicalJoin.o gporca/libnaucrates/src/operators/CDXLLogicalLimit.o gporca/libnaucrates/src/operators/CDXLLogicalProject.o gporca/libnaucrates/src/operators/CDXLLogicalSelect.o gporca/libnaucrates/src/operators/CDXLLogicalSetOp.o gporca/libnaucrates/src/operators/CDXLLogicalTVF.o gporca/libnaucrates/src/operators/CDXLLogicalUpdate.o gporca/libnaucrates/src/operators/CDXLLogicalWindow.o gporca/libnaucrates/src/operators/CDXLNode.o gporca/libnaucrates/src/operators/CDXLOperator.o gporca/libnaucrates/src/operators/CDXLOperatorCost.o gporca/libnaucrates/src/operators/CDXLOperatorFactory.o gporca/libnaucrates/src/operators/CDXLPhysical.o gporca/libnaucrates/src/operators/CDXLPhysicalAbstractBitmapScan.o gporca/libnaucrates/src/operators/CDXLPhysicalAgg.o gporca/libnaucrates/src/operators/CDXLPhysicalAppend.o gporca/libnaucrates/src/operators/CDXLPhysicalAssert.o gporca/libnaucrates/src/operators/CDXLPhysicalBitmapTableScan.o gporca/libnaucrates/src/operators/CDXLPhysicalBroadcastMotion.o gporca/libnaucrates/src/operators/CDXLPhysicalCTAS.o gporca/libnaucrates/src/operators/CDXLPhysicalCTEConsumer.o gporca/libnaucrates/src/operators/CDXLPhysicalCTEProducer.o gporca/libnaucrates/src/operators/CDXLPhysicalDML.o gporca/libnaucrates/src/operators/CDXLPhysicalDynamicBitmapTableScan.o gporca/libnaucrates/src/operators/CDXLPhysicalDynamicIndexScan.o gporca/libnaucrates/src/operators/CDXLPhysicalDynamicIndexOnlyScan.o gporca/libnaucrates/src/operators/CDXLPhysicalDynamicTableScan.o gporca/libnaucrates/src/operators/CDXLPhysicalForeignScan.o gporca/libnaucrates/src/operators/CDXLPhysicalGatherMotion.o gporca/libnaucrates/src/operators/CDXLPhysicalHashJoin.o gporca/libnaucrates/src/operators/CDXLPhysicalIndexOnlyScan.o gporca/libnaucrates/src/operators/CDXLPhysicalIndexScan.o gporca/libnaucrates/src/operators/CDXLPhysicalJoin.o gporca/libnaucrates/src/operators/CDXLPhysicalLimit.o gporca/libnaucrates/src/operators/CDXLPhysicalMaterialize.o gporca/libnaucrates/src/operators/CDXLPhysicalMergeJoin.o gporca/libnaucrates/src/operators/CDXLPhysicalMotion.o gporca/libnaucrates/src/operators/CDXLPhysicalDynamicForeignScan.o gporca/libnaucrates/src/operators/CDXLPhysicalNLJoin.o gporca/libnaucrates/src/operators/CDXLPhysicalPartitionSelector.o gporca/libnaucrates/src/operators/CDXLPhysicalProperties.o gporca/libnaucrates/src/operators/CDXLPhysicalRandomMotion.o gporca/libnaucrates/src/operators/CDXLPhysicalRedistributeMotion.o gporca/libnaucrates/src/operators/CDXLPhysicalResult.o gporca/libnaucrates/src/operators/CDXLPhysicalRoutedDistributeMotion.o gporca/libnaucrates/src/operators/CDXLPhysicalSequence.o gporca/libnaucrates/src/operators/CDXLPhysicalSort.o gporca/libnaucrates/src/operators/CDXLPhysicalSplit.o gporca/libnaucrates/src/operators/CDXLPhysicalTVF.o gporca/libnaucrates/src/operators/CDXLPhysicalTableScan.o gporca/libnaucrates/src/operators/CDXLPhysicalValuesScan.o gporca/libnaucrates/src/operators/CDXLPhysicalWindow.o gporca/libnaucrates/src/operators/CDXLProperties.o gporca/libnaucrates/src/operators/CDXLScalar.o gporca/libnaucrates/src/operators/CDXLScalarAggref.o gporca/libnaucrates/src/operators/CDXLScalarArray.o gporca/libnaucrates/src/operators/CDXLScalarArrayCoerceExpr.o gporca/libnaucrates/src/operators/CDXLScalarArrayComp.o gporca/libnaucrates/src/operators/CDXLScalarArrayRef.o gporca/libnaucrates/src/operators/CDXLScalarArrayRefIndexList.o gporca/libnaucrates/src/operators/CDXLScalarAssertConstraint.o gporca/libnaucrates/src/operators/CDXLScalarAssertConstraintList.o gporca/libnaucrates/src/operators/CDXLScalarBitmapBoolOp.o gporca/libnaucrates/src/operators/CDXLScalarBitmapIndexProbe.o gporca/libnaucrates/src/operators/CDXLScalarBoolExpr.o gporca/libnaucrates/src/operators/CDXLScalarBooleanTest.o gporca/libnaucrates/src/operators/CDXLScalarCaseTest.o gporca/libnaucrates/src/operators/CDXLScalarCast.o gporca/libnaucrates/src/operators/CDXLScalarCoalesce.o gporca/libnaucrates/src/operators/CDXLScalarCoerceBase.o gporca/libnaucrates/src/operators/CDXLScalarCoerceToDomain.o gporca/libnaucrates/src/operators/CDXLScalarCoerceViaIO.o gporca/libnaucrates/src/operators/CDXLScalarComp.o gporca/libnaucrates/src/operators/CDXLScalarConstValue.o gporca/libnaucrates/src/operators/CDXLScalarDMLAction.o gporca/libnaucrates/src/operators/CDXLScalarDistinctComp.o gporca/libnaucrates/src/operators/CDXLScalarFieldSelect.o gporca/libnaucrates/src/operators/CDXLScalarFilter.o gporca/libnaucrates/src/operators/CDXLScalarFuncExpr.o gporca/libnaucrates/src/operators/CDXLScalarHashCondList.o gporca/libnaucrates/src/operators/CDXLScalarHashExpr.o gporca/libnaucrates/src/operators/CDXLScalarHashExprList.o gporca/libnaucrates/src/operators/CDXLScalarIdent.o gporca/libnaucrates/src/operators/CDXLScalarIfStmt.o gporca/libnaucrates/src/operators/CDXLScalarIndexCondList.o gporca/libnaucrates/src/operators/CDXLScalarJoinFilter.o gporca/libnaucrates/src/operators/CDXLScalarLimitCount.o gporca/libnaucrates/src/operators/CDXLScalarLimitOffset.o gporca/libnaucrates/src/operators/CDXLScalarMergeCondList.o gporca/libnaucrates/src/operators/CDXLScalarMinMax.o gporca/libnaucrates/src/operators/CDXLScalarNullIf.o gporca/libnaucrates/src/operators/CDXLScalarNullTest.o gporca/libnaucrates/src/operators/CDXLScalarOneTimeFilter.o gporca/libnaucrates/src/operators/CDXLScalarOpExpr.o gporca/libnaucrates/src/operators/CDXLScalarOpList.o gporca/libnaucrates/src/operators/CDXLScalarParam.o gporca/libnaucrates/src/operators/CDXLScalarProjElem.o gporca/libnaucrates/src/operators/CDXLScalarProjList.o gporca/libnaucrates/src/operators/CDXLScalarRecheckCondFilter.o gporca/libnaucrates/src/operators/CDXLScalarSortCol.o gporca/libnaucrates/src/operators/CDXLScalarSortColList.o gporca/libnaucrates/src/operators/CDXLScalarSubPlan.o gporca/libnaucrates/src/operators/CDXLScalarSubquery.o gporca/libnaucrates/src/operators/CDXLScalarSubqueryAll.o gporca/libnaucrates/src/operators/CDXLScalarSubqueryAny.o gporca/libnaucrates/src/operators/CDXLScalarSubqueryExists.o gporca/libnaucrates/src/operators/CDXLScalarSubqueryNotExists.o gporca/libnaucrates/src/operators/CDXLScalarSubqueryQuantified.o gporca/libnaucrates/src/operators/CDXLScalarSwitch.o gporca/libnaucrates/src/operators/CDXLScalarSwitchCase.o gporca/libnaucrates/src/operators/CDXLScalarValuesList.o gporca/libnaucrates/src/operators/CDXLScalarWindowFrameEdge.o gporca/libnaucrates/src/operators/CDXLScalarWindowRef.o gporca/libnaucrates/src/operators/CDXLSpoolInfo.o gporca/libnaucrates/src/operators/CDXLTableDescr.o gporca/libnaucrates/src/operators/CDXLWindowFrame.o gporca/libnaucrates/src/operators/CDXLWindowKey.o gporca/libnaucrates/src/operators/CDXLWindowSpec.o \ + gporca/libnaucrates/src/parser/CParseHandlerAgg.o gporca/libnaucrates/src/parser/CParseHandlerAppend.o gporca/libnaucrates/src/parser/CParseHandlerArray.o gporca/libnaucrates/src/parser/CParseHandlerAssert.o gporca/libnaucrates/src/parser/CParseHandlerBase.o gporca/libnaucrates/src/parser/CParseHandlerBroadcastMotion.o gporca/libnaucrates/src/parser/CParseHandlerCTEConfig.o gporca/libnaucrates/src/parser/CParseHandlerCTEList.o gporca/libnaucrates/src/parser/CParseHandlerColDescr.o gporca/libnaucrates/src/parser/CParseHandlerColStats.o gporca/libnaucrates/src/parser/CParseHandlerColStatsBucket.o gporca/libnaucrates/src/parser/CParseHandlerCondList.o gporca/libnaucrates/src/parser/CParseHandlerCost.o gporca/libnaucrates/src/parser/CParseHandlerCostModel.o gporca/libnaucrates/src/parser/CParseHandlerCostParam.o gporca/libnaucrates/src/parser/CParseHandlerCostParams.o gporca/libnaucrates/src/parser/CParseHandlerCtasStorageOptions.o gporca/libnaucrates/src/parser/CParseHandlerDXL.o gporca/libnaucrates/src/parser/CParseHandlerDirectDispatchInfo.o gporca/libnaucrates/src/parser/CParseHandlerDistinctComp.o gporca/libnaucrates/src/parser/CParseHandlerDummy.o gporca/libnaucrates/src/parser/CParseHandlerDynamicForeignScan.o gporca/libnaucrates/src/parser/CParseHandlerDynamicIndexScan.o gporca/libnaucrates/src/parser/CParseHandlerDynamicIndexOnlyScan.o gporca/libnaucrates/src/parser/CParseHandlerDynamicTableScan.o gporca/libnaucrates/src/parser/CParseHandlerEnumeratorConfig.o gporca/libnaucrates/src/parser/CParseHandlerForeignScan.o gporca/libnaucrates/src/parser/CParseHandlerFactory.o gporca/libnaucrates/src/parser/CParseHandlerFilter.o gporca/libnaucrates/src/parser/CParseHandlerGatherMotion.o gporca/libnaucrates/src/parser/CParseHandlerGroupingColList.o gporca/libnaucrates/src/parser/CParseHandlerHashExpr.o gporca/libnaucrates/src/parser/CParseHandlerHashExprList.o gporca/libnaucrates/src/parser/CParseHandlerHashJoin.o gporca/libnaucrates/src/parser/CParseHandlerHint.o gporca/libnaucrates/src/parser/CParseHandlerIndexCondList.o gporca/libnaucrates/src/parser/CParseHandlerIndexDescr.o gporca/libnaucrates/src/parser/CParseHandlerIndexOnlyScan.o gporca/libnaucrates/src/parser/CParseHandlerIndexScan.o gporca/libnaucrates/src/parser/CParseHandlerLimit.o gporca/libnaucrates/src/parser/CParseHandlerLogicalCTAS.o gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEAnchor.o gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEConsumer.o gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEProducer.o gporca/libnaucrates/src/parser/CParseHandlerLogicalConstTable.o gporca/libnaucrates/src/parser/CParseHandlerLogicalDelete.o gporca/libnaucrates/src/parser/CParseHandlerLogicalForeignGet.o gporca/libnaucrates/src/parser/CParseHandlerLogicalGet.o gporca/libnaucrates/src/parser/CParseHandlerLogicalGroupBy.o gporca/libnaucrates/src/parser/CParseHandlerLogicalInsert.o gporca/libnaucrates/src/parser/CParseHandlerLogicalJoin.o gporca/libnaucrates/src/parser/CParseHandlerLogicalLimit.o gporca/libnaucrates/src/parser/CParseHandlerLogicalOp.o gporca/libnaucrates/src/parser/CParseHandlerLogicalProject.o gporca/libnaucrates/src/parser/CParseHandlerLogicalSelect.o gporca/libnaucrates/src/parser/CParseHandlerLogicalSetOp.o gporca/libnaucrates/src/parser/CParseHandlerLogicalTVF.o gporca/libnaucrates/src/parser/CParseHandlerLogicalUpdate.o gporca/libnaucrates/src/parser/CParseHandlerLogicalWindow.o gporca/libnaucrates/src/parser/CParseHandlerMDArrayCoerceCast.o gporca/libnaucrates/src/parser/CParseHandlerMDCast.o gporca/libnaucrates/src/parser/CParseHandlerMDGPDBAgg.o gporca/libnaucrates/src/parser/CParseHandlerMDGPDBCheckConstraint.o gporca/libnaucrates/src/parser/CParseHandlerMDGPDBFunc.o gporca/libnaucrates/src/parser/CParseHandlerMDGPDBScalarOp.o gporca/libnaucrates/src/parser/CParseHandlerMDIndex.o gporca/libnaucrates/src/parser/CParseHandlerMDIndexInfoList.o gporca/libnaucrates/src/parser/CParseHandlerMDRelation.o gporca/libnaucrates/src/parser/CParseHandlerMDRelationCtas.o gporca/libnaucrates/src/parser/CParseHandlerMDRequest.o gporca/libnaucrates/src/parser/CParseHandlerMDScCmp.o gporca/libnaucrates/src/parser/CParseHandlerMDType.o gporca/libnaucrates/src/parser/CParseHandlerManager.o gporca/libnaucrates/src/parser/CParseHandlerMaterialize.o gporca/libnaucrates/src/parser/CParseHandlerMergeJoin.o gporca/libnaucrates/src/parser/CParseHandlerMetadata.o gporca/libnaucrates/src/parser/CParseHandlerMetadataColumn.o gporca/libnaucrates/src/parser/CParseHandlerMetadataColumns.o gporca/libnaucrates/src/parser/CParseHandlerMetadataIdList.o gporca/libnaucrates/src/parser/CParseHandlerMetadataObject.o gporca/libnaucrates/src/parser/CParseHandlerNLJIndexParam.o gporca/libnaucrates/src/parser/CParseHandlerNLJIndexParamList.o gporca/libnaucrates/src/parser/CParseHandlerNLJoin.o gporca/libnaucrates/src/parser/CParseHandlerOp.o gporca/libnaucrates/src/parser/CParseHandlerOptimizerConfig.o gporca/libnaucrates/src/parser/CParseHandlerPartitionSelector.o gporca/libnaucrates/src/parser/CParseHandlerPhysicalAbstractBitmapScan.o gporca/libnaucrates/src/parser/CParseHandlerPhysicalBitmapTableScan.o gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTAS.o gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEConsumer.o gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEProducer.o gporca/libnaucrates/src/parser/CParseHandlerPhysicalDML.o gporca/libnaucrates/src/parser/CParseHandlerPhysicalDynamicBitmapTableScan.o gporca/libnaucrates/src/parser/CParseHandlerPhysicalOp.o gporca/libnaucrates/src/parser/CParseHandlerPhysicalSplit.o gporca/libnaucrates/src/parser/CParseHandlerPhysicalTVF.o gporca/libnaucrates/src/parser/CParseHandlerPhysicalWindow.o gporca/libnaucrates/src/parser/CParseHandlerPlan.o gporca/libnaucrates/src/parser/CParseHandlerPlanHint.o gporca/libnaucrates/src/parser/CParseHandlerProjElem.o gporca/libnaucrates/src/parser/CParseHandlerProjList.o gporca/libnaucrates/src/parser/CParseHandlerProperties.o gporca/libnaucrates/src/parser/CParseHandlerQuery.o gporca/libnaucrates/src/parser/CParseHandlerQueryOutput.o gporca/libnaucrates/src/parser/CParseHandlerRandomMotion.o gporca/libnaucrates/src/parser/CParseHandlerRedistributeMotion.o gporca/libnaucrates/src/parser/CParseHandlerRelStats.o gporca/libnaucrates/src/parser/CParseHandlerRelationExtendedStats.o gporca/libnaucrates/src/parser/CParseHandlerExtStatsInfo.o gporca/libnaucrates/src/parser/CParseHandlerExtStats.o gporca/libnaucrates/src/parser/CParseHandlerExtStatsDependency.o gporca/libnaucrates/src/parser/CParseHandlerExtStatsDependencies.o gporca/libnaucrates/src/parser/CParseHandlerExtStatsNDistinct.o gporca/libnaucrates/src/parser/CParseHandlerExtStatsNDistinctList.o gporca/libnaucrates/src/parser/CParseHandlerResult.o gporca/libnaucrates/src/parser/CParseHandlerRoutedMotion.o gporca/libnaucrates/src/parser/CParseHandlerScalarAggref.o gporca/libnaucrates/src/parser/CParseHandlerScalarArrayCoerceExpr.o gporca/libnaucrates/src/parser/CParseHandlerScalarArrayComp.o gporca/libnaucrates/src/parser/CParseHandlerScalarArrayRef.o gporca/libnaucrates/src/parser/CParseHandlerScalarArrayRefIndexList.o gporca/libnaucrates/src/parser/CParseHandlerScalarAssertConstraintList.o gporca/libnaucrates/src/parser/CParseHandlerScalarBitmapBoolOp.o gporca/libnaucrates/src/parser/CParseHandlerScalarBitmapIndexProbe.o gporca/libnaucrates/src/parser/CParseHandlerScalarBoolExpr.o gporca/libnaucrates/src/parser/CParseHandlerScalarBooleanTest.o gporca/libnaucrates/src/parser/CParseHandlerScalarCaseTest.o gporca/libnaucrates/src/parser/CParseHandlerScalarCast.o gporca/libnaucrates/src/parser/CParseHandlerScalarCoalesce.o gporca/libnaucrates/src/parser/CParseHandlerScalarCoerceToDomain.o gporca/libnaucrates/src/parser/CParseHandlerScalarCoerceViaIO.o gporca/libnaucrates/src/parser/CParseHandlerScalarComp.o gporca/libnaucrates/src/parser/CParseHandlerScalarConstValue.o gporca/libnaucrates/src/parser/CParseHandlerScalarDMLAction.o gporca/libnaucrates/src/parser/CParseHandlerScalarExpr.o gporca/libnaucrates/src/parser/CParseHandlerScalarFieldSelect.o gporca/libnaucrates/src/parser/CParseHandlerScalarFuncExpr.o gporca/libnaucrates/src/parser/CParseHandlerScalarIdent.o gporca/libnaucrates/src/parser/CParseHandlerScalarIfStmt.o gporca/libnaucrates/src/parser/CParseHandlerScalarLimitCount.o gporca/libnaucrates/src/parser/CParseHandlerScalarLimitOffset.o gporca/libnaucrates/src/parser/CParseHandlerScalarMinMax.o gporca/libnaucrates/src/parser/CParseHandlerScalarNullIf.o gporca/libnaucrates/src/parser/CParseHandlerScalarNullTest.o gporca/libnaucrates/src/parser/CParseHandlerScalarOp.o gporca/libnaucrates/src/parser/CParseHandlerScalarOpExpr.o gporca/libnaucrates/src/parser/CParseHandlerScalarOpList.o gporca/libnaucrates/src/parser/CParseHandlerScalarParam.o gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlan.o gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanParam.o gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanParamList.o gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanTestExpr.o gporca/libnaucrates/src/parser/CParseHandlerScalarSubquery.o gporca/libnaucrates/src/parser/CParseHandlerScalarSubqueryExists.o gporca/libnaucrates/src/parser/CParseHandlerScalarSubqueryQuantified.o gporca/libnaucrates/src/parser/CParseHandlerScalarSwitch.o gporca/libnaucrates/src/parser/CParseHandlerScalarSwitchCase.o gporca/libnaucrates/src/parser/CParseHandlerScalarValuesList.o gporca/libnaucrates/src/parser/CParseHandlerScalarSortGroupClause.o gporca/libnaucrates/src/parser/CParseHandlerScalarWindowFrameEdge.o gporca/libnaucrates/src/parser/CParseHandlerScalarWindowRef.o gporca/libnaucrates/src/parser/CParseHandlerSearchStage.o gporca/libnaucrates/src/parser/CParseHandlerSearchStrategy.o gporca/libnaucrates/src/parser/CParseHandlerSequence.o gporca/libnaucrates/src/parser/CParseHandlerSort.o gporca/libnaucrates/src/parser/CParseHandlerSortCol.o gporca/libnaucrates/src/parser/CParseHandlerSortColList.o gporca/libnaucrates/src/parser/CParseHandlerStackTrace.o gporca/libnaucrates/src/parser/CParseHandlerStatistics.o gporca/libnaucrates/src/parser/CParseHandlerStatisticsConfig.o gporca/libnaucrates/src/parser/CParseHandlerStatsBound.o gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedColumn.o gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedRelation.o gporca/libnaucrates/src/parser/CParseHandlerTableDescr.o gporca/libnaucrates/src/parser/CParseHandlerTableScan.o gporca/libnaucrates/src/parser/CParseHandlerTraceFlags.o gporca/libnaucrates/src/parser/CParseHandlerUtils.o gporca/libnaucrates/src/parser/CParseHandlerValuesScan.o gporca/libnaucrates/src/parser/CParseHandlerWindowFrame.o gporca/libnaucrates/src/parser/CParseHandlerWindowKey.o gporca/libnaucrates/src/parser/CParseHandlerWindowKeyList.o gporca/libnaucrates/src/parser/CParseHandlerWindowOids.o gporca/libnaucrates/src/parser/CParseHandlerWindowSpec.o gporca/libnaucrates/src/parser/CParseHandlerWindowSpecList.o gporca/libnaucrates/src/parser/CParseHandlerXform.o \ + gporca/libnaucrates/src/statistics/CBucket.o gporca/libnaucrates/src/statistics/CFilterStatsProcessor.o gporca/libnaucrates/src/statistics/CExtendedStatsProcessor.o gporca/libnaucrates/src/statistics/CGroupByStatsProcessor.o gporca/libnaucrates/src/statistics/CHistogram.o gporca/libnaucrates/src/statistics/CInnerJoinStatsProcessor.o gporca/libnaucrates/src/statistics/CJoinStatsProcessor.o gporca/libnaucrates/src/statistics/CLeftAntiSemiJoinStatsProcessor.o gporca/libnaucrates/src/statistics/CLeftOuterJoinStatsProcessor.o gporca/libnaucrates/src/statistics/CLeftSemiJoinStatsProcessor.o gporca/libnaucrates/src/statistics/CLimitStatsProcessor.o gporca/libnaucrates/src/statistics/CPoint.o gporca/libnaucrates/src/statistics/CProjectStatsProcessor.o gporca/libnaucrates/src/statistics/CScaleFactorUtils.o gporca/libnaucrates/src/statistics/CStatistics.o gporca/libnaucrates/src/statistics/CStatisticsUtils.o gporca/libnaucrates/src/statistics/CStatsPredConj.o gporca/libnaucrates/src/statistics/CStatsPredDisj.o gporca/libnaucrates/src/statistics/CStatsPredLike.o gporca/libnaucrates/src/statistics/CStatsPredPoint.o gporca/libnaucrates/src/statistics/CStatsPredArrayCmp.o gporca/libnaucrates/src/statistics/CStatsPredUnsupported.o gporca/libnaucrates/src/statistics/CStatsPredUtils.o gporca/libnaucrates/src/statistics/CUnionAllStatsProcessor.o gporca/libnaucrates/src/statistics/CUpperBoundNDVs.o \ + gporca/libnaucrates/src/xml/CDXLMemoryManager.o gporca/libnaucrates/src/xml/CDXLSections.o gporca/libnaucrates/src/xml/CXMLSerializer.o gporca/libnaucrates/src/xml/dxltokens.o \ + gporca/libnaucrates/src/CCostModelConfigSerializer.o gporca/libnaucrates/src/CDXLUtils.o gporca/libnaucrates/src/CIdGenerator.o gporca/libnaucrates/src/exception.o gporca/libnaucrates/src/init.o gporca/libnaucrates/src/traceflags.o \ + gporca/libgpopt/src/base/CAutoOptCtxt.o gporca/libgpopt/src/base/CCTEInfo.o gporca/libgpopt/src/base/CCTEMap.o gporca/libgpopt/src/base/CCTEReq.o gporca/libgpopt/src/base/CCastUtils.o gporca/libgpopt/src/base/CColConstraintsArrayMapper.o gporca/libgpopt/src/base/CColConstraintsHashMapper.o gporca/libgpopt/src/base/CColRef.o gporca/libgpopt/src/base/CColRefComputed.o gporca/libgpopt/src/base/CColRefSet.o gporca/libgpopt/src/base/CColRefSetIter.o gporca/libgpopt/src/base/CColRefTable.o gporca/libgpopt/src/base/CColumnFactory.o gporca/libgpopt/src/base/CConstraint.o gporca/libgpopt/src/base/CConstraintConjunction.o gporca/libgpopt/src/base/CConstraintDisjunction.o gporca/libgpopt/src/base/CConstraintInterval.o gporca/libgpopt/src/base/CConstraintNegation.o gporca/libgpopt/src/base/CCostContext.o gporca/libgpopt/src/base/CDatumSortedSet.o gporca/libgpopt/src/base/CDefaultComparator.o gporca/libgpopt/src/base/CDistributionSpecHashed.o gporca/libgpopt/src/base/CDistributionSpecHashedNoOp.o gporca/libgpopt/src/base/CDistributionSpecNonSingleton.o gporca/libgpopt/src/base/CDistributionSpecRandom.o gporca/libgpopt/src/base/CDistributionSpecReplicated.o gporca/libgpopt/src/base/CDistributionSpecRouted.o gporca/libgpopt/src/base/CDistributionSpecSingleton.o gporca/libgpopt/src/base/CDistributionSpecStrictHashed.o gporca/libgpopt/src/base/CDistributionSpecStrictRandom.o gporca/libgpopt/src/base/CDistributionSpecStrictSingleton.o gporca/libgpopt/src/base/CDistributionSpecUniversal.o gporca/libgpopt/src/base/CDrvdProp.o gporca/libgpopt/src/base/CDrvdPropCtxt.o gporca/libgpopt/src/base/CDrvdPropCtxtPlan.o gporca/libgpopt/src/base/CDrvdPropPlan.o gporca/libgpopt/src/base/CDrvdPropRelational.o gporca/libgpopt/src/base/CDrvdPropScalar.o gporca/libgpopt/src/base/CEnfdDistribution.o gporca/libgpopt/src/base/CEnfdOrder.o gporca/libgpopt/src/base/CEnfdPartitionPropagation.o gporca/libgpopt/src/base/CEnfdProp.o gporca/libgpopt/src/base/CEnfdRewindability.o gporca/libgpopt/src/base/CFunctionProp.o gporca/libgpopt/src/base/CFunctionalDependency.o gporca/libgpopt/src/base/CIOUtils.o gporca/libgpopt/src/base/CKeyCollection.o gporca/libgpopt/src/base/COptCtxt.o gporca/libgpopt/src/base/COptimizationContext.o gporca/libgpopt/src/base/COrderSpec.o gporca/libgpopt/src/base/CPartInfo.o gporca/libgpopt/src/base/CPartKeys.o gporca/libgpopt/src/base/CPartitionPropagationSpec.o gporca/libgpopt/src/base/CPrintPrefix.o gporca/libgpopt/src/base/CPropConstraint.o gporca/libgpopt/src/base/CQueryContext.o gporca/libgpopt/src/base/CRange.o gporca/libgpopt/src/base/CReqdProp.o gporca/libgpopt/src/base/CReqdPropPlan.o gporca/libgpopt/src/base/CReqdPropRelational.o gporca/libgpopt/src/base/CRewindabilitySpec.o gporca/libgpopt/src/base/CUtils.o gporca/libgpopt/src/base/CWindowFrame.o gporca/libgpopt/src/base/CWindowOids.o gporca/libgpopt/src/base/IColConstraintsMapper.o \ + gporca/libgpopt/src/engine/CEngine.o gporca/libgpopt/src/engine/CEnumeratorConfig.o gporca/libgpopt/src/engine/CPartialPlan.o gporca/libgpopt/src/engine/CStatisticsConfig.o \ + gporca/libgpopt/src/eval/CConstExprEvaluatorDXL.o gporca/libgpopt/src/eval/CConstExprEvaluatorDefault.o \ + gporca/libgpopt/src/hints/CPlanHint.o gporca/libgpopt/src/hints/CScanHint.o gporca/libgpopt/src/hints/CRowHint.o gporca/libgpopt/src/hints/CJoinHint.o gporca/libgpopt/src/hints/CHintUtils.o \ + gporca/libgpopt/src/mdcache/CMDAccessor.o gporca/libgpopt/src/mdcache/CMDAccessorUtils.o gporca/libgpopt/src/mdcache/CMDCache.o gporca/libgpopt/src/mdcache/CMDKey.o \ + gporca/libgpopt/src/metadata/CColumnDescriptor.o gporca/libgpopt/src/metadata/CIndexDescriptor.o gporca/libgpopt/src/metadata/CName.o gporca/libgpopt/src/metadata/CTableDescriptor.o \ + gporca/libgpopt/src/minidump/CDXLMinidump.o gporca/libgpopt/src/minidump/CMetadataAccessorFactory.o gporca/libgpopt/src/minidump/CMiniDumperDXL.o gporca/libgpopt/src/minidump/CMinidumperUtils.o gporca/libgpopt/src/minidump/CSerializableMDAccessor.o gporca/libgpopt/src/minidump/CSerializableOptimizerConfig.o gporca/libgpopt/src/minidump/CSerializablePlan.o gporca/libgpopt/src/minidump/CSerializableQuery.o gporca/libgpopt/src/minidump/CSerializableStackTrace.o \ + gporca/libgpopt/src/operators/CExpression.o gporca/libgpopt/src/operators/CExpressionFactorizer.o gporca/libgpopt/src/operators/CExpressionHandle.o gporca/libgpopt/src/operators/CExpressionPreprocessor.o gporca/libgpopt/src/operators/CExpressionUtils.o gporca/libgpopt/src/operators/CHashedDistributions.o gporca/libgpopt/src/operators/CLogical.o gporca/libgpopt/src/operators/CLogicalApply.o gporca/libgpopt/src/operators/CLogicalAssert.o gporca/libgpopt/src/operators/CLogicalBitmapTableGet.o gporca/libgpopt/src/operators/CLogicalCTEAnchor.o gporca/libgpopt/src/operators/CLogicalCTEConsumer.o gporca/libgpopt/src/operators/CLogicalCTEProducer.o gporca/libgpopt/src/operators/CLogicalConstTableGet.o gporca/libgpopt/src/operators/CLogicalDML.o gporca/libgpopt/src/operators/CLogicalDelete.o gporca/libgpopt/src/operators/CLogicalDifference.o gporca/libgpopt/src/operators/CLogicalDifferenceAll.o gporca/libgpopt/src/operators/CLogicalDynamicBitmapTableGet.o gporca/libgpopt/src/operators/CLogicalDynamicGet.o gporca/libgpopt/src/operators/CLogicalDynamicGetBase.o gporca/libgpopt/src/operators/CLogicalDynamicIndexGet.o gporca/libgpopt/src/operators/CLogicalForeignGet.o gporca/libgpopt/src/operators/CLogicalFullOuterJoin.o gporca/libgpopt/src/operators/CLogicalGbAgg.o gporca/libgpopt/src/operators/CLogicalGbAggDeduplicate.o gporca/libgpopt/src/operators/CLogicalGet.o gporca/libgpopt/src/operators/CLogicalIndexApply.o gporca/libgpopt/src/operators/CLogicalIndexGet.o gporca/libgpopt/src/operators/CLogicalInnerApply.o gporca/libgpopt/src/operators/CLogicalInnerCorrelatedApply.o gporca/libgpopt/src/operators/CLogicalInnerJoin.o gporca/libgpopt/src/operators/CLogicalInsert.o gporca/libgpopt/src/operators/CLogicalIntersect.o gporca/libgpopt/src/operators/CLogicalIntersectAll.o gporca/libgpopt/src/operators/CLogicalJoin.o gporca/libgpopt/src/operators/CLogicalLeftAntiSemiApply.o gporca/libgpopt/src/operators/CLogicalLeftAntiSemiApplyNotIn.o gporca/libgpopt/src/operators/CLogicalLeftAntiSemiCorrelatedApply.o gporca/libgpopt/src/operators/CLogicalLeftAntiSemiCorrelatedApplyNotIn.o gporca/libgpopt/src/operators/CLogicalLeftAntiSemiJoin.o gporca/libgpopt/src/operators/CLogicalLeftAntiSemiJoinNotIn.o gporca/libgpopt/src/operators/CLogicalLeftOuterApply.o gporca/libgpopt/src/operators/CLogicalLeftOuterCorrelatedApply.o gporca/libgpopt/src/operators/CLogicalLeftOuterJoin.o gporca/libgpopt/src/operators/CLogicalLeftSemiApply.o gporca/libgpopt/src/operators/CLogicalLeftSemiApplyIn.o gporca/libgpopt/src/operators/CLogicalLeftSemiCorrelatedApply.o gporca/libgpopt/src/operators/CLogicalLeftSemiCorrelatedApplyIn.o gporca/libgpopt/src/operators/CLogicalLeftSemiJoin.o gporca/libgpopt/src/operators/CLogicalLimit.o gporca/libgpopt/src/operators/CLogicalMaxOneRow.o gporca/libgpopt/src/operators/CLogicalDynamicForeignGet.o gporca/libgpopt/src/operators/CLogicalNAryJoin.o gporca/libgpopt/src/operators/CLogicalProject.o gporca/libgpopt/src/operators/CLogicalRightOuterJoin.o gporca/libgpopt/src/operators/CLogicalSelect.o gporca/libgpopt/src/operators/CLogicalSequence.o gporca/libgpopt/src/operators/CLogicalSequenceProject.o gporca/libgpopt/src/operators/CLogicalSetOp.o gporca/libgpopt/src/operators/CLogicalSplit.o gporca/libgpopt/src/operators/CLogicalTVF.o gporca/libgpopt/src/operators/CLogicalUnary.o gporca/libgpopt/src/operators/CLogicalUnion.o gporca/libgpopt/src/operators/CLogicalUnionAll.o gporca/libgpopt/src/operators/CLogicalUpdate.o gporca/libgpopt/src/operators/CNormalizer.o gporca/libgpopt/src/operators/COperator.o gporca/libgpopt/src/operators/CPattern.o gporca/libgpopt/src/operators/CPhysical.o gporca/libgpopt/src/operators/CPhysicalAgg.o gporca/libgpopt/src/operators/CPhysicalAssert.o gporca/libgpopt/src/operators/CPhysicalBitmapTableScan.o gporca/libgpopt/src/operators/CPhysicalCTEConsumer.o gporca/libgpopt/src/operators/CPhysicalCTEProducer.o gporca/libgpopt/src/operators/CPhysicalComputeScalar.o gporca/libgpopt/src/operators/CPhysicalConstTableGet.o gporca/libgpopt/src/operators/CPhysicalDML.o gporca/libgpopt/src/operators/CPhysicalDynamicBitmapTableScan.o gporca/libgpopt/src/operators/CPhysicalDynamicIndexOnlyScan.o gporca/libgpopt/src/operators/CPhysicalDynamicIndexScan.o gporca/libgpopt/src/operators/CPhysicalDynamicScan.o gporca/libgpopt/src/operators/CPhysicalDynamicTableScan.o gporca/libgpopt/src/operators/CPhysicalForeignScan.o gporca/libgpopt/src/operators/CPhysicalFilter.o gporca/libgpopt/src/operators/CPhysicalFullMergeJoin.o gporca/libgpopt/src/operators/CPhysicalHashAgg.o gporca/libgpopt/src/operators/CPhysicalHashAggDeduplicate.o gporca/libgpopt/src/operators/CPhysicalHashJoin.o gporca/libgpopt/src/operators/CPhysicalIndexScan.o gporca/libgpopt/src/operators/CPhysicalIndexOnlyScan.o gporca/libgpopt/src/operators/CPhysicalInnerHashJoin.o gporca/libgpopt/src/operators/CPhysicalInnerIndexNLJoin.o gporca/libgpopt/src/operators/CPhysicalInnerNLJoin.o gporca/libgpopt/src/operators/CPhysicalJoin.o gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiHashJoin.o gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiHashJoinNotIn.o gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiNLJoin.o gporca/libgpopt/src/operators/CPhysicalLeftOuterHashJoin.o gporca/libgpopt/src/operators/CPhysicalLeftOuterIndexNLJoin.o gporca/libgpopt/src/operators/CPhysicalLeftOuterNLJoin.o gporca/libgpopt/src/operators/CPhysicalLeftSemiHashJoin.o gporca/libgpopt/src/operators/CPhysicalLeftSemiNLJoin.o gporca/libgpopt/src/operators/CPhysicalFullHashJoin.o gporca/libgpopt/src/operators/CPhysicalLimit.o gporca/libgpopt/src/operators/CPhysicalMotion.o gporca/libgpopt/src/operators/CPhysicalMotionBroadcast.o gporca/libgpopt/src/operators/CPhysicalMotionGather.o gporca/libgpopt/src/operators/CPhysicalMotionHashDistribute.o gporca/libgpopt/src/operators/CPhysicalMotionRandom.o gporca/libgpopt/src/operators/CPhysicalMotionRoutedDistribute.o gporca/libgpopt/src/operators/CPhysicalDynamicForeignScan.o gporca/libgpopt/src/operators/CPhysicalNLJoin.o gporca/libgpopt/src/operators/CPhysicalParallelUnionAll.o gporca/libgpopt/src/operators/CPhysicalPartitionSelector.o gporca/libgpopt/src/operators/CPhysicalRightOuterHashJoin.o gporca/libgpopt/src/operators/CPhysicalScalarAgg.o gporca/libgpopt/src/operators/CPhysicalScan.o gporca/libgpopt/src/operators/CPhysicalSequence.o gporca/libgpopt/src/operators/CPhysicalSequenceProject.o gporca/libgpopt/src/operators/CPhysicalSerialUnionAll.o gporca/libgpopt/src/operators/CPhysicalSort.o gporca/libgpopt/src/operators/CPhysicalSplit.o gporca/libgpopt/src/operators/CPhysicalSpool.o gporca/libgpopt/src/operators/CPhysicalStreamAgg.o gporca/libgpopt/src/operators/CPhysicalStreamAggDeduplicate.o gporca/libgpopt/src/operators/CPhysicalTVF.o gporca/libgpopt/src/operators/CPhysicalTableScan.o gporca/libgpopt/src/operators/CPhysicalUnionAll.o gporca/libgpopt/src/operators/CPhysicalUnionAllFactory.o gporca/libgpopt/src/operators/CPredicateUtils.o gporca/libgpopt/src/operators/CScalar.o gporca/libgpopt/src/operators/CScalarAggFunc.o gporca/libgpopt/src/operators/CScalarArray.o gporca/libgpopt/src/operators/CScalarArrayCmp.o gporca/libgpopt/src/operators/CScalarArrayCoerceExpr.o gporca/libgpopt/src/operators/CScalarArrayRef.o gporca/libgpopt/src/operators/CScalarArrayRefIndexList.o gporca/libgpopt/src/operators/CScalarValuesList.o gporca/libgpopt/src/operators/CScalarAssertConstraint.o gporca/libgpopt/src/operators/CScalarAssertConstraintList.o gporca/libgpopt/src/operators/CScalarBitmapBoolOp.o gporca/libgpopt/src/operators/CScalarBitmapIndexProbe.o gporca/libgpopt/src/operators/CScalarBoolOp.o gporca/libgpopt/src/operators/CScalarBooleanTest.o gporca/libgpopt/src/operators/CScalarCaseTest.o gporca/libgpopt/src/operators/CScalarCast.o gporca/libgpopt/src/operators/CScalarCmp.o gporca/libgpopt/src/operators/CScalarCoalesce.o gporca/libgpopt/src/operators/CScalarCoerceBase.o gporca/libgpopt/src/operators/CScalarCoerceToDomain.o gporca/libgpopt/src/operators/CScalarCoerceViaIO.o gporca/libgpopt/src/operators/CScalarConst.o gporca/libgpopt/src/operators/CScalarDMLAction.o gporca/libgpopt/src/operators/CScalarFieldSelect.o gporca/libgpopt/src/operators/CScalarFunc.o gporca/libgpopt/src/operators/CScalarIdent.o gporca/libgpopt/src/operators/CScalarIf.o gporca/libgpopt/src/operators/CScalarIsDistinctFrom.o gporca/libgpopt/src/operators/CScalarMinMax.o gporca/libgpopt/src/operators/CScalarNAryJoinPredList.o gporca/libgpopt/src/operators/CScalarNullIf.o gporca/libgpopt/src/operators/CScalarNullTest.o gporca/libgpopt/src/operators/CScalarOp.o gporca/libgpopt/src/operators/CScalarParam.o gporca/libgpopt/src/operators/CScalarProjectElement.o gporca/libgpopt/src/operators/CScalarProjectList.o gporca/libgpopt/src/operators/CScalarSortGroupClause.o gporca/libgpopt/src/operators/CScalarSubquery.o gporca/libgpopt/src/operators/CScalarSubqueryAll.o gporca/libgpopt/src/operators/CScalarSubqueryAny.o gporca/libgpopt/src/operators/CScalarSubqueryExistential.o gporca/libgpopt/src/operators/CScalarSubqueryQuantified.o gporca/libgpopt/src/operators/CScalarSwitch.o gporca/libgpopt/src/operators/CScalarSwitchCase.o gporca/libgpopt/src/operators/CScalarWindowFunc.o gporca/libgpopt/src/operators/CStrictHashedDistributions.o gporca/libgpopt/src/operators/COrderedAggPreprocessor.o gporca/libgpopt/src/operators/CLeftJoinPruningPreprocessor.o gporca/libgpopt/src/operators/CJoinOrderHintsPreprocessor.o \ + gporca/libgpopt/src/optimizer/COptimizer.o gporca/libgpopt/src/optimizer/COptimizerConfig.o \ + gporca/libgpopt/src/search/CBinding.o gporca/libgpopt/src/search/CGroup.o gporca/libgpopt/src/search/CGroupExpression.o gporca/libgpopt/src/search/CGroupProxy.o gporca/libgpopt/src/search/CJob.o gporca/libgpopt/src/search/CJobFactory.o gporca/libgpopt/src/search/CJobGroup.o gporca/libgpopt/src/search/CJobGroupExploration.o gporca/libgpopt/src/search/CJobGroupExpression.o gporca/libgpopt/src/search/CJobGroupExpressionExploration.o gporca/libgpopt/src/search/CJobGroupExpressionImplementation.o gporca/libgpopt/src/search/CJobGroupExpressionOptimization.o gporca/libgpopt/src/search/CJobGroupImplementation.o gporca/libgpopt/src/search/CJobGroupOptimization.o gporca/libgpopt/src/search/CJobQueue.o gporca/libgpopt/src/search/CJobTest.o gporca/libgpopt/src/search/CJobTransformation.o gporca/libgpopt/src/search/CMemo.o gporca/libgpopt/src/search/CScheduler.o gporca/libgpopt/src/search/CSchedulerContext.o gporca/libgpopt/src/search/CSearchStage.o \ + gporca/libgpopt/src/translate/CTranslatorDXLToExpr.o gporca/libgpopt/src/translate/CTranslatorDXLToExprUtils.o gporca/libgpopt/src/translate/CTranslatorExprToDXL.o gporca/libgpopt/src/translate/CTranslatorExprToDXLUtils.o \ + gporca/libgpopt/src/xforms/CDecorrelator.o gporca/libgpopt/src/xforms/CJoinOrder.o gporca/libgpopt/src/xforms/CJoinOrderDP.o gporca/libgpopt/src/xforms/CJoinOrderDPv2.o gporca/libgpopt/src/xforms/CJoinOrderGreedy.o gporca/libgpopt/src/xforms/CJoinOrderMinCard.o gporca/libgpopt/src/xforms/CSubqueryHandler.o gporca/libgpopt/src/xforms/CXform.o gporca/libgpopt/src/xforms/CXformCTEAnchor2Sequence.o gporca/libgpopt/src/xforms/CXformCTEAnchor2TrivialSelect.o gporca/libgpopt/src/xforms/CXformCollapseGbAgg.o gporca/libgpopt/src/xforms/CXformCollapseProject.o gporca/libgpopt/src/xforms/CXformDelete2DML.o gporca/libgpopt/src/xforms/CXformDifference2LeftAntiSemiJoin.o gporca/libgpopt/src/xforms/CXformDifferenceAll2LeftAntiSemiJoin.o gporca/libgpopt/src/xforms/CXformDynamicGet2DynamicTableScan.o gporca/libgpopt/src/xforms/CXformDynamicIndexOnlyGet2DynamicIndexOnlyScan.o gporca/libgpopt/src/xforms/CXformDynamicIndexGet2DynamicIndexScan.o gporca/libgpopt/src/xforms/CXformEagerAgg.o gporca/libgpopt/src/xforms/CXformExpandDynamicGetWithForeignPartitions.o gporca/libgpopt/src/xforms/CXformExpandFullOuterJoin.o gporca/libgpopt/src/xforms/CXformExpandNAryJoin.o gporca/libgpopt/src/xforms/CXformExpandNAryJoinDP.o gporca/libgpopt/src/xforms/CXformExpandNAryJoinDPv2.o gporca/libgpopt/src/xforms/CXformExpandNAryJoinGreedy.o gporca/libgpopt/src/xforms/CXformExpandNAryJoinMinCard.o gporca/libgpopt/src/xforms/CXformExploration.o gporca/libgpopt/src/xforms/CXformForeignGet2ForeignScan.o gporca/libgpopt/src/xforms/CXformFactory.o gporca/libgpopt/src/xforms/CXformGbAgg2Apply.o gporca/libgpopt/src/xforms/CXformGbAgg2HashAgg.o gporca/libgpopt/src/xforms/CXformGbAgg2ScalarAgg.o gporca/libgpopt/src/xforms/CXformGbAgg2StreamAgg.o gporca/libgpopt/src/xforms/CXformGbAggDedup2HashAggDedup.o gporca/libgpopt/src/xforms/CXformGbAggDedup2StreamAggDedup.o gporca/libgpopt/src/xforms/CXformGbAggWithMDQA2Join.o gporca/libgpopt/src/xforms/CXformGet2TableScan.o gporca/libgpopt/src/xforms/CXformImplementAssert.o gporca/libgpopt/src/xforms/CXformImplementBitmapTableGet.o gporca/libgpopt/src/xforms/CXformImplementCTEConsumer.o gporca/libgpopt/src/xforms/CXformImplementCTEProducer.o gporca/libgpopt/src/xforms/CXformImplementConstTableGet.o gporca/libgpopt/src/xforms/CXformImplementDML.o gporca/libgpopt/src/xforms/CXformImplementDynamicBitmapTableGet.o gporca/libgpopt/src/xforms/CXformImplementFullOuterMergeJoin.o gporca/libgpopt/src/xforms/CXformImplementLimit.o gporca/libgpopt/src/xforms/CXformImplementSequence.o gporca/libgpopt/src/xforms/CXformImplementSequenceProject.o gporca/libgpopt/src/xforms/CXformImplementSplit.o gporca/libgpopt/src/xforms/CXformImplementTVF.o gporca/libgpopt/src/xforms/CXformImplementTVFNoArgs.o gporca/libgpopt/src/xforms/CXformImplementUnionAll.o gporca/libgpopt/src/xforms/CXformImplementation.o gporca/libgpopt/src/xforms/CXformIndexGet2IndexScan.o gporca/libgpopt/src/xforms/CXformIndexOnlyGet2IndexOnlyScan.o gporca/libgpopt/src/xforms/CXformInlineCTEConsumer.o gporca/libgpopt/src/xforms/CXformInlineCTEConsumerUnderSelect.o gporca/libgpopt/src/xforms/CXformInnerApply2InnerJoin.o gporca/libgpopt/src/xforms/CXformInnerApply2InnerJoinNoCorrelations.o gporca/libgpopt/src/xforms/CXformInnerApplyWithOuterKey2InnerJoin.o gporca/libgpopt/src/xforms/CXformImplementInnerJoin.o gporca/libgpopt/src/xforms/CXformInsert2DML.o gporca/libgpopt/src/xforms/CXformIntersect2Join.o gporca/libgpopt/src/xforms/CXformIntersectAll2LeftSemiJoin.o gporca/libgpopt/src/xforms/CXformJoin2IndexApply.o gporca/libgpopt/src/xforms/CXformPushJoinBelowUnionAll.o gporca/libgpopt/src/xforms/CXformJoin2IndexApplyGeneric.o gporca/libgpopt/src/xforms/CXformJoinAssociativity.o gporca/libgpopt/src/xforms/CXformInnerJoinCommutativity.o gporca/libgpopt/src/xforms/CXformFullJoinCommutativity.o gporca/libgpopt/src/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoin.o gporca/libgpopt/src/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoinNoCorrelations.o gporca/libgpopt/src/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotIn.o gporca/libgpopt/src/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotInNoCorrelations.o gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2CrossProduct.o gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2HashJoin.o gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2NLJoin.o gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoinNotIn2HashJoinNotIn.o gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoinNotIn2NLJoinNotIn.o gporca/libgpopt/src/xforms/CXformLeftJoin2RightJoin.o gporca/libgpopt/src/xforms/CXformLeftOuter2InnerUnionAllLeftAntiSemiJoin.o gporca/libgpopt/src/xforms/CXformLeftOuterApply2LeftOuterJoin.o gporca/libgpopt/src/xforms/CXformLeftOuterApply2LeftOuterJoinNoCorrelations.o gporca/libgpopt/src/xforms/CXformLeftOuterJoin2HashJoin.o gporca/libgpopt/src/xforms/CXformLeftOuterJoin2NLJoin.o gporca/libgpopt/src/xforms/CXformLeftSemiApply2LeftSemiJoin.o gporca/libgpopt/src/xforms/CXformLeftSemiApply2LeftSemiJoinNoCorrelations.o gporca/libgpopt/src/xforms/CXformLeftSemiApplyWithExternalCorrs2InnerJoin.o gporca/libgpopt/src/xforms/CXformLeftSemiJoin2CrossProduct.o gporca/libgpopt/src/xforms/CXformLeftSemiJoin2HashJoin.o gporca/libgpopt/src/xforms/CXformLeftSemiJoin2InnerJoin.o gporca/libgpopt/src/xforms/CXformLeftSemiJoin2InnerJoinUnderGb.o gporca/libgpopt/src/xforms/CXformLeftSemiJoin2NLJoin.o gporca/libgpopt/src/xforms/CXformLimit2IndexGet.o gporca/libgpopt/src/xforms/CXformMaxOneRow2Assert.o gporca/libgpopt/src/xforms/CXformMinMax2IndexGet.o gporca/libgpopt/src/xforms/CXformDynamicForeignGet2DynamicForeignScan.o gporca/libgpopt/src/xforms/CXformProject2Apply.o gporca/libgpopt/src/xforms/CXformProject2ComputeScalar.o gporca/libgpopt/src/xforms/CXformPushDownLeftOuterJoin.o gporca/libgpopt/src/xforms/CXformPushGbBelowJoin.o gporca/libgpopt/src/xforms/CXformPushGbDedupBelowJoin.o gporca/libgpopt/src/xforms/CXformPushGbWithHavingBelowJoin.o gporca/libgpopt/src/xforms/CXformRemoveSubqDistinct.o gporca/libgpopt/src/xforms/CXformResult.o gporca/libgpopt/src/xforms/CXformRightOuterJoin2HashJoin.o gporca/libgpopt/src/xforms/CXformFullOuterJoin2HashJoin.o gporca/libgpopt/src/xforms/CXformSelect2Apply.o gporca/libgpopt/src/xforms/CXformSelect2BitmapBoolOp.o gporca/libgpopt/src/xforms/CXformSelect2DynamicIndexGet.o gporca/libgpopt/src/xforms/CXformSelect2DynamicIndexOnlyGet.o gporca/libgpopt/src/xforms/CXformSelect2Filter.o gporca/libgpopt/src/xforms/CXformSelect2IndexGet.o gporca/libgpopt/src/xforms/CXformSelect2IndexOnlyGet.o gporca/libgpopt/src/xforms/CXformSequenceProject2Apply.o gporca/libgpopt/src/xforms/CXformSimplifyGbAgg.o gporca/libgpopt/src/xforms/CXformSimplifyLeftOuterJoin.o gporca/libgpopt/src/xforms/CXformSimplifySubquery.o gporca/libgpopt/src/xforms/CXformSplitDQA.o gporca/libgpopt/src/xforms/CXformSplitGbAgg.o gporca/libgpopt/src/xforms/CXformSplitGbAggDedup.o gporca/libgpopt/src/xforms/CXformSplitLimit.o gporca/libgpopt/src/xforms/CXformSubqJoin2Apply.o gporca/libgpopt/src/xforms/CXformSubqueryUnnest.o gporca/libgpopt/src/xforms/CXformUnion2UnionAll.o gporca/libgpopt/src/xforms/CXformUnnestTVF.o gporca/libgpopt/src/xforms/CXformUpdate2DML.o gporca/libgpopt/src/xforms/CXformUtils.o gporca/libgpopt/src/xforms/CxformSelect2DynamicBitmapBoolOp.o \ + gporca/libgpopt/src/exception.o gporca/libgpopt/src/init.o \ + +OBJS = \ + $(GPOPT_OBJS) \ + $(GPORCA_OBJS) \ + gporca.o \ + orca.o \ + +PG_CPPFLAGS = \ + -fno-omit-frame-pointer \ + -I$(top_srcdir)/gpcontrib/gp_orca/gporca/libgpos/include \ + -I$(top_srcdir)/gpcontrib/gp_orca/gporca/libgpopt/include \ + -I$(top_srcdir)/gpcontrib/gp_orca/gporca/libnaucrates/include \ + -I$(top_srcdir)/gpcontrib/gp_orca/gporca/libgpdbcost/include \ + -I$(top_srcdir)/gpcontrib/gp_orca/include \ + +SHLIB_LINK += -lxerces-c + +ifdef USE_PGXS +PG_CONFIG = pg_config +PGXS := $(shell $(PG_CONFIG) --pgxs) +include $(PGXS) +else +subdir = gpcontrib/gp_orca +top_builddir = ../.. +include $(top_builddir)/src/Makefile.global +include $(top_srcdir)/contrib/contrib-global.mk +endif \ No newline at end of file diff --git a/gpcontrib/gp_orca/gp_orca.control b/gpcontrib/gp_orca/gp_orca.control new file mode 100644 index 000000000000..2fcbab63635a --- /dev/null +++ b/gpcontrib/gp_orca/gp_orca.control @@ -0,0 +1,6 @@ +# gp_orca extension + +comment = 'make ORCA shared again' +default_version = '1.0' +module_pathname = '$libdir/gp_orca' +relocatable = false diff --git a/src/backend/gpopt/.clang-format b/gpcontrib/gp_orca/gpopt/.clang-format similarity index 100% rename from src/backend/gpopt/.clang-format rename to gpcontrib/gp_orca/gpopt/.clang-format diff --git a/src/backend/gpopt/CGPOptimizer.cpp b/gpcontrib/gp_orca/gpopt/CGPOptimizer.cpp similarity index 100% rename from src/backend/gpopt/CGPOptimizer.cpp rename to gpcontrib/gp_orca/gpopt/CGPOptimizer.cpp diff --git a/src/backend/gpopt/README b/gpcontrib/gp_orca/gpopt/README similarity index 100% rename from src/backend/gpopt/README rename to gpcontrib/gp_orca/gpopt/README diff --git a/src/backend/gpopt/config/CConfigParamMapping.cpp b/gpcontrib/gp_orca/gpopt/config/CConfigParamMapping.cpp similarity index 100% rename from src/backend/gpopt/config/CConfigParamMapping.cpp rename to gpcontrib/gp_orca/gpopt/config/CConfigParamMapping.cpp diff --git a/src/backend/gpopt/gpdbwrappers.cpp b/gpcontrib/gp_orca/gpopt/gpdbwrappers.cpp similarity index 100% rename from src/backend/gpopt/gpdbwrappers.cpp rename to gpcontrib/gp_orca/gpopt/gpdbwrappers.cpp diff --git a/src/backend/gpopt/relcache/CMDProviderRelcache.cpp b/gpcontrib/gp_orca/gpopt/relcache/CMDProviderRelcache.cpp similarity index 100% rename from src/backend/gpopt/relcache/CMDProviderRelcache.cpp rename to gpcontrib/gp_orca/gpopt/relcache/CMDProviderRelcache.cpp diff --git a/src/backend/gpopt/translate/CCTEListEntry.cpp b/gpcontrib/gp_orca/gpopt/translate/CCTEListEntry.cpp similarity index 100% rename from src/backend/gpopt/translate/CCTEListEntry.cpp rename to gpcontrib/gp_orca/gpopt/translate/CCTEListEntry.cpp diff --git a/src/backend/gpopt/translate/CContextDXLToPlStmt.cpp b/gpcontrib/gp_orca/gpopt/translate/CContextDXLToPlStmt.cpp similarity index 100% rename from src/backend/gpopt/translate/CContextDXLToPlStmt.cpp rename to gpcontrib/gp_orca/gpopt/translate/CContextDXLToPlStmt.cpp diff --git a/src/backend/gpopt/translate/CContextQueryToDXL.cpp b/gpcontrib/gp_orca/gpopt/translate/CContextQueryToDXL.cpp similarity index 100% rename from src/backend/gpopt/translate/CContextQueryToDXL.cpp rename to gpcontrib/gp_orca/gpopt/translate/CContextQueryToDXL.cpp diff --git a/src/backend/gpopt/translate/CDXLTranslateContext.cpp b/gpcontrib/gp_orca/gpopt/translate/CDXLTranslateContext.cpp similarity index 100% rename from src/backend/gpopt/translate/CDXLTranslateContext.cpp rename to gpcontrib/gp_orca/gpopt/translate/CDXLTranslateContext.cpp diff --git a/src/backend/gpopt/translate/CDXLTranslateContextBaseTable.cpp b/gpcontrib/gp_orca/gpopt/translate/CDXLTranslateContextBaseTable.cpp similarity index 100% rename from src/backend/gpopt/translate/CDXLTranslateContextBaseTable.cpp rename to gpcontrib/gp_orca/gpopt/translate/CDXLTranslateContextBaseTable.cpp diff --git a/src/backend/gpopt/translate/CMappingColIdVar.cpp b/gpcontrib/gp_orca/gpopt/translate/CMappingColIdVar.cpp similarity index 100% rename from src/backend/gpopt/translate/CMappingColIdVar.cpp rename to gpcontrib/gp_orca/gpopt/translate/CMappingColIdVar.cpp diff --git a/src/backend/gpopt/translate/CMappingColIdVarPlStmt.cpp b/gpcontrib/gp_orca/gpopt/translate/CMappingColIdVarPlStmt.cpp similarity index 100% rename from src/backend/gpopt/translate/CMappingColIdVarPlStmt.cpp rename to gpcontrib/gp_orca/gpopt/translate/CMappingColIdVarPlStmt.cpp diff --git a/src/backend/gpopt/translate/CMappingElementColIdParamId.cpp b/gpcontrib/gp_orca/gpopt/translate/CMappingElementColIdParamId.cpp similarity index 100% rename from src/backend/gpopt/translate/CMappingElementColIdParamId.cpp rename to gpcontrib/gp_orca/gpopt/translate/CMappingElementColIdParamId.cpp diff --git a/src/backend/gpopt/translate/CMappingVarColId.cpp b/gpcontrib/gp_orca/gpopt/translate/CMappingVarColId.cpp similarity index 100% rename from src/backend/gpopt/translate/CMappingVarColId.cpp rename to gpcontrib/gp_orca/gpopt/translate/CMappingVarColId.cpp diff --git a/src/backend/gpopt/translate/CPartPruneStepsBuilder.cpp b/gpcontrib/gp_orca/gpopt/translate/CPartPruneStepsBuilder.cpp similarity index 100% rename from src/backend/gpopt/translate/CPartPruneStepsBuilder.cpp rename to gpcontrib/gp_orca/gpopt/translate/CPartPruneStepsBuilder.cpp diff --git a/src/backend/gpopt/translate/CQueryMutators.cpp b/gpcontrib/gp_orca/gpopt/translate/CQueryMutators.cpp similarity index 100% rename from src/backend/gpopt/translate/CQueryMutators.cpp rename to gpcontrib/gp_orca/gpopt/translate/CQueryMutators.cpp diff --git a/src/backend/gpopt/translate/CTranslatorDXLToPlStmt.cpp b/gpcontrib/gp_orca/gpopt/translate/CTranslatorDXLToPlStmt.cpp similarity index 100% rename from src/backend/gpopt/translate/CTranslatorDXLToPlStmt.cpp rename to gpcontrib/gp_orca/gpopt/translate/CTranslatorDXLToPlStmt.cpp diff --git a/src/backend/gpopt/translate/CTranslatorDXLToScalar.cpp b/gpcontrib/gp_orca/gpopt/translate/CTranslatorDXLToScalar.cpp similarity index 100% rename from src/backend/gpopt/translate/CTranslatorDXLToScalar.cpp rename to gpcontrib/gp_orca/gpopt/translate/CTranslatorDXLToScalar.cpp diff --git a/src/backend/gpopt/translate/CTranslatorQueryToDXL.cpp b/gpcontrib/gp_orca/gpopt/translate/CTranslatorQueryToDXL.cpp similarity index 100% rename from src/backend/gpopt/translate/CTranslatorQueryToDXL.cpp rename to gpcontrib/gp_orca/gpopt/translate/CTranslatorQueryToDXL.cpp diff --git a/src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp b/gpcontrib/gp_orca/gpopt/translate/CTranslatorRelcacheToDXL.cpp similarity index 100% rename from src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp rename to gpcontrib/gp_orca/gpopt/translate/CTranslatorRelcacheToDXL.cpp diff --git a/src/backend/gpopt/translate/CTranslatorScalarToDXL.cpp b/gpcontrib/gp_orca/gpopt/translate/CTranslatorScalarToDXL.cpp similarity index 100% rename from src/backend/gpopt/translate/CTranslatorScalarToDXL.cpp rename to gpcontrib/gp_orca/gpopt/translate/CTranslatorScalarToDXL.cpp diff --git a/src/backend/gpopt/translate/CTranslatorUtils.cpp b/gpcontrib/gp_orca/gpopt/translate/CTranslatorUtils.cpp similarity index 100% rename from src/backend/gpopt/translate/CTranslatorUtils.cpp rename to gpcontrib/gp_orca/gpopt/translate/CTranslatorUtils.cpp diff --git a/src/backend/gpopt/translate/README b/gpcontrib/gp_orca/gpopt/translate/README similarity index 100% rename from src/backend/gpopt/translate/README rename to gpcontrib/gp_orca/gpopt/translate/README diff --git a/src/backend/gpopt/utils/CConstExprEvaluatorProxy.cpp b/gpcontrib/gp_orca/gpopt/utils/CConstExprEvaluatorProxy.cpp similarity index 100% rename from src/backend/gpopt/utils/CConstExprEvaluatorProxy.cpp rename to gpcontrib/gp_orca/gpopt/utils/CConstExprEvaluatorProxy.cpp diff --git a/src/backend/gpopt/utils/CMemoryPoolPalloc.cpp b/gpcontrib/gp_orca/gpopt/utils/CMemoryPoolPalloc.cpp similarity index 100% rename from src/backend/gpopt/utils/CMemoryPoolPalloc.cpp rename to gpcontrib/gp_orca/gpopt/utils/CMemoryPoolPalloc.cpp diff --git a/src/backend/gpopt/utils/CMemoryPoolPallocManager.cpp b/gpcontrib/gp_orca/gpopt/utils/CMemoryPoolPallocManager.cpp similarity index 100% rename from src/backend/gpopt/utils/CMemoryPoolPallocManager.cpp rename to gpcontrib/gp_orca/gpopt/utils/CMemoryPoolPallocManager.cpp diff --git a/src/backend/gpopt/utils/COptTasks.cpp b/gpcontrib/gp_orca/gpopt/utils/COptTasks.cpp similarity index 100% rename from src/backend/gpopt/utils/COptTasks.cpp rename to gpcontrib/gp_orca/gpopt/utils/COptTasks.cpp diff --git a/src/backend/gpopt/utils/RelationWrapper.cpp b/gpcontrib/gp_orca/gpopt/utils/RelationWrapper.cpp similarity index 100% rename from src/backend/gpopt/utils/RelationWrapper.cpp rename to gpcontrib/gp_orca/gpopt/utils/RelationWrapper.cpp diff --git a/src/backend/gpopt/utils/funcs.cpp b/gpcontrib/gp_orca/gpopt/utils/funcs.cpp similarity index 100% rename from src/backend/gpopt/utils/funcs.cpp rename to gpcontrib/gp_orca/gpopt/utils/funcs.cpp diff --git a/gpcontrib/gp_orca/gporca.c b/gpcontrib/gp_orca/gporca.c new file mode 100644 index 000000000000..74d02ac1da8b --- /dev/null +++ b/gpcontrib/gp_orca/gporca.c @@ -0,0 +1,139 @@ +#include "postgres.h" + +#include "cdb/cdbvars.h" +#include "executor/executor.h" +#include "miscadmin.h" +#include "optimizer/orca.h" +#include "optimizer/planner.h" +#include "storage/shmem.h" +#include "utils/builtins.h" +#include "utils/memutils.h" +#include "utils/guc.h" + +extern bool optimizer; + +extern void InitGPOPT(); +extern void TerminateGPOPT(); + +extern void compute_jit_flags(PlannedStmt* pstmt); + +PG_MODULE_MAGIC; + +void _PG_init(void); +void _PG_fini(void); + +planner_hook_type next_planner_hook = NULL; + +static planner_hook_type prev_planner = NULL; + +static PlannedStmt * +gp_orca_planner(Query *parse, int cursorOptions, ParamListInfo boundParams) +{ + PlannedStmt *result = NULL; + + PG_TRY(); + { + /* + * Use ORCA only if it is enabled and we are in a coordinator QD process. + * + * ORCA excels in complex queries, most of which will access distributed + * tables. We can't run such queries from the segments slices anyway because + * they require dispatching a query within another - which is not allowed in + * GPDB (see querytree_safe_for_qe()). Note that this restriction also + * applies to non-QD coordinator slices. Furthermore, ORCA doesn't currently + * support pl/ statements (relevant when they are planned on the segments). + * For these reasons, restrict to using ORCA on the coordinator QD processes only. + * + * PARALLEL RETRIEVE CURSOR is not supported by ORCA yet. + */ + if (optimizer && + GP_ROLE_DISPATCH == Gp_role && + IS_QUERY_DISPATCHER() && + (cursorOptions & CURSOR_OPT_SKIP_FOREIGN_PARTITIONS) == 0 && + (cursorOptions & CURSOR_OPT_PARALLEL_RETRIEVE) == 0) + { + instr_time starttime; + instr_time endtime; + + if (gp_log_optimization_time) + INSTR_TIME_SET_CURRENT(starttime); + + result = optimize_query(parse, cursorOptions, boundParams); + + /* decide jit state */ + if (result) + { + /* + * Setting Jit flags for Optimizer + */ + compute_jit_flags(result); + } + + if (gp_log_optimization_time) + { + INSTR_TIME_SET_CURRENT(endtime); + INSTR_TIME_SUBTRACT(endtime, starttime); + elog(LOG, "Optimizer Time: %.3f ms", INSTR_TIME_GET_MILLISEC(endtime)); + } + } + } + PG_CATCH(); + { + PG_RE_THROW(); + } + PG_END_TRY(); + + if (result) + return result; + + if (prev_planner) + result = (*prev_planner) (parse, cursorOptions, boundParams); + else + result = standard_planner(parse, cursorOptions, boundParams); + + + return result; +} + +void +_PG_init(void) +{ + if (!process_shared_preload_libraries_in_progress) + return; + + if (Gp_role == GP_ROLE_DISPATCH) + { + /* Initialize GPOPT */ + OptimizerMemoryContext = AllocSetContextCreate(TopMemoryContext, + "GPORCA Top-level Memory Context", + ALLOCSET_DEFAULT_MINSIZE, + ALLOCSET_DEFAULT_INITSIZE, + ALLOCSET_DEFAULT_MAXSIZE); + + InitGPOPT(); + + prev_planner = planner_hook; + planner_hook = gp_orca_planner; + + /* enable orca here */ + optimizer = true; + } +} + +void +_PG_fini(void) +{ + if (Gp_role == GP_ROLE_DISPATCH) + { + /* disable orca here */ + optimizer = false; + + planner_hook = prev_planner; + + TerminateGPOPT(); + + if (OptimizerMemoryContext != NULL) + MemoryContextDelete(OptimizerMemoryContext); + } +} + diff --git a/src/backend/gporca/.clang-format b/gpcontrib/gp_orca/gporca/.clang-format similarity index 100% rename from src/backend/gporca/.clang-format rename to gpcontrib/gp_orca/gporca/.clang-format diff --git a/src/backend/gporca/.gitignore b/gpcontrib/gp_orca/gporca/.gitignore similarity index 100% rename from src/backend/gporca/.gitignore rename to gpcontrib/gp_orca/gporca/.gitignore diff --git a/src/backend/gporca/CMakeLists.txt b/gpcontrib/gp_orca/gporca/CMakeLists.txt similarity index 100% rename from src/backend/gporca/CMakeLists.txt rename to gpcontrib/gp_orca/gporca/CMakeLists.txt diff --git a/src/backend/gporca/COPYRIGHT b/gpcontrib/gp_orca/gporca/COPYRIGHT similarity index 100% rename from src/backend/gporca/COPYRIGHT rename to gpcontrib/gp_orca/gporca/COPYRIGHT diff --git a/src/backend/gporca/README.format.md b/gpcontrib/gp_orca/gporca/README.format.md similarity index 100% rename from src/backend/gporca/README.format.md rename to gpcontrib/gp_orca/gporca/README.format.md diff --git a/src/backend/gporca/README.md b/gpcontrib/gp_orca/gporca/README.md similarity index 100% rename from src/backend/gporca/README.md rename to gpcontrib/gp_orca/gporca/README.md diff --git a/src/backend/gporca/README.memo.md b/gpcontrib/gp_orca/gporca/README.memo.md similarity index 100% rename from src/backend/gporca/README.memo.md rename to gpcontrib/gp_orca/gporca/README.memo.md diff --git a/src/backend/gporca/README.tidy.md b/gpcontrib/gp_orca/gporca/README.tidy.md similarity index 100% rename from src/backend/gporca/README.tidy.md rename to gpcontrib/gp_orca/gporca/README.tidy.md diff --git a/src/backend/gporca/StyleGuide.md b/gpcontrib/gp_orca/gporca/StyleGuide.md similarity index 100% rename from src/backend/gporca/StyleGuide.md rename to gpcontrib/gp_orca/gporca/StyleGuide.md diff --git a/src/backend/gporca/clang-format.intent.yaml b/gpcontrib/gp_orca/gporca/clang-format.intent.yaml similarity index 100% rename from src/backend/gporca/clang-format.intent.yaml rename to gpcontrib/gp_orca/gporca/clang-format.intent.yaml diff --git a/src/backend/gporca/cmake/FindXerces.cmake b/gpcontrib/gp_orca/gporca/cmake/FindXerces.cmake similarity index 100% rename from src/backend/gporca/cmake/FindXerces.cmake rename to gpcontrib/gp_orca/gporca/cmake/FindXerces.cmake diff --git a/src/backend/gporca/concourse/README.md b/gpcontrib/gp_orca/gporca/concourse/README.md similarity index 100% rename from src/backend/gporca/concourse/README.md rename to gpcontrib/gp_orca/gporca/concourse/README.md diff --git a/src/backend/gporca/concourse/build_and_test.py b/gpcontrib/gp_orca/gporca/concourse/build_and_test.py similarity index 100% rename from src/backend/gporca/concourse/build_and_test.py rename to gpcontrib/gp_orca/gporca/concourse/build_and_test.py diff --git a/src/backend/gporca/concourse/test_explain_pipeline.yml b/gpcontrib/gp_orca/gporca/concourse/test_explain_pipeline.yml similarity index 100% rename from src/backend/gporca/concourse/test_explain_pipeline.yml rename to gpcontrib/gp_orca/gporca/concourse/test_explain_pipeline.yml diff --git a/src/backend/gporca/concourse/test_orca_pipeline.yml b/gpcontrib/gp_orca/gporca/concourse/test_orca_pipeline.yml similarity index 100% rename from src/backend/gporca/concourse/test_orca_pipeline.yml rename to gpcontrib/gp_orca/gporca/concourse/test_orca_pipeline.yml diff --git a/src/backend/gporca/concourse/vars_example.yml b/gpcontrib/gp_orca/gporca/concourse/vars_example.yml similarity index 100% rename from src/backend/gporca/concourse/vars_example.yml rename to gpcontrib/gp_orca/gporca/concourse/vars_example.yml diff --git a/src/backend/gporca/concourse/xerces-c/build_xerces.py b/gpcontrib/gp_orca/gporca/concourse/xerces-c/build_xerces.py similarity index 100% rename from src/backend/gporca/concourse/xerces-c/build_xerces.py rename to gpcontrib/gp_orca/gporca/concourse/xerces-c/build_xerces.py diff --git a/src/backend/gporca/concourse/xerces-c/xerces-c-3.1.2.tar.gz.sha256 b/gpcontrib/gp_orca/gporca/concourse/xerces-c/xerces-c-3.1.2.tar.gz.sha256 similarity index 100% rename from src/backend/gporca/concourse/xerces-c/xerces-c-3.1.2.tar.gz.sha256 rename to gpcontrib/gp_orca/gporca/concourse/xerces-c/xerces-c-3.1.2.tar.gz.sha256 diff --git a/src/backend/gporca/data/dxl/cost/cost0.xml b/gpcontrib/gp_orca/gporca/data/dxl/cost/cost0.xml similarity index 100% rename from src/backend/gporca/data/dxl/cost/cost0.xml rename to gpcontrib/gp_orca/gporca/data/dxl/cost/cost0.xml diff --git a/src/backend/gporca/data/dxl/cost/wrong-cost.xml b/gpcontrib/gp_orca/gporca/data/dxl/cost/wrong-cost.xml similarity index 100% rename from src/backend/gporca/data/dxl/cost/wrong-cost.xml rename to gpcontrib/gp_orca/gporca/data/dxl/cost/wrong-cost.xml diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q1.xml b/gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q1.xml similarity index 100% rename from src/backend/gporca/data/dxl/csq_tests/dxl-q1.xml rename to gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q1.xml diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q10.xml b/gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q10.xml similarity index 100% rename from src/backend/gporca/data/dxl/csq_tests/dxl-q10.xml rename to gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q10.xml diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q11.xml b/gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q11.xml similarity index 100% rename from src/backend/gporca/data/dxl/csq_tests/dxl-q11.xml rename to gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q11.xml diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q12.xml b/gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q12.xml similarity index 100% rename from src/backend/gporca/data/dxl/csq_tests/dxl-q12.xml rename to gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q12.xml diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q13.xml b/gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q13.xml similarity index 100% rename from src/backend/gporca/data/dxl/csq_tests/dxl-q13.xml rename to gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q13.xml diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q14.xml b/gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q14.xml similarity index 100% rename from src/backend/gporca/data/dxl/csq_tests/dxl-q14.xml rename to gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q14.xml diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q15.xml b/gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q15.xml similarity index 100% rename from src/backend/gporca/data/dxl/csq_tests/dxl-q15.xml rename to gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q15.xml diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q16.xml b/gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q16.xml similarity index 100% rename from src/backend/gporca/data/dxl/csq_tests/dxl-q16.xml rename to gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q16.xml diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q2.xml b/gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q2.xml similarity index 100% rename from src/backend/gporca/data/dxl/csq_tests/dxl-q2.xml rename to gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q2.xml diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q3.xml b/gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q3.xml similarity index 100% rename from src/backend/gporca/data/dxl/csq_tests/dxl-q3.xml rename to gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q3.xml diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q4.xml b/gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q4.xml similarity index 100% rename from src/backend/gporca/data/dxl/csq_tests/dxl-q4.xml rename to gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q4.xml diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q5.xml b/gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q5.xml similarity index 100% rename from src/backend/gporca/data/dxl/csq_tests/dxl-q5.xml rename to gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q5.xml diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q6.xml b/gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q6.xml similarity index 100% rename from src/backend/gporca/data/dxl/csq_tests/dxl-q6.xml rename to gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q6.xml diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q7.xml b/gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q7.xml similarity index 100% rename from src/backend/gporca/data/dxl/csq_tests/dxl-q7.xml rename to gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q7.xml diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q8.xml b/gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q8.xml similarity index 100% rename from src/backend/gporca/data/dxl/csq_tests/dxl-q8.xml rename to gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q8.xml diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q9.xml b/gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q9.xml similarity index 100% rename from src/backend/gporca/data/dxl/csq_tests/dxl-q9.xml rename to gpcontrib/gp_orca/gporca/data/dxl/csq_tests/dxl-q9.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/AggNoGroupByPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/AggNoGroupByPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/AggNoGroupByPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/AggNoGroupByPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/AggNoGroupByQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/AggNoGroupByQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/AggNoGroupByQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/AggNoGroupByQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ArrayCmpPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ArrayCmpPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ArrayCmpPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ArrayCmpPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ArrayCmpQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ArrayCmpQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ArrayCmpQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ArrayCmpQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ArrayPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ArrayPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ArrayPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ArrayPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ArrayQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ArrayQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ArrayQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ArrayQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/BroadcastPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/BroadcastPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/BroadcastPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/BroadcastPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/BroadcastQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/BroadcastQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/BroadcastQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/BroadcastQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/CScalarConstArray.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/CScalarConstArray.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/CScalarConstArray.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/CScalarConstArray.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/CoalescePlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/CoalescePlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/CoalescePlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/CoalescePlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/CoalesceQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/CoalesceQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/CoalesceQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/CoalesceQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ConstPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ConstPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ConstPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ConstPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ConstQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ConstQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ConstQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ConstQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ConstTableGetPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ConstTableGetPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ConstTableGetPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ConstTableGetPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ConstTableGetQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ConstTableGetQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ConstTableGetQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ConstTableGetQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ContradictionPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ContradictionPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ContradictionPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ContradictionPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ContradictionQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ContradictionQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ContradictionQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ContradictionQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryBooleanPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryBooleanPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryBooleanPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryBooleanPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryBooleanQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryBooleanQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryBooleanQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryBooleanQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryFilterPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryFilterPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryFilterPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryFilterPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryFilterQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryFilterQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryFilterQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryFilterQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryOuterPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryOuterPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryOuterPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryOuterPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryOuterQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryOuterQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryOuterQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryOuterQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryResultPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryResultPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryResultPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryResultPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryResultQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryResultQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryResultQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryResultQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DifferencePlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DifferencePlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DifferencePlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DifferencePlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DifferenceQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DifferenceQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DifferenceQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DifferenceQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DoubleSortPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DoubleSortPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DoubleSortPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DoubleSortPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DoubleSortQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DoubleSortQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DoubleSortQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DoubleSortQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetBooleanNotPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetBooleanNotPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetBooleanNotPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetBooleanNotPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetBooleanNotQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetBooleanNotQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetBooleanNotQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetBooleanNotQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetBooleanPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetBooleanPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetBooleanPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetBooleanPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetBooleanQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetBooleanQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetBooleanQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetBooleanQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetCountStarPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetCountStarPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetCountStarPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetCountStarPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetCountStarQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetCountStarQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetCountStarQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetCountStarQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetHashJoinOtherKeyPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetHashJoinOtherKeyPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetHashJoinOtherKeyPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetHashJoinOtherKeyPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetHashJoinOtherKeyQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetHashJoinOtherKeyQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetHashJoinOtherKeyQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetHashJoinOtherKeyQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetHashJoinPartKeyPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetHashJoinPartKeyPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetHashJoinPartKeyPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetHashJoinPartKeyPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetHashJoinPartKeyQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetHashJoinPartKeyQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetHashJoinPartKeyQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetHashJoinPartKeyQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetMultiJoinPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetMultiJoinPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetMultiJoinPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetMultiJoinPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetMultiJoinQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetMultiJoinQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetMultiJoinQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetMultiJoinQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetNLJoinOtherKeyPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetNLJoinOtherKeyPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetNLJoinOtherKeyPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetNLJoinOtherKeyPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetNLJoinOtherKeyQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetNLJoinOtherKeyQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetNLJoinOtherKeyQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetNLJoinOtherKeyQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetNLJoinPartKeyPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetNLJoinPartKeyPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetNLJoinPartKeyPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetNLJoinPartKeyPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetNLJoinPartKeyQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetNLJoinPartKeyQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetNLJoinPartKeyQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetNLJoinPartKeyQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetPointPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetPointPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetPointPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetPointPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetPointQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetPointQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetPointQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetPointQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetRangeSelectPlan1.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetRangeSelectPlan1.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetRangeSelectPlan1.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetRangeSelectPlan1.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetRangeSelectPlan2.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetRangeSelectPlan2.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetRangeSelectPlan2.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetRangeSelectPlan2.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetRangeSelectQuery1.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetRangeSelectQuery1.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetRangeSelectQuery1.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetRangeSelectQuery1.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetRangeSelectQuery2.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetRangeSelectQuery2.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetRangeSelectQuery2.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetRangeSelectQuery2.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetUnionAllOuterJoinPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetUnionAllOuterJoinPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetUnionAllOuterJoinPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetUnionAllOuterJoinPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetUnionAllOuterJoinQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetUnionAllOuterJoinQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetUnionAllOuterJoinQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/DynamicGetUnionAllOuterJoinQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/FilterLogOpPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/FilterLogOpPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/FilterLogOpPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/FilterLogOpPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/FilterLogOpQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/FilterLogOpQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/FilterLogOpQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/FilterLogOpQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/FilterOnTableWithIndexPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/FilterOnTableWithIndexPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/FilterOnTableWithIndexPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/FilterOnTableWithIndexPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/FilterOnTableWithIndexQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/FilterOnTableWithIndexQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/FilterOnTableWithIndexQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/FilterOnTableWithIndexQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/FilterPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/FilterPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/FilterPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/FilterPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/FilterQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/FilterQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/FilterQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/FilterQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/FuncExprPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/FuncExprPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/FuncExprPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/FuncExprPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/FuncExprQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/FuncExprQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/FuncExprQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/FuncExprQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/GatherMergePlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/GatherMergePlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/GatherMergePlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/GatherMergePlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/GatherMergeQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/GatherMergeQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/GatherMergeQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/GatherMergeQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/GatherPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/GatherPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/GatherPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/GatherPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/GatherQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/GatherQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/GatherQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/GatherQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/GroupByNoAggPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/GroupByNoAggPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/GroupByNoAggPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/GroupByNoAggPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/GroupByNoAggQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/GroupByNoAggQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/GroupByNoAggQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/GroupByNoAggQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/GroupByPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/GroupByPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/GroupByPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/GroupByPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/GroupByQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/GroupByQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/GroupByQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/GroupByQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/HashDistributePlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/HashDistributePlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/HashDistributePlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/HashDistributePlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/HashDistributeQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/HashDistributeQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/HashDistributeQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/HashDistributeQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/HashJoinPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/HashJoinPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/HashJoinPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/HashJoinPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/HashJoinQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/HashJoinQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/HashJoinQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/HashJoinQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/InnerJoinPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/InnerJoinPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/InnerJoinPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/InnerJoinPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/InnerJoinQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/InnerJoinQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/InnerJoinQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/InnerJoinQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/InsertPartitionedPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/InsertPartitionedPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/InsertPartitionedPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/InsertPartitionedPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/InsertPartitionedQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/InsertPartitionedQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/InsertPartitionedQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/InsertPartitionedQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/IntersectAllPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/IntersectAllPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/IntersectAllPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/IntersectAllPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/IntersectAllQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/IntersectAllQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/IntersectAllQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/IntersectAllQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/IntersectPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/IntersectPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/IntersectPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/IntersectPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/IntersectQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/IntersectQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/IntersectQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/IntersectQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q1.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q1.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q1.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q1.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q10.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q10.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q10.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q10.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q11.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q11.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q11.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q11.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q12.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q12.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q12.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q12.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q13.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q13.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q13.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q13.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q14.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q14.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q14.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q14.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q15.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q15.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q15.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q15.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q16.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q16.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q16.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q16.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q2.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q2.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q2.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q2.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q3.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q3.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q3.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q3.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q4.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q4.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q4.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q4.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q5.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q5.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q5.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q5.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q6.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q6.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q6.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q6.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q7.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q7.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q7.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q7.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q8.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q8.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q8.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q8.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q9.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q9.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q9.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q9.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/LeftOuterJoinHJPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LeftOuterJoinHJPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/LeftOuterJoinHJPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LeftOuterJoinHJPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/LeftOuterJoinHJQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LeftOuterJoinHJQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/LeftOuterJoinHJQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LeftOuterJoinHJQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/LeftOuterJoinNLPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LeftOuterJoinNLPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/LeftOuterJoinNLPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LeftOuterJoinNLPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/LeftOuterJoinNLQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LeftOuterJoinNLQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/LeftOuterJoinNLQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LeftOuterJoinNLQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/LimitQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LimitQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/LimitQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LimitQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/LimitQueryNoOffset.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LimitQueryNoOffset.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/LimitQueryNoOffset.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/LimitQueryNoOffset.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/MultipleWindowFuncPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/MultipleWindowFuncPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/MultipleWindowFuncPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/MultipleWindowFuncPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/MultipleWindowFuncQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/MultipleWindowFuncQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/MultipleWindowFuncQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/MultipleWindowFuncQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/NAryJoinPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/NAryJoinPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/NAryJoinPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/NAryJoinPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/NAryJoinQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/NAryJoinQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/NAryJoinQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/NAryJoinQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/NLLASJoinPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/NLLASJoinPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/NLLASJoinPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/NLLASJoinPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/NLLASJoinQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/NLLASJoinQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/NLLASJoinQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/NLLASJoinQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/NLLSJoinPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/NLLSJoinPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/NLLSJoinPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/NLLSJoinPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/NLLSJoinQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/NLLSJoinQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/NLLSJoinQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/NLLSJoinQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/NullIfPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/NullIfPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/NullIfPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/NullIfPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/NullIfQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/NullIfQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/NullIfQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/NullIfQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/NullableDroppedColumn.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/NullableDroppedColumn.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/NullableDroppedColumn.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/NullableDroppedColumn.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ProjectPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ProjectPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ProjectPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ProjectPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ProjectQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ProjectQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ProjectQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ProjectQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/RedundantSortPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/RedundantSortPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/RedundantSortPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/RedundantSortPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/RedundantSortQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/RedundantSortQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/RedundantSortQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/RedundantSortQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/RightOuterJoinPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/RightOuterJoinPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/RightOuterJoinPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/RightOuterJoinPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/RightOuterJoinQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/RightOuterJoinQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/RightOuterJoinQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/RightOuterJoinQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarCaseTestPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarCaseTestPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ScalarCaseTestPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarCaseTestPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarCaseTestQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarCaseTestQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ScalarCaseTestQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarCaseTestQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarCastPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarCastPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ScalarCastPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarCastPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarCastQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarCastQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ScalarCastQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarCastQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarDistFromPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarDistFromPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ScalarDistFromPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarDistFromPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarDistFromQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarDistFromQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ScalarDistFromQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarDistFromQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarIfPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarIfPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ScalarIfPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarIfPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarIfQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarIfQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ScalarIfQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarIfQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarNullTestPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarNullTestPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ScalarNullTestPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarNullTestPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarNullTestQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarNullTestQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ScalarNullTestQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarNullTestQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarOpAddPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarOpAddPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ScalarOpAddPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarOpAddPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarOpAddQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarOpAddQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ScalarOpAddQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarOpAddQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarSubqueryAnyAllPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarSubqueryAnyAllPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ScalarSubqueryAnyAllPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarSubqueryAnyAllPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarSubqueryAnyAllQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarSubqueryAnyAllQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ScalarSubqueryAnyAllQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarSubqueryAnyAllQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarSubqueryExistentialPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarSubqueryExistentialPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ScalarSubqueryExistentialPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarSubqueryExistentialPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarSubqueryExistentialQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarSubqueryExistentialQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ScalarSubqueryExistentialQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarSubqueryExistentialQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarSubqueryPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarSubqueryPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ScalarSubqueryPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarSubqueryPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarSubqueryQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarSubqueryQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ScalarSubqueryQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarSubqueryQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarSwitchPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarSwitchPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ScalarSwitchPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarSwitchPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarSwitchQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarSwitchQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/ScalarSwitchQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/ScalarSwitchQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/SortPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/SortPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/SortPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/SortPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/SortQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/SortQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/SortQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/SortQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/SpoolPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/SpoolPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/SpoolPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/SpoolPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/SpoolQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/SpoolQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/SpoolQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/SpoolQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/TableScan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/TableScan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/TableScan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/TableScan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/TableScanPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/TableScanPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/TableScanPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/TableScanPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/TableScanQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/TableScanQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/TableScanQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/TableScanQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/TableScanWithFilterPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/TableScanWithFilterPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/TableScanWithFilterPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/TableScanWithFilterPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/TableScanWithFilterQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/TableScanWithFilterQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/TableScanWithFilterQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/TableScanWithFilterQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/TableValuedFunctionJoinPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/TableValuedFunctionJoinPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/TableValuedFunctionJoinPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/TableValuedFunctionJoinPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/TableValuedFunctionJoinQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/TableValuedFunctionJoinQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/TableValuedFunctionJoinQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/TableValuedFunctionJoinQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/TableValuedFunctionPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/TableValuedFunctionPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/TableValuedFunctionPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/TableValuedFunctionPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/TableValuedFunctionQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/TableValuedFunctionQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/TableValuedFunctionQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/TableValuedFunctionQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/UnionAllPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/UnionAllPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/UnionAllPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/UnionAllPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/UnionAllQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/UnionAllQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/UnionAllQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/UnionAllQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/UnionAllRemappedPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/UnionAllRemappedPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/UnionAllRemappedPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/UnionAllRemappedPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/UnionAllRemappedQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/UnionAllRemappedQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/UnionAllRemappedQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/UnionAllRemappedQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/UnionPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/UnionPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/UnionPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/UnionPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/UnionQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/UnionQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/UnionQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/UnionQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/VolatileCSQPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/VolatileCSQPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/VolatileCSQPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/VolatileCSQPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/VolatileCSQQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/VolatileCSQQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/VolatileCSQQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/VolatileCSQQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/VolatileFuncPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/VolatileFuncPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/VolatileFuncPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/VolatileFuncPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/VolatileFuncQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/VolatileFuncQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/VolatileFuncQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/VolatileFuncQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/VolatileHashJoinPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/VolatileHashJoinPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/VolatileHashJoinPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/VolatileHashJoinPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/VolatileHashJoinQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/VolatileHashJoinQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/VolatileHashJoinQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/VolatileHashJoinQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/VolatileNLJoinPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/VolatileNLJoinPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/VolatileNLJoinPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/VolatileNLJoinPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/VolatileNLJoinQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/VolatileNLJoinQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/VolatileNLJoinQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/VolatileNLJoinQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/VolatileTVFPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/VolatileTVFPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/VolatileTVFPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/VolatileTVFPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/VolatileTVFQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/VolatileTVFQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/VolatileTVFQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/VolatileTVFQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/VolatileWithPartTablePlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/VolatileWithPartTablePlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/VolatileWithPartTablePlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/VolatileWithPartTablePlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/VolatileWithPartTableQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/VolatileWithPartTableQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/VolatileWithPartTableQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/VolatileWithPartTableQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/WinFunc-OuterRef-Partition-Order-Frames-Query.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/WinFunc-OuterRef-Partition-Order-Frames-Query.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/WinFunc-OuterRef-Partition-Order-Frames-Query.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/WinFunc-OuterRef-Partition-Order-Frames-Query.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/WinFunc-OuterRef-Partition-Order-Query.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/WinFunc-OuterRef-Partition-Order-Query.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/WinFunc-OuterRef-Partition-Order-Query.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/WinFunc-OuterRef-Partition-Order-Query.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/WinFunc-OuterRef-Partition-Query.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/WinFunc-OuterRef-Partition-Query.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/WinFunc-OuterRef-Partition-Query.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/WinFunc-OuterRef-Partition-Query.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/WinFunc-Tests-MD.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/WinFunc-Tests-MD.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/WinFunc-Tests-MD.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/WinFunc-Tests-MD.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/WindowPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/WindowPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/WindowPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/WindowPlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/WindowPlanEmptyPartitionBy.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/WindowPlanEmptyPartitionBy.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/WindowPlanEmptyPartitionBy.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/WindowPlanEmptyPartitionBy.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/WindowQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/WindowQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/WindowQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/WindowQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/WindowQueryEmptyPartitionBy.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/WindowQueryEmptyPartitionBy.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/WindowQueryEmptyPartitionBy.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/WindowQueryEmptyPartitionBy.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/WindowWithFramePlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/WindowWithFramePlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/WindowWithFramePlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/WindowWithFramePlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/WindowWithFrameQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/WindowWithFrameQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/WindowWithFrameQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/WindowWithFrameQuery.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/WindowWithNoLeadingEdgePlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/WindowWithNoLeadingEdgePlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/WindowWithNoLeadingEdgePlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/WindowWithNoLeadingEdgePlan.xml diff --git a/src/backend/gporca/data/dxl/expressiontests/WindowWithNoLeadingEdgeQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/expressiontests/WindowWithNoLeadingEdgeQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/expressiontests/WindowWithNoLeadingEdgeQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/expressiontests/WindowWithNoLeadingEdgeQuery.xml diff --git a/src/backend/gporca/data/dxl/formatxml.sh b/gpcontrib/gp_orca/gporca/data/dxl/formatxml.sh similarity index 100% rename from src/backend/gporca/data/dxl/formatxml.sh rename to gpcontrib/gp_orca/gporca/data/dxl/formatxml.sh diff --git a/src/backend/gporca/data/dxl/indexjoin/positive_04.mdp b/gpcontrib/gp_orca/gporca/data/dxl/indexjoin/positive_04.mdp similarity index 100% rename from src/backend/gporca/data/dxl/indexjoin/positive_04.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/indexjoin/positive_04.mdp diff --git a/src/backend/gporca/data/dxl/metadata/md.xml b/gpcontrib/gp_orca/gporca/data/dxl/metadata/md.xml similarity index 100% rename from src/backend/gporca/data/dxl/metadata/md.xml rename to gpcontrib/gp_orca/gporca/data/dxl/metadata/md.xml diff --git a/src/backend/gporca/data/dxl/minidump/3WayJoinOnMultiDistributionColumnsTables.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/3WayJoinOnMultiDistributionColumnsTables.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/3WayJoinOnMultiDistributionColumnsTables.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/3WayJoinOnMultiDistributionColumnsTables.mdp diff --git a/src/backend/gporca/data/dxl/minidump/3WayJoinOnMultiDistributionColumnsTablesNoMotion.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/3WayJoinOnMultiDistributionColumnsTablesNoMotion.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/3WayJoinOnMultiDistributionColumnsTablesNoMotion.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/3WayJoinOnMultiDistributionColumnsTablesNoMotion.mdp diff --git a/src/backend/gporca/data/dxl/minidump/3WayJoinUsingOperatorsOfNonDefaultOpfamily.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/3WayJoinUsingOperatorsOfNonDefaultOpfamily.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/3WayJoinUsingOperatorsOfNonDefaultOpfamily.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/3WayJoinUsingOperatorsOfNonDefaultOpfamily.mdp diff --git a/src/backend/gporca/data/dxl/minidump/4WayJoinInferredPredsRemovedWith2Motion.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/4WayJoinInferredPredsRemovedWith2Motion.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/4WayJoinInferredPredsRemovedWith2Motion.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/4WayJoinInferredPredsRemovedWith2Motion.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AddEqualityPredicates.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AddEqualityPredicates.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AddEqualityPredicates.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AddEqualityPredicates.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AddPredsInSubqueries.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AddPredsInSubqueries.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AddPredsInSubqueries.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AddPredsInSubqueries.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-3.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-3.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-3.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-3.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-4.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-4.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-4.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-4.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-5.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-5.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-5.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-5.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Agg-Limit.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Agg-Limit.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Agg-Limit.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Agg-Limit.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Agg-NonSplittable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Agg-NonSplittable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Agg-NonSplittable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Agg-NonSplittable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AggSubqCollapseFalseFilter.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AggSubqCollapseFalseFilter.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AggSubqCollapseFalseFilter.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AggSubqCollapseFalseFilter.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AggWithSubqArgs.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AggWithSubqArgs.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AggWithSubqArgs.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AggWithSubqArgs.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AggWithVolatileFunc.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AggWithVolatileFunc.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AggWithVolatileFunc.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AggWithVolatileFunc.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AggonExternalTableNoMotion.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AggonExternalTableNoMotion.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AggonExternalTableNoMotion.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AggonExternalTableNoMotion.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AggregateWithSkew.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AggregateWithSkew.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AggregateWithSkew.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AggregateWithSkew.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AggregatesConstraintDeriveNegation.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AggregatesConstraintDeriveNegation.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AggregatesConstraintDeriveNegation.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AggregatesConstraintDeriveNegation.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AllSubqueryWithSubqueryInScalar.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AllSubqueryWithSubqueryInScalar.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AllSubqueryWithSubqueryInScalar.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AllSubqueryWithSubqueryInScalar.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AllowIndexOnlyScanOnAppendOnlyTable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AllowIndexOnlyScanOnAppendOnlyTable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AllowIndexOnlyScanOnAppendOnlyTable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AllowIndexOnlyScanOnAppendOnlyTable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AllowIndexOnlyScanOnMixedAppendOnlyPartitionedTable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AllowIndexOnlyScanOnMixedAppendOnlyPartitionedTable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AllowIndexOnlyScanOnMixedAppendOnlyPartitionedTable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AllowIndexOnlyScanOnMixedAppendOnlyPartitionedTable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AllowIndexOnlyScanOnMixedPartitionedTable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AllowIndexOnlyScanOnMixedPartitionedTable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AllowIndexOnlyScanOnMixedPartitionedTable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AllowIndexOnlyScanOnMixedPartitionedTable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AntiSemiJoin2Select-1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AntiSemiJoin2Select-1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AntiSemiJoin2Select-1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AntiSemiJoin2Select-1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AntiSemiJoin2Select-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AntiSemiJoin2Select-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AntiSemiJoin2Select-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AntiSemiJoin2Select-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AnyPredicate-Over-UnionOfConsts.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AnyPredicate-Over-UnionOfConsts.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AnyPredicate-Over-UnionOfConsts.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AnyPredicate-Over-UnionOfConsts.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-3.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-3.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-3.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-3.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AnySubqueryWithAllSubqueryInScalar.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AnySubqueryWithAllSubqueryInScalar.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AnySubqueryWithAllSubqueryInScalar.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AnySubqueryWithAllSubqueryInScalar.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AnySubqueryWithSubqueryInScalar.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AnySubqueryWithSubqueryInScalar.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AnySubqueryWithSubqueryInScalar.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AnySubqueryWithSubqueryInScalar.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AnySubqueryWithVolatileComp.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AnySubqueryWithVolatileComp.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AnySubqueryWithVolatileComp.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AnySubqueryWithVolatileComp.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AnySubqueryWithVolatileFunc.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AnySubqueryWithVolatileFunc.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AnySubqueryWithVolatileFunc.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AnySubqueryWithVolatileFunc.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCmp-IN-ManyElements.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ArrayCmp-IN-ManyElements.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ArrayCmp-IN-ManyElements.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ArrayCmp-IN-ManyElements.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCmpAll-Disjunct.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ArrayCmpAll-Disjunct.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ArrayCmpAll-Disjunct.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ArrayCmpAll-Disjunct.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCmpAll.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ArrayCmpAll.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ArrayCmpAll.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ArrayCmpAll.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCmpAllEmpty.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ArrayCmpAllEmpty.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ArrayCmpAllEmpty.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ArrayCmpAllEmpty.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCmpAnyEmpty.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ArrayCmpAnyEmpty.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ArrayCmpAnyEmpty.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ArrayCmpAnyEmpty.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCmpAnyEmptyLessThan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ArrayCmpAnyEmptyLessThan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ArrayCmpAnyEmptyLessThan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ArrayCmpAnyEmptyLessThan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCmpInList.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ArrayCmpInList.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ArrayCmpInList.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ArrayCmpInList.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCoerceCast.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ArrayCoerceCast.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ArrayCoerceCast.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ArrayCoerceCast.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCoerceExpr.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ArrayCoerceExpr.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ArrayCoerceExpr.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ArrayCoerceExpr.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCoerceImplicitCast.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ArrayCoerceImplicitCast.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ArrayCoerceImplicitCast.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ArrayCoerceImplicitCast.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ArrayConcat.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ArrayConcat.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ArrayConcat.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ArrayConcat.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ArrayRef.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ArrayRef.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ArrayRef.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ArrayRef.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AssertMaxOneRow.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AssertMaxOneRow.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AssertMaxOneRow.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AssertMaxOneRow.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AssertOneRowWithCorrelation.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AssertOneRowWithCorrelation.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AssertOneRowWithCorrelation.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AssertOneRowWithCorrelation.mdp diff --git a/src/backend/gporca/data/dxl/minidump/AvoidConstraintDerivationForLike.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/AvoidConstraintDerivationForLike.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/AvoidConstraintDerivationForLike.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/AvoidConstraintDerivationForLike.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BRINScan-Or.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BRINScan-Or.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BRINScan-Or.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BRINScan-Or.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BTreeIndex-Against-InList.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BTreeIndex-Against-InList.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BTreeIndex-Against-InList.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BTreeIndex-Against-InList.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BTreeIndex-Against-InListLarge.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BTreeIndex-Against-InListLarge.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BTreeIndex-Against-InListLarge.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BTreeIndex-Against-InListLarge.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BTreeIndex-Against-ScalarSubquery.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BTreeIndex-Against-ScalarSubquery.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BTreeIndex-Against-ScalarSubquery.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BTreeIndex-Against-ScalarSubquery.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Backward-IndexOnlyScan-OrderBy-on-MultiCol-Index.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Backward-IndexOnlyScan-OrderBy-on-MultiCol-Index.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Backward-IndexOnlyScan-OrderBy-on-MultiCol-Index.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Backward-IndexOnlyScan-OrderBy-on-MultiCol-Index.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Backward-IndexScan-OrderBy-on-MultiCol-Index.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Backward-IndexScan-OrderBy-on-MultiCol-Index.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Backward-IndexScan-OrderBy-on-MultiCol-Index.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Backward-IndexScan-OrderBy-on-MultiCol-Index.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Backward-IndexScan-OrderBy-on-SingleCol-Index.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Backward-IndexScan-OrderBy-on-SingleCol-Index.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Backward-IndexScan-OrderBy-on-SingleCol-Index.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Backward-IndexScan-OrderBy-on-SingleCol-Index.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BasicQueryParam.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BasicQueryParam.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BasicQueryParam.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BasicQueryParam.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapBoolAnd.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapBoolAnd.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapBoolAnd.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapBoolAnd.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapBoolOp-DeepTree.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapBoolOp-DeepTree.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapBoolOp-DeepTree.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapBoolOp-DeepTree.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapBoolOp-DeepTree2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapBoolOp-DeepTree2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapBoolOp-DeepTree2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapBoolOp-DeepTree2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapBoolOp-DeepTree3.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapBoolOp-DeepTree3.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapBoolOp-DeepTree3.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapBoolOp-DeepTree3.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapBoolOr-BoolColumn.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapBoolOr-BoolColumn.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapBoolOr-BoolColumn.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapBoolOr-BoolColumn.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapBoolOr.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapBoolOr.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapBoolOr.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapBoolOr.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndex-Against-InList.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndex-Against-InList.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapIndex-Against-InList.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndex-Against-InList.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndex-ChooseHashJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndex-ChooseHashJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapIndex-ChooseHashJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndex-ChooseHashJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexApply-Basic-SelfJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexApply-Basic-SelfJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapIndexApply-Basic-SelfJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexApply-Basic-SelfJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexApply-Basic-TwoTables.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexApply-Basic-TwoTables.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapIndexApply-Basic-TwoTables.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexApply-Basic-TwoTables.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexApply-Complex-Condition.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexApply-Complex-Condition.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapIndexApply-Complex-Condition.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexApply-Complex-Condition.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexApply-InnerSelect-Basic.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexApply-InnerSelect-Basic.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapIndexApply-InnerSelect-Basic.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexApply-InnerSelect-Basic.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexApply-InnerSelect-PartTable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexApply-InnerSelect-PartTable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapIndexApply-InnerSelect-PartTable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexApply-InnerSelect-PartTable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexApply-PartTable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexApply-PartTable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapIndexApply-PartTable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexApply-PartTable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexNLJWithProject.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexNLJWithProject.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapIndexNLJWithProject.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexNLJWithProject.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexNLJWithProjectNoFilt.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexNLJWithProjectNoFilt.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapIndexNLJWithProjectNoFilt.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexNLJWithProjectNoFilt.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexNLOJWithProject.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexNLOJWithProject.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapIndexNLOJWithProject.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexNLOJWithProject.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexNLOJWithProjectNonPart.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexNLOJWithProjectNonPart.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapIndexNLOJWithProjectNonPart.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexNLOJWithProjectNonPart.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexScan-WithUnsupportedOperatorFilter.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexScan-WithUnsupportedOperatorFilter.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapIndexScan-WithUnsupportedOperatorFilter.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexScan-WithUnsupportedOperatorFilter.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexScan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexScan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapIndexScan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexScan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexScanChooseIndex.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexScanChooseIndex.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapIndexScanChooseIndex.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexScanChooseIndex.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexScanCost.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexScanCost.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapIndexScanCost.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexScanCost.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexUnsupportedOperator.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexUnsupportedOperator.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapIndexUnsupportedOperator.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapIndexUnsupportedOperator.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapScan-Hetrogeneous-Partitioned.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapScan-Hetrogeneous-Partitioned.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapScan-Hetrogeneous-Partitioned.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapScan-Hetrogeneous-Partitioned.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapTableScan-AO-Btree-PickIndexWithNoGap.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapTableScan-AO-Btree-PickIndexWithNoGap.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapTableScan-AO-Btree-PickIndexWithNoGap.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapTableScan-AO-Btree-PickIndexWithNoGap.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapTableScan-AO-Btree-PickOnlyHighNDV.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapTableScan-AO-Btree-PickOnlyHighNDV.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapTableScan-AO-Btree-PickOnlyHighNDV.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapTableScan-AO-Btree-PickOnlyHighNDV.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapTableScan-AO-Btree.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapTableScan-AO-Btree.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapTableScan-AO-Btree.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapTableScan-AO-Btree.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapTableScan-AO.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapTableScan-AO.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapTableScan-AO.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapTableScan-AO.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapTableScan-AndCondition.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapTableScan-AndCondition.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapTableScan-AndCondition.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapTableScan-AndCondition.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapTableScan-Basic.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapTableScan-Basic.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapTableScan-Basic.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapTableScan-Basic.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapTableScan-ColumnOnRightSide.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapTableScan-ColumnOnRightSide.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapTableScan-ColumnOnRightSide.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapTableScan-ColumnOnRightSide.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapTableScan-ComplexConjDisj.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapTableScan-ComplexConjDisj.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapTableScan-ComplexConjDisj.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapTableScan-ComplexConjDisj.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BitmapTableScan-ConjDisjWithOuterRefs.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapTableScan-ConjDisjWithOuterRefs.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BitmapTableScan-ConjDisjWithOuterRefs.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BitmapTableScan-ConjDisjWithOuterRefs.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Blocking-Spool-Parallel-Union-All.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Blocking-Spool-Parallel-Union-All.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Blocking-Spool-Parallel-Union-All.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Blocking-Spool-Parallel-Union-All.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BpCharMCVCardinalityEquals.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BpCharMCVCardinalityEquals.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BpCharMCVCardinalityEquals.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BpCharMCVCardinalityEquals.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BpCharMCVCardinalityGreaterThan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BpCharMCVCardinalityGreaterThan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BpCharMCVCardinalityGreaterThan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BpCharMCVCardinalityGreaterThan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BroadcastSkewedHashjoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BroadcastSkewedHashjoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BroadcastSkewedHashjoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BroadcastSkewedHashjoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BtreeIndexNLJWithProjectNoPart.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BtreeIndexNLJWithProjectNoPart.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BtreeIndexNLJWithProjectNoPart.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BtreeIndexNLJWithProjectNoPart.mdp diff --git a/src/backend/gporca/data/dxl/minidump/BtreeIndexNLOJWithProject.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/BtreeIndexNLOJWithProject.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/BtreeIndexNLOJWithProject.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/BtreeIndexNLOJWithProject.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CArrayExpansionTest/JoinWithInListExpand.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CArrayExpansionTest/JoinWithInListExpand.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CArrayExpansionTest/JoinWithInListExpand.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CArrayExpansionTest/JoinWithInListExpand.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CArrayExpansionTest/JoinWithInListNoExpand.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CArrayExpansionTest/JoinWithInListNoExpand.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CArrayExpansionTest/JoinWithInListNoExpand.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CArrayExpansionTest/JoinWithInListNoExpand.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CJoinOrderDPTest/JoinOrderWithDP.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CJoinOrderDPTest/JoinOrderWithDP.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CJoinOrderDPTest/JoinOrderWithDP.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CJoinOrderDPTest/JoinOrderWithDP.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CJoinOrderDPTest/JoinOrderWithOutDP.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CJoinOrderDPTest/JoinOrderWithOutDP.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CJoinOrderDPTest/JoinOrderWithOutDP.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CJoinOrderDPTest/JoinOrderWithOutDP.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/FallBackToSerialAppend.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/FallBackToSerialAppend.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/FallBackToSerialAppend.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/FallBackToSerialAppend.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/NoOpMotionUsesOnlyGroupOutputColumns.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/NoOpMotionUsesOnlyGroupOutputColumns.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/NoOpMotionUsesOnlyGroupOutputColumns.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/NoOpMotionUsesOnlyGroupOutputColumns.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-ConstTable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-ConstTable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-ConstTable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-ConstTable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-Insert.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-Insert.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-Insert.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-Insert.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-Select.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-Select.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-Select.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-Select.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithNoRedistributableColumns.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithNoRedistributableColumns.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithNoRedistributableColumns.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithNoRedistributableColumns.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithNotEqualNumOfDistrColumns.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithNotEqualNumOfDistrColumns.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithNotEqualNumOfDistrColumns.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithNotEqualNumOfDistrColumns.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithSingleNotRedistributableColumn.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithSingleNotRedistributableColumn.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithSingleNotRedistributableColumn.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithSingleNotRedistributableColumn.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/RandomDistributedChildrenUnhashableColumns.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/RandomDistributedChildrenUnhashableColumns.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/RandomDistributedChildrenUnhashableColumns.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/RandomDistributedChildrenUnhashableColumns.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/RedundantMotionParallelUnionAll.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/RedundantMotionParallelUnionAll.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/RedundantMotionParallelUnionAll.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/RedundantMotionParallelUnionAll.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/TwoHashedTables.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/TwoHashedTables.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/TwoHashedTables.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/TwoHashedTables.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfMultipleSetRetFuncs.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfMultipleSetRetFuncs.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfMultipleSetRetFuncs.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfMultipleSetRetFuncs.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfMultipleSetRetFuncsAndUnusedScalar.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfMultipleSetRetFuncsAndUnusedScalar.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfMultipleSetRetFuncsAndUnusedScalar.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfMultipleSetRetFuncsAndUnusedScalar.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfSetRefFuncsOnTopTbl.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfSetRefFuncsOnTopTbl.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfSetRefFuncsOnTopTbl.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfSetRefFuncsOnTopTbl.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfSetRetFuncsAndUnusedScalar.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfSetRetFuncsAndUnusedScalar.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfSetRetFuncsAndUnusedScalar.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfSetRetFuncsAndUnusedScalar.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfSingleSetRetFuncs.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfSingleSetRetFuncs.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfSingleSetRetFuncs.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfSingleSetRetFuncs.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/AllColsUsed.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CPruneColumnsTest/AllColsUsed.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/AllColsUsed.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CPruneColumnsTest/AllColsUsed.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/MultiLevelSubqueryWithSetRetFuncs.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CPruneColumnsTest/MultiLevelSubqueryWithSetRetFuncs.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/MultiLevelSubqueryWithSetRetFuncs.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CPruneColumnsTest/MultiLevelSubqueryWithSetRetFuncs.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/MultiLevelSubqueryWithSetRetFuncsAndScalarFuncs.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CPruneColumnsTest/MultiLevelSubqueryWithSetRetFuncsAndScalarFuncs.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/MultiLevelSubqueryWithSetRetFuncsAndScalarFuncs.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CPruneColumnsTest/MultiLevelSubqueryWithSetRetFuncsAndScalarFuncs.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/PruneIntermediateUnusedColumns.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CPruneColumnsTest/PruneIntermediateUnusedColumns.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/PruneIntermediateUnusedColumns.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CPruneColumnsTest/PruneIntermediateUnusedColumns.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/UnusedSetRetFuncAndUsedScalarFunc.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CPruneColumnsTest/UnusedSetRetFuncAndUsedScalarFunc.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/UnusedSetRetFuncAndUsedScalarFunc.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CPruneColumnsTest/UnusedSetRetFuncAndUsedScalarFunc.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/UsedSetRetFuncAndUnusedScalarFunc.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CPruneColumnsTest/UsedSetRetFuncAndUnusedScalarFunc.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/UsedSetRetFuncAndUnusedScalarFunc.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CPruneColumnsTest/UsedSetRetFuncAndUnusedScalarFunc.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CSQ-VolatileTVF.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CSQ-VolatileTVF.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CSQ-VolatileTVF.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CSQ-VolatileTVF.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTAS-Random.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTAS-Random.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTAS-Random.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTAS-Random.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTAS-With-Global-Local-Agg.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTAS-With-Global-Local-Agg.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTAS-With-Global-Local-Agg.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTAS-With-Global-Local-Agg.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTAS-random-distr.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTAS-random-distr.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTAS-random-distr.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTAS-random-distr.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTAS-random-distributed-from-replicated-distributed-table.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTAS-random-distributed-from-replicated-distributed-table.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTAS-random-distributed-from-replicated-distributed-table.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTAS-random-distributed-from-replicated-distributed-table.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTAS-with-Limit.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTAS-with-Limit.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTAS-with-Limit.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTAS-with-Limit.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTAS-with-hashed-distributed-external-table.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTAS-with-hashed-distributed-external-table.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTAS-with-hashed-distributed-external-table.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTAS-with-hashed-distributed-external-table.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTAS-with-randomly-distributed-external-table.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTAS-with-randomly-distributed-external-table.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTAS-with-randomly-distributed-external-table.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTAS-with-randomly-distributed-external-table.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTAS.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTAS.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTAS.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTAS.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTAS_OrderedAgg_multiple_cols.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTAS_OrderedAgg_multiple_cols.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTAS_OrderedAgg_multiple_cols.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTAS_OrderedAgg_multiple_cols.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTE-1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTE-1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTE-10.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-10.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTE-10.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-10.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTE-11.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-11.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTE-11.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-11.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTE-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTE-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTE-3.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-3.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTE-3.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-3.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTE-4.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-4.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTE-4.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-4.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTE-5.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-5.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTE-5.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-5.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTE-6.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-6.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTE-6.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-6.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTE-7.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-7.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTE-7.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-7.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTE-8.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-8.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTE-8.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-8.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTE-9.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-9.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTE-9.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-9.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTE-Join-Redistribute-Producer.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-Join-Redistribute-Producer.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTE-Join-Redistribute-Producer.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-Join-Redistribute-Producer.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTE-NestedWithPrunedProducer.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-NestedWithPrunedProducer.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTE-NestedWithPrunedProducer.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-NestedWithPrunedProducer.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTE-NoPushProperties.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-NoPushProperties.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTE-NoPushProperties.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-NoPushProperties.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTE-PartTbl.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-PartTbl.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTE-PartTbl.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-PartTbl.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTE-Preds1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-Preds1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTE-Preds1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-Preds1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTE-Preds2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-Preds2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTE-Preds2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-Preds2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTE-PushProperties.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-PushProperties.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTE-PushProperties.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-PushProperties.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTE-SetOp.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-SetOp.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTE-SetOp.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-SetOp.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTE-ValuesScan-ProjList.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-ValuesScan-ProjList.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTE-ValuesScan-ProjList.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-ValuesScan-ProjList.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTE-volatile.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-volatile.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTE-volatile.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-volatile.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTE-with-random-filter.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-with-random-filter.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTE-with-random-filter.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE-with-random-filter.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTE15HAReplicated.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE15HAReplicated.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTE15HAReplicated.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE15HAReplicated.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTE15Replicated.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE15Replicated.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTE15Replicated.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE15Replicated.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTE2HAReplicated.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE2HAReplicated.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTE2HAReplicated.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE2HAReplicated.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTE2Replicated.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE2Replicated.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTE2Replicated.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTE2Replicated.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTEConstraintDeriveNegation.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTEConstraintDeriveNegation.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTEConstraintDeriveNegation.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTEConstraintDeriveNegation.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTEMergeGroupsCircularDeriveStats.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTEMergeGroupsCircularDeriveStats.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTEMergeGroupsCircularDeriveStats.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTEMergeGroupsCircularDeriveStats.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTEMisAlignedProducerConsumer.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTEMisAlignedProducerConsumer.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTEMisAlignedProducerConsumer.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTEMisAlignedProducerConsumer.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTEWithMergedGroup.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTEWithMergedGroup.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTEWithMergedGroup.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTEWithMergedGroup.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTEWithOuterReferences.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTEWithOuterReferences.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTEWithOuterReferences.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTEWithOuterReferences.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTEWithVolatileFunction.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTEWithVolatileFunction.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTEWithVolatileFunction.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTEWithVolatileFunction.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTEinlining.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTEinlining.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTEinlining.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTEinlining.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTG-Filter.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTG-Filter.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTG-Filter.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTG-Filter.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CTG-Join.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CTG-Join.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CTG-Join.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CTG-Join.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CannotCollapseCascadeProjects.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CannotCollapseCascadeProjects.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CannotCollapseCascadeProjects.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CannotCollapseCascadeProjects.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CannotPullGrpColAboveAgg.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CannotPullGrpColAboveAgg.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CannotPullGrpColAboveAgg.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CannotPullGrpColAboveAgg.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CapGbCardToSelectCard.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CapGbCardToSelectCard.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CapGbCardToSelectCard.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CapGbCardToSelectCard.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Cascaded-UnionAll-Differing-Cols-Order.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Cascaded-UnionAll-Differing-Cols-Order.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Cascaded-UnionAll-Differing-Cols-Order.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Cascaded-UnionAll-Differing-Cols-Order.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Cascaded-UnionAll-Differing-Cols.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Cascaded-UnionAll-Differing-Cols.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Cascaded-UnionAll-Differing-Cols.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Cascaded-UnionAll-Differing-Cols.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Cascaded-UnionAll-Same-Cols-Order.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Cascaded-UnionAll-Same-Cols-Order.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Cascaded-UnionAll-Same-Cols-Order.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Cascaded-UnionAll-Same-Cols-Order.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CastOnSubquery.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CastOnSubquery.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CastOnSubquery.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CastOnSubquery.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CastedInClauseWithMCV.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CastedInClauseWithMCV.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CastedInClauseWithMCV.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CastedInClauseWithMCV.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CastedScalarIf-On-Index-Key.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CastedScalarIf-On-Index-Key.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CastedScalarIf-On-Index-Key.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CastedScalarIf-On-Index-Key.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Char-Cardinality.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Char-Cardinality.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Char-Cardinality.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Char-Cardinality.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CheckAsUser.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CheckAsUser.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CheckAsUser.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CheckAsUser.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Citext-Cardinality.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Citext-Cardinality.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Citext-Cardinality.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Citext-Cardinality.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Coalesce-With-Subquery.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Coalesce-With-Subquery.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Coalesce-With-Subquery.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Coalesce-With-Subquery.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CoerceToDomain.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CoerceToDomain.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CoerceToDomain.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CoerceToDomain.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CoerceViaIO.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CoerceViaIO.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CoerceViaIO.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CoerceViaIO.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CollapseCascadeProjects2of2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CollapseCascadeProjects2of2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CollapseCascadeProjects2of2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CollapseCascadeProjects2of2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CollapseCascadeProjects2of3.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CollapseCascadeProjects2of3.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CollapseCascadeProjects2of3.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CollapseCascadeProjects2of3.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CollapseGb-MultipleColumn.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CollapseGb-MultipleColumn.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CollapseGb-MultipleColumn.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CollapseGb-MultipleColumn.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CollapseGb-Nested.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CollapseGb-Nested.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CollapseGb-Nested.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CollapseGb-Nested.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CollapseGb-SingleColumn.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CollapseGb-SingleColumn.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CollapseGb-SingleColumn.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CollapseGb-SingleColumn.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CollapseGb-With-Agg-Funcs.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CollapseGb-With-Agg-Funcs.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CollapseGb-With-Agg-Funcs.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CollapseGb-With-Agg-Funcs.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CollapseGb-Without-Agg-Funcs.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CollapseGb-Without-Agg-Funcs.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CollapseGb-Without-Agg-Funcs.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CollapseGb-Without-Agg-Funcs.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CollapseNot.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CollapseNot.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CollapseNot.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CollapseNot.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CollapseProject-SetReturning-CTE.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CollapseProject-SetReturning-CTE.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CollapseProject-SetReturning-CTE.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CollapseProject-SetReturning-CTE.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CollapseProject-SetReturning.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CollapseProject-SetReturning.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CollapseProject-SetReturning.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CollapseProject-SetReturning.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CompositeTypeRelMdId.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CompositeTypeRelMdId.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CompositeTypeRelMdId.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CompositeTypeRelMdId.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ComputedGroupByCol.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ComputedGroupByCol.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ComputedGroupByCol.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ComputedGroupByCol.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ConstScalarFuncNotPushedBelowGather.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstScalarFuncNotPushedBelowGather.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ConstScalarFuncNotPushedBelowGather.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstScalarFuncNotPushedBelowGather.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqUnderProjectNoOuterRef.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstTblGetUnderSubqUnderProjectNoOuterRef.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqUnderProjectNoOuterRef.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstTblGetUnderSubqUnderProjectNoOuterRef.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqUnderProjectWithOuterRef.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstTblGetUnderSubqUnderProjectWithOuterRef.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqUnderProjectWithOuterRef.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstTblGetUnderSubqUnderProjectWithOuterRef.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqWithNoOuterRef.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstTblGetUnderSubqWithNoOuterRef.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqWithNoOuterRef.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstTblGetUnderSubqWithNoOuterRef.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqWithOuterRef.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstTblGetUnderSubqWithOuterRef.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqWithOuterRef.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstTblGetUnderSubqWithOuterRef.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalIncludesNull.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstraintIntervalIncludesNull.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ConstraintIntervalIncludesNull.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstraintIntervalIncludesNull.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalNotIncludesNull.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstraintIntervalNotIncludesNull.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ConstraintIntervalNotIncludesNull.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstraintIntervalNotIncludesNull.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithBoolIncludesNull.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstraintIntervalWithBoolIncludesNull.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithBoolIncludesNull.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstraintIntervalWithBoolIncludesNull.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithBoolNotIncludesNull.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstraintIntervalWithBoolNotIncludesNull.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithBoolNotIncludesNull.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstraintIntervalWithBoolNotIncludesNull.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithInIncludesNull.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstraintIntervalWithInIncludesNull.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithInIncludesNull.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstraintIntervalWithInIncludesNull.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithInIncludesNullArray.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstraintIntervalWithInIncludesNullArray.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithInIncludesNullArray.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstraintIntervalWithInIncludesNullArray.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithInNotIncludesNull.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstraintIntervalWithInNotIncludesNull.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithInNotIncludesNull.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstraintIntervalWithInNotIncludesNull.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithMultiColumnsIncludeNull.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstraintIntervalWithMultiColumnsIncludeNull.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithMultiColumnsIncludeNull.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstraintIntervalWithMultiColumnsIncludeNull.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithMultiColumnsNotIncludeNull.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstraintIntervalWithMultiColumnsNotIncludeNull.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithMultiColumnsNotIncludeNull.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstraintIntervalWithMultiColumnsNotIncludeNull.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithNotIncludesNull.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstraintIntervalWithNotIncludesNull.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithNotIncludesNull.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ConstraintIntervalWithNotIncludesNull.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ConvertBoolConstNullToConstTableFalseFilter.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ConvertBoolConstNullToConstTableFalseFilter.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ConvertBoolConstNullToConstTableFalseFilter.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ConvertBoolConstNullToConstTableFalseFilter.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ConvertHashToRandomInsert.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ConvertHashToRandomInsert.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ConvertHashToRandomInsert.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ConvertHashToRandomInsert.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ConvertHashToRandomSelect.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ConvertHashToRandomSelect.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ConvertHashToRandomSelect.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ConvertHashToRandomSelect.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Correlated-AntiSemiJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlated-AntiSemiJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Correlated-AntiSemiJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlated-AntiSemiJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Correlated-LASJ-With-Outer-Col.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlated-LASJ-With-Outer-Col.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Correlated-LASJ-With-Outer-Col.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlated-LASJ-With-Outer-Col.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Correlated-LASJ-With-Outer-Const.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlated-LASJ-With-Outer-Const.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Correlated-LASJ-With-Outer-Const.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlated-LASJ-With-Outer-Const.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Correlated-LASJ-With-Outer-Expr.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlated-LASJ-With-Outer-Expr.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Correlated-LASJ-With-Outer-Expr.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlated-LASJ-With-Outer-Expr.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Correlated-SemiJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlated-SemiJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Correlated-SemiJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlated-SemiJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Correlated-Stat-Function-Dependency-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlated-Stat-Function-Dependency-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Correlated-Stat-Function-Dependency-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlated-Stat-Function-Dependency-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Correlated-Stat-Function-Dependency-3.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlated-Stat-Function-Dependency-3.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Correlated-Stat-Function-Dependency-3.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlated-Stat-Function-Dependency-3.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Correlated-Stat-Function-Dependency.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlated-Stat-Function-Dependency.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Correlated-Stat-Function-Dependency.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlated-Stat-Function-Dependency.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Correlated-Stat-NDistinct-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlated-Stat-NDistinct-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Correlated-Stat-NDistinct-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlated-Stat-NDistinct-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Correlated-Stat-NDistinct-3.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlated-Stat-NDistinct-3.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Correlated-Stat-NDistinct-3.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlated-Stat-NDistinct-3.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Correlated-Stat-NDistinct-4.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlated-Stat-NDistinct-4.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Correlated-Stat-NDistinct-4.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlated-Stat-NDistinct-4.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Correlated-Stat-NDistinct-5.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlated-Stat-NDistinct-5.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Correlated-Stat-NDistinct-5.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlated-Stat-NDistinct-5.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Correlated-Stat-NDistinct.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlated-Stat-NDistinct.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Correlated-Stat-NDistinct.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlated-Stat-NDistinct.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedAntiSemiJoin-True.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CorrelatedAntiSemiJoin-True.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CorrelatedAntiSemiJoin-True.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CorrelatedAntiSemiJoin-True.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiJoin-Limit.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiJoin-Limit.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiJoin-Limit.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiJoin-Limit.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiJoin-True.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiJoin-True.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiJoin-True.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiJoin-True.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiNotIn-True.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiNotIn-True.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiNotIn-True.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiNotIn-True.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedLeftSemiNLJoinWithLimit.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CorrelatedLeftSemiNLJoinWithLimit.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CorrelatedLeftSemiNLJoinWithLimit.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CorrelatedLeftSemiNLJoinWithLimit.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedNLJ-PartSelector-Subplan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CorrelatedNLJ-PartSelector-Subplan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CorrelatedNLJ-PartSelector-Subplan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CorrelatedNLJ-PartSelector-Subplan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedNLJWithStreamingSpool.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CorrelatedNLJWithStreamingSpool.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CorrelatedNLJWithStreamingSpool.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CorrelatedNLJWithStreamingSpool.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedNLJWithTrueCondition.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CorrelatedNLJWithTrueCondition.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CorrelatedNLJWithTrueCondition.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CorrelatedNLJWithTrueCondition.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedSemiJoin-True.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CorrelatedSemiJoin-True.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CorrelatedSemiJoin-True.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CorrelatedSemiJoin-True.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedSubqueryWithAggWindowFunc.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CorrelatedSubqueryWithAggWindowFunc.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CorrelatedSubqueryWithAggWindowFunc.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CorrelatedSubqueryWithAggWindowFunc.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Correlation-With-Casting-1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlation-With-Casting-1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Correlation-With-Casting-1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlation-With-Casting-1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Correlation-With-Casting-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlation-With-Casting-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Correlation-With-Casting-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Correlation-With-Casting-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CountAny.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CountAny.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CountAny.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CountAny.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CountStar.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CountStar.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CountStar.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CountStar.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CoveringIndex-1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CoveringIndex-1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CoveringIndex-1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CoveringIndex-1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CoveringIndex-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CoveringIndex-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CoveringIndex-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CoveringIndex-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CoveringIndex-3.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CoveringIndex-3.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CoveringIndex-3.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CoveringIndex-3.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CoveringIndex-Cost-1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CoveringIndex-Cost-1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CoveringIndex-Cost-1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CoveringIndex-Cost-1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CoveringIndex-Cost-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CoveringIndex-Cost-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CoveringIndex-Cost-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CoveringIndex-Cost-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CoveringIndex-DoesNotSupport-Gin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CoveringIndex-DoesNotSupport-Gin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CoveringIndex-DoesNotSupport-Gin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CoveringIndex-DoesNotSupport-Gin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/CoveringIndex-DoesSupport-Gist.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/CoveringIndex-DoesSupport-Gist.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/CoveringIndex-DoesSupport-Gist.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/CoveringIndex-DoesSupport-Gist.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DML-ComputeScalar-With-Outerref.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DML-ComputeScalar-With-Outerref.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DML-ComputeScalar-With-Outerref.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DML-ComputeScalar-With-Outerref.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DML-Filter-With-OuterRef.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DML-Filter-With-OuterRef.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DML-Filter-With-OuterRef.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DML-Filter-With-OuterRef.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DML-Replicated-Input.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DML-Replicated-Input.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DML-Replicated-Input.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DML-Replicated-Input.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DML-UnionAll-With-OuterRef.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DML-UnionAll-With-OuterRef.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DML-UnionAll-With-OuterRef.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DML-UnionAll-With-OuterRef.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DML-UnionAll-With-Universal-Child.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DML-UnionAll-With-Universal-Child.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DML-UnionAll-With-Universal-Child.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DML-UnionAll-With-Universal-Child.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DML-Volatile-Function.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DML-Volatile-Function.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DML-Volatile-Function.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DML-Volatile-Function.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DML-With-CoordinatorOnlyTable-1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DML-With-CoordinatorOnlyTable-1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DML-With-CoordinatorOnlyTable-1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DML-With-CoordinatorOnlyTable-1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DML-With-CorrelatedNLJ-With-Universal-Child.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DML-With-CorrelatedNLJ-With-Universal-Child.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DML-With-CorrelatedNLJ-With-Universal-Child.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DML-With-CorrelatedNLJ-With-Universal-Child.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DML-With-HJ-And-UniversalChild.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DML-With-HJ-And-UniversalChild.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DML-With-HJ-And-UniversalChild.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DML-With-HJ-And-UniversalChild.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DML-With-Join-With-Universal-Child.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DML-With-Join-With-Universal-Child.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DML-With-Join-With-Universal-Child.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DML-With-Join-With-Universal-Child.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DML-With-WindowFunc-OuterRef.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DML-With-WindowFunc-OuterRef.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DML-With-WindowFunc-OuterRef.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DML-With-WindowFunc-OuterRef.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DMLCollapseProject.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DMLCollapseProject.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DMLCollapseProject.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DMLCollapseProject.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DPE-IN.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DPE-IN.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DPE-IN.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DPE-IN.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DPE-NOT-IN.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DPE-NOT-IN.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DPE-NOT-IN.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DPE-NOT-IN.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DPE-SemiJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DPE-SemiJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DPE-SemiJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DPE-SemiJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DPE-with-unsupported-pred.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DPE-with-unsupported-pred.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DPE-with-unsupported-pred.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DPE-with-unsupported-pred.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DPv2GreedyOnly.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DPv2GreedyOnly.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DPv2GreedyOnly.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DPv2GreedyOnly.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DPv2MinCardOnly.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DPv2MinCardOnly.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DPv2MinCardOnly.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DPv2MinCardOnly.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DPv2QueryOnly.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DPv2QueryOnly.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DPv2QueryOnly.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DPv2QueryOnly.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DQA-1-RegularAgg.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DQA-1-RegularAgg.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DQA-1-RegularAgg.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DQA-1-RegularAgg.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DQA-2-RegularAgg.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DQA-2-RegularAgg.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DQA-2-RegularAgg.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DQA-2-RegularAgg.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DQA-GroupBy-HashAggregate1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DQA-GroupBy-HashAggregate1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DQA-GroupBy-HashAggregate1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DQA-GroupBy-HashAggregate1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DQA-GroupBy-HashAggregate2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DQA-GroupBy-HashAggregate2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DQA-GroupBy-HashAggregate2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DQA-GroupBy-HashAggregate2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DQA-InnerJoin-GroupBy-HashAggregate.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DQA-InnerJoin-GroupBy-HashAggregate.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DQA-InnerJoin-GroupBy-HashAggregate.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DQA-InnerJoin-GroupBy-HashAggregate.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DQA-KeepOuterReference.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DQA-KeepOuterReference.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DQA-KeepOuterReference.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DQA-KeepOuterReference.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DQA-NonRedistributableCol.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DQA-NonRedistributableCol.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DQA-NonRedistributableCol.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DQA-NonRedistributableCol.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DQA-SplitScalar.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DQA-SplitScalar.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DQA-SplitScalar.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DQA-SplitScalar.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DQA-SplitScalarOnDistCol.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DQA-SplitScalarOnDistCol.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DQA-SplitScalarOnDistCol.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DQA-SplitScalarOnDistCol.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DQA-SplitScalarWithAggAndGuc.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DQA-SplitScalarWithAggAndGuc.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DQA-SplitScalarWithAggAndGuc.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DQA-SplitScalarWithAggAndGuc.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DQA-SplitScalarWithGuc.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DQA-SplitScalarWithGuc.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DQA-SplitScalarWithGuc.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DQA-SplitScalarWithGuc.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DTS-Hetrogeneous-Partitioned.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DTS-Hetrogeneous-Partitioned.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DTS-Hetrogeneous-Partitioned.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DTS-Hetrogeneous-Partitioned.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Date-TimeStamp-HashJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Date-TimeStamp-HashJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Date-TimeStamp-HashJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Date-TimeStamp-HashJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DeduplicatePredicates.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DeduplicatePredicates.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DeduplicatePredicates.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DeduplicatePredicates.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Delete-Check-AssignedQueryIdForTargetRel.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Delete-Check-AssignedQueryIdForTargetRel.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Delete-Check-AssignedQueryIdForTargetRel.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Delete-Check-AssignedQueryIdForTargetRel.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Delete-With-Limit-In-Subquery.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Delete-With-Limit-In-Subquery.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Delete-With-Limit-In-Subquery.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Delete-With-Limit-In-Subquery.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DeleteMismatchedDistribution.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DeleteMismatchedDistribution.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DeleteMismatchedDistribution.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DeleteMismatchedDistribution.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DeleteRandomDistr.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DeleteRandomDistr.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DeleteRandomDistr.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DeleteRandomDistr.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DeleteRandomlyDistributedTable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DeleteRandomlyDistributedTable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DeleteRandomlyDistributedTable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DeleteRandomlyDistributedTable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DeleteRandomlyDistributedTableJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DeleteRandomlyDistributedTableJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DeleteRandomlyDistributedTableJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DeleteRandomlyDistributedTableJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-DynamicIndexScan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-DynamicIndexScan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DirectDispatch-DynamicIndexScan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-DynamicIndexScan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId-MultiCol-Conjunction.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId-MultiCol-Conjunction.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId-MultiCol-Conjunction.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId-MultiCol-Conjunction.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId-SingleCol-Conjunction.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId-SingleCol-Conjunction.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId-SingleCol-Conjunction.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId-SingleCol-Conjunction.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-IndexScan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-IndexScan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DirectDispatch-IndexScan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-IndexScan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-MultiCol-Disjunction.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-MultiCol-Disjunction.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DirectDispatch-MultiCol-Disjunction.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-MultiCol-Disjunction.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-MultiCol-Negative.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-MultiCol-Negative.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DirectDispatch-MultiCol-Negative.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-MultiCol-Negative.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-MultiCol.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-MultiCol.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DirectDispatch-MultiCol.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-MultiCol.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-RandDistTable-Disjunction.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-RandDistTable-Disjunction.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DirectDispatch-RandDistTable-Disjunction.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-RandDistTable-Disjunction.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-RandDistTable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-RandDistTable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DirectDispatch-RandDistTable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-RandDistTable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-SingleCol-Disjunction-IsNull.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-SingleCol-Disjunction-IsNull.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DirectDispatch-SingleCol-Disjunction-IsNull.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-SingleCol-Disjunction-IsNull.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-SingleCol-Disjunction-Negative.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-SingleCol-Disjunction-Negative.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DirectDispatch-SingleCol-Disjunction-Negative.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-SingleCol-Disjunction-Negative.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-SingleCol-Disjunction.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-SingleCol-Disjunction.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DirectDispatch-SingleCol-Disjunction.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-SingleCol-Disjunction.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-SingleCol.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-SingleCol.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DirectDispatch-SingleCol.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DirectDispatch-SingleCol.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DisableBroadcastThreshold.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DisableBroadcastThreshold.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DisableBroadcastThreshold.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DisableBroadcastThreshold.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DiscardRedistributeHashJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DiscardRedistributeHashJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DiscardRedistributeHashJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DiscardRedistributeHashJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Distinct-LegacyOpfamily.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Distinct-LegacyOpfamily.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Distinct-LegacyOpfamily.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Distinct-LegacyOpfamily.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DistinctAgg-NonSplittable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DistinctAgg-NonSplittable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DistinctAgg-NonSplittable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DistinctAgg-NonSplittable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DistinctQueryWithMotions.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DistinctQueryWithMotions.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DistinctQueryWithMotions.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DistinctQueryWithMotions.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DonotPushPartConstThruLimit.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DonotPushPartConstThruLimit.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DonotPushPartConstThruLimit.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DonotPushPartConstThruLimit.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DontAddRedistributeBeforeInsert-1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DontAddRedistributeBeforeInsert-1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DontAddRedistributeBeforeInsert-1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DontAddRedistributeBeforeInsert-1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DontAddRedistributeBeforeInsert-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DontAddRedistributeBeforeInsert-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DontAddRedistributeBeforeInsert-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DontAddRedistributeBeforeInsert-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DoubleNDVCardinalityEquals.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DoubleNDVCardinalityEquals.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DoubleNDVCardinalityEquals.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DoubleNDVCardinalityEquals.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DqaHavingMax.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DqaHavingMax.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DqaHavingMax.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DqaHavingMax.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DqaMax.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DqaMax.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DqaMax.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DqaMax.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DqaMin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DqaMin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DqaMin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DqaMin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DqaNoRedistribute.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DqaNoRedistribute.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DqaNoRedistribute.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DqaNoRedistribute.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DqaSubqueryMax.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DqaSubqueryMax.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DqaSubqueryMax.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DqaSubqueryMax.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DuplicateGrpCol.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DuplicateGrpCol.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DuplicateGrpCol.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DuplicateGrpCol.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicBitmapBoolOp.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicBitmapBoolOp.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicBitmapBoolOp.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicBitmapBoolOp.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicBitmapIndexScan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicBitmapIndexScan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicBitmapIndexScan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicBitmapIndexScan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicBitmapTableScan-Basic.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicBitmapTableScan-Basic.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicBitmapTableScan-Basic.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicBitmapTableScan-Basic.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicBitmapTableScan-Heterogeneous.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicBitmapTableScan-Heterogeneous.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicBitmapTableScan-Heterogeneous.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicBitmapTableScan-Heterogeneous.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicBitmapTableScan-UUID.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicBitmapTableScan-UUID.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicBitmapTableScan-UUID.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicBitmapTableScan-UUID.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexGet-OuterRefs.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexGet-OuterRefs.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicIndexGet-OuterRefs.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexGet-OuterRefs.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexGetDroppedCols.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexGetDroppedCols.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicIndexGetDroppedCols.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexGetDroppedCols.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexOnlyScan-Homogenous.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexOnlyScan-Homogenous.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicIndexOnlyScan-Homogenous.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexOnlyScan-Homogenous.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexOnlyScan-InnerJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexOnlyScan-InnerJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicIndexOnlyScan-InnerJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexOnlyScan-InnerJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexOnlyScan-LeftJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexOnlyScan-LeftJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicIndexOnlyScan-LeftJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexOnlyScan-LeftJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexOnlyScanCosting.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexOnlyScanCosting.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicIndexOnlyScanCosting.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexOnlyScanCosting.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-BoolFalse.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-BoolFalse.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicIndexScan-BoolFalse.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-BoolFalse.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-BoolTrue.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-BoolTrue.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicIndexScan-BoolTrue.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-BoolTrue.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-DefaultPartition-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-DefaultPartition-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicIndexScan-DefaultPartition-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-DefaultPartition-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-DefaultPartition.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-DefaultPartition.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicIndexScan-DefaultPartition.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-DefaultPartition.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-DroppedCols.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-DroppedCols.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicIndexScan-DroppedCols.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-DroppedCols.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-DroppedColumns.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-DroppedColumns.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicIndexScan-DroppedColumns.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-DroppedColumns.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-EnabledDateConstraint.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-EnabledDateConstraint.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-EnabledDateConstraint.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-EnabledDateConstraint.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-NoDTS.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-NoDTS.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-NoDTS.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-NoDTS.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-Overlapping.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-Overlapping.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-Overlapping.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-Overlapping.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-PartSelectEquality.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-PartSelectEquality.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-PartSelectEquality.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-PartSelectEquality.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-PartSelectRange.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-PartSelectRange.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-PartSelectRange.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-PartSelectRange.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-Union.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-Union.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-Union.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-Union.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-UnsupportedConstraint.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-UnsupportedConstraint.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-UnsupportedConstraint.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-UnsupportedConstraint.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-UnsupportedPredicate.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-UnsupportedPredicate.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-UnsupportedPredicate.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-UnsupportedPredicate.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Homogenous-EnabledDateConstraint.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-Homogenous-EnabledDateConstraint.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Homogenous-EnabledDateConstraint.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-Homogenous-EnabledDateConstraint.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Homogenous-UnsupportedConstraint.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-Homogenous-UnsupportedConstraint.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Homogenous-UnsupportedConstraint.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-Homogenous-UnsupportedConstraint.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Homogenous.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-Homogenous.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Homogenous.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-Homogenous.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-OpenEndedPartitions.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-OpenEndedPartitions.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicIndexScan-OpenEndedPartitions.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-OpenEndedPartitions.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Relabel.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-Relabel.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Relabel.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScan-Relabel.mdp diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScanCosting.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScanCosting.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/DynamicIndexScanCosting.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/DynamicIndexScanCosting.mdp diff --git a/src/backend/gporca/data/dxl/minidump/EagerAggEmptyInput.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/EagerAggEmptyInput.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/EagerAggEmptyInput.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/EagerAggEmptyInput.mdp diff --git a/src/backend/gporca/data/dxl/minidump/EagerAggExpression.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/EagerAggExpression.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/EagerAggExpression.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/EagerAggExpression.mdp diff --git a/src/backend/gporca/data/dxl/minidump/EagerAggGroupColumnInJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/EagerAggGroupColumnInJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/EagerAggGroupColumnInJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/EagerAggGroupColumnInJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/EagerAggMax.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/EagerAggMax.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/EagerAggMax.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/EagerAggMax.mdp diff --git a/src/backend/gporca/data/dxl/minidump/EagerAggMaxWithNestedLoop.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/EagerAggMaxWithNestedLoop.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/EagerAggMaxWithNestedLoop.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/EagerAggMaxWithNestedLoop.mdp diff --git a/src/backend/gporca/data/dxl/minidump/EagerAggMinMax.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/EagerAggMinMax.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/EagerAggMinMax.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/EagerAggMinMax.mdp diff --git a/src/backend/gporca/data/dxl/minidump/EagerAggSubquery.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/EagerAggSubquery.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/EagerAggSubquery.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/EagerAggSubquery.mdp diff --git a/src/backend/gporca/data/dxl/minidump/EagerAggUnsupportedAgg.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/EagerAggUnsupportedAgg.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/EagerAggUnsupportedAgg.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/EagerAggUnsupportedAgg.mdp diff --git a/src/backend/gporca/data/dxl/minidump/EffectOfLocalPredOnJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/EffectOfLocalPredOnJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/EffectOfLocalPredOnJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/EffectOfLocalPredOnJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/EffectOfLocalPredOnJoin3.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/EffectOfLocalPredOnJoin3.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/EffectOfLocalPredOnJoin3.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/EffectOfLocalPredOnJoin3.mdp diff --git a/src/backend/gporca/data/dxl/minidump/EffectsOfJoinFilter.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/EffectsOfJoinFilter.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/EffectsOfJoinFilter.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/EffectsOfJoinFilter.mdp diff --git a/src/backend/gporca/data/dxl/minidump/EqualityJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/EqualityJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/EqualityJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/EqualityJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/EqualityPredicateOverDate.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/EqualityPredicateOverDate.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/EqualityPredicateOverDate.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/EqualityPredicateOverDate.mdp diff --git a/src/backend/gporca/data/dxl/minidump/EquiJoinOnExpr-Supported.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/EquiJoinOnExpr-Supported.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/EquiJoinOnExpr-Supported.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/EquiJoinOnExpr-Supported.mdp diff --git a/src/backend/gporca/data/dxl/minidump/EquiJoinOnExpr-Unsupported.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/EquiJoinOnExpr-Unsupported.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/EquiJoinOnExpr-Unsupported.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/EquiJoinOnExpr-Unsupported.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Equiv-HashedDistr-1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Equiv-HashedDistr-1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Equiv-HashedDistr-1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Equiv-HashedDistr-1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Equiv-HashedDistr-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Equiv-HashedDistr-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Equiv-HashedDistr-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Equiv-HashedDistr-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/EquivClassesAndOr.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/EquivClassesAndOr.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/EquivClassesAndOr.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/EquivClassesAndOr.mdp diff --git a/src/backend/gporca/data/dxl/minidump/EquivClassesIntersect.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/EquivClassesIntersect.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/EquivClassesIntersect.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/EquivClassesIntersect.mdp diff --git a/src/backend/gporca/data/dxl/minidump/EquivClassesLimit.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/EquivClassesLimit.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/EquivClassesLimit.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/EquivClassesLimit.mdp diff --git a/src/backend/gporca/data/dxl/minidump/EquivClassesUnion.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/EquivClassesUnion.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/EquivClassesUnion.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/EquivClassesUnion.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Equivalence-class-project-over-LOJ.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Equivalence-class-project-over-LOJ.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Equivalence-class-project-over-LOJ.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Equivalence-class-project-over-LOJ.mdp diff --git a/src/backend/gporca/data/dxl/minidump/EstimateJoinRowsForCastPredicates.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/EstimateJoinRowsForCastPredicates.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/EstimateJoinRowsForCastPredicates.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/EstimateJoinRowsForCastPredicates.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Except-Volatile-Func.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Except-Volatile-Func.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Except-Volatile-Func.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Except-Volatile-Func.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Except.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Except.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Except.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Except.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ExceptAllCompatibleDataType.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ExceptAllCompatibleDataType.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ExceptAllCompatibleDataType.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ExceptAllCompatibleDataType.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ExceptHashCompatibleRange.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ExceptHashCompatibleRange.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ExceptHashCompatibleRange.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ExceptHashCompatibleRange.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ExceptHashIncompatibleRange.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ExceptHashIncompatibleRange.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ExceptHashIncompatibleRange.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ExceptHashIncompatibleRange.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ExistentialSubquriesInsideScalarExpression.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ExistentialSubquriesInsideScalarExpression.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ExistentialSubquriesInsideScalarExpression.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ExistentialSubquriesInsideScalarExpression.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Exists-SuperfluousEquality.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Exists-SuperfluousEquality.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Exists-SuperfluousEquality.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Exists-SuperfluousEquality.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ExistsSubqInsideExpr.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ExistsSubqInsideExpr.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ExistsSubqInsideExpr.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ExistsSubqInsideExpr.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ExpandJoinOrder.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ExpandJoinOrder.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ExpandJoinOrder.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ExpandJoinOrder.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ExpandNAryJoinGreedyWithLOJOnly.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ExpandNAryJoinGreedyWithLOJOnly.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ExpandNAryJoinGreedyWithLOJOnly.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ExpandNAryJoinGreedyWithLOJOnly.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ExprOnScSubqueryWithOuterRef.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ExprOnScSubqueryWithOuterRef.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ExprOnScSubqueryWithOuterRef.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ExprOnScSubqueryWithOuterRef.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ExternalTable1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ExternalTable1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ExternalTable1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ExternalTable1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ExternalTable2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ExternalTable2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ExternalTable2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ExternalTable2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ExternalTable3.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ExternalTable3.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ExternalTable3.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ExternalTable3.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ExternalTable4.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ExternalTable4.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ExternalTable4.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ExternalTable4.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ExternalTableWithFilter.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ExternalTableWithFilter.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ExternalTableWithFilter.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ExternalTableWithFilter.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ExtractOneBindingFromScalarGroups.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ExtractOneBindingFromScalarGroups.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ExtractOneBindingFromScalarGroups.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ExtractOneBindingFromScalarGroups.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ExtractPredicateFromDisjWithComputedColumns.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ExtractPredicateFromDisjWithComputedColumns.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ExtractPredicateFromDisjWithComputedColumns.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ExtractPredicateFromDisjWithComputedColumns.mdp diff --git a/src/backend/gporca/data/dxl/minidump/FOJ-Condition-False.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/FOJ-Condition-False.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/FOJ-Condition-False.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/FOJ-Condition-False.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Factorized-Preds.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Factorized-Preds.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Factorized-Preds.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Factorized-Preds.mdp diff --git a/src/backend/gporca/data/dxl/minidump/FieldSelect.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/FieldSelect.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/FieldSelect.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/FieldSelect.mdp diff --git a/src/backend/gporca/data/dxl/minidump/FilterScalarCast.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/FilterScalarCast.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/FilterScalarCast.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/FilterScalarCast.mdp diff --git a/src/backend/gporca/data/dxl/minidump/FoldedArrayCmp.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/FoldedArrayCmp.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/FoldedArrayCmp.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/FoldedArrayCmp.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ForeignPartOneTimeFilterDPE.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ForeignPartOneTimeFilterDPE.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ForeignPartOneTimeFilterDPE.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ForeignPartOneTimeFilterDPE.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ForeignPartUniform.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ForeignPartUniform.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ForeignPartUniform.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ForeignPartUniform.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ForeignScanExecLocAnyJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ForeignScanExecLocAnyJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ForeignScanExecLocAnyJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ForeignScanExecLocAnyJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ForeignScanExecLocAnySimpleScan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ForeignScanExecLocAnySimpleScan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ForeignScanExecLocAnySimpleScan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ForeignScanExecLocAnySimpleScan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Forward-IndexOnlyScan-OrderBy-on-MultiCol-Index.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Forward-IndexOnlyScan-OrderBy-on-MultiCol-Index.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Forward-IndexOnlyScan-OrderBy-on-MultiCol-Index.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Forward-IndexOnlyScan-OrderBy-on-MultiCol-Index.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Forward-IndexScan-OrderBy-on-MultiCol-Index.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Forward-IndexScan-OrderBy-on-MultiCol-Index.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Forward-IndexScan-OrderBy-on-MultiCol-Index.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Forward-IndexScan-OrderBy-on-MultiCol-Index.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Forward-IndexScan-OrderBy-on-SingleCol-Index.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Forward-IndexScan-OrderBy-on-SingleCol-Index.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Forward-IndexScan-OrderBy-on-SingleCol-Index.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Forward-IndexScan-OrderBy-on-SingleCol-Index.mdp diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-2PredicateOnDistColumns.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/FullJoin-2PredicateOnDistColumns.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/FullJoin-2PredicateOnDistColumns.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/FullJoin-2PredicateOnDistColumns.mdp diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-Caps.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/FullJoin-Caps.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/FullJoin-Caps.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/FullJoin-Caps.mdp diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-InnerNotOnDistributionColumn.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/FullJoin-InnerNotOnDistributionColumn.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/FullJoin-InnerNotOnDistributionColumn.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/FullJoin-InnerNotOnDistributionColumn.mdp diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-NonDefaultOpfamily.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/FullJoin-NonDefaultOpfamily.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/FullJoin-NonDefaultOpfamily.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/FullJoin-NonDefaultOpfamily.mdp diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-NotOnDistributionColumn.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/FullJoin-NotOnDistributionColumn.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/FullJoin-NotOnDistributionColumn.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/FullJoin-NotOnDistributionColumn.mdp diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-NullPredicate.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/FullJoin-NullPredicate.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/FullJoin-NullPredicate.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/FullJoin-NullPredicate.mdp diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-OnDistributionColumn.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/FullJoin-OnDistributionColumn.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/FullJoin-OnDistributionColumn.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/FullJoin-OnDistributionColumn.mdp diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-PredicateOnSameTable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/FullJoin-PredicateOnSameTable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/FullJoin-PredicateOnSameTable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/FullJoin-PredicateOnSameTable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-Replicated.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/FullJoin-Replicated.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/FullJoin-Replicated.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/FullJoin-Replicated.mdp diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-Subquery-CastedPredicates.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/FullJoin-Subquery-CastedPredicates.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/FullJoin-Subquery-CastedPredicates.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/FullJoin-Subquery-CastedPredicates.mdp diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-SubquerySingleton.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/FullJoin-SubquerySingleton.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/FullJoin-SubquerySingleton.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/FullJoin-SubquerySingleton.mdp diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-SubqueryWithRedistribute.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/FullJoin-SubqueryWithRedistribute.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/FullJoin-SubqueryWithRedistribute.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/FullJoin-SubqueryWithRedistribute.mdp diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-SwappedPredicates.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/FullJoin-SwappedPredicates.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/FullJoin-SwappedPredicates.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/FullJoin-SwappedPredicates.mdp diff --git a/src/backend/gporca/data/dxl/minidump/FullOuterJoin-NullRejectingLHS1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/FullOuterJoin-NullRejectingLHS1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/FullOuterJoin-NullRejectingLHS1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/FullOuterJoin-NullRejectingLHS1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/FullOuterJoin-NullRejectingLHS2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/FullOuterJoin-NullRejectingLHS2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/FullOuterJoin-NullRejectingLHS2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/FullOuterJoin-NullRejectingLHS2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/FullOuterJoinLeftMultiplyRightMaxCard.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/FullOuterJoinLeftMultiplyRightMaxCard.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/FullOuterJoinLeftMultiplyRightMaxCard.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/FullOuterJoinLeftMultiplyRightMaxCard.mdp diff --git a/src/backend/gporca/data/dxl/minidump/FullOuterJoinMaxCardLeftChild.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/FullOuterJoinMaxCardLeftChild.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/FullOuterJoinMaxCardLeftChild.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/FullOuterJoinMaxCardLeftChild.mdp diff --git a/src/backend/gporca/data/dxl/minidump/FullOuterJoinMaxCardRightChild.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/FullOuterJoinMaxCardRightChild.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/FullOuterJoinMaxCardRightChild.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/FullOuterJoinMaxCardRightChild.mdp diff --git a/src/backend/gporca/data/dxl/minidump/FullOuterJoinZeroMaxCard.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/FullOuterJoinZeroMaxCard.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/FullOuterJoinZeroMaxCard.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/FullOuterJoinZeroMaxCard.mdp diff --git a/src/backend/gporca/data/dxl/minidump/FunctionWithQueryParam.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/FunctionWithQueryParam.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/FunctionWithQueryParam.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/FunctionWithQueryParam.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Gb-on-keys.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Gb-on-keys.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Gb-on-keys.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Gb-on-keys.mdp diff --git a/src/backend/gporca/data/dxl/minidump/GinIndex.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/GinIndex.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/GinIndex.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/GinIndex.mdp diff --git a/src/backend/gporca/data/dxl/minidump/GinIndexPathOpfamily.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/GinIndexPathOpfamily.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/GinIndexPathOpfamily.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/GinIndexPathOpfamily.mdp diff --git a/src/backend/gporca/data/dxl/minidump/GinIndexSearchModeAll.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/GinIndexSearchModeAll.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/GinIndexSearchModeAll.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/GinIndexSearchModeAll.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Gist-AOCOTable-NonLossy-BitmapIndexPlan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Gist-AOCOTable-NonLossy-BitmapIndexPlan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Gist-AOCOTable-NonLossy-BitmapIndexPlan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Gist-AOCOTable-NonLossy-BitmapIndexPlan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Gist-NestedLoopJoin-Lossy-IndexPlan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Gist-NestedLoopJoin-Lossy-IndexPlan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Gist-NestedLoopJoin-Lossy-IndexPlan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Gist-NestedLoopJoin-Lossy-IndexPlan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Gist-NestedLoopJoin-Postgis-IndexPlan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Gist-NestedLoopJoin-Postgis-IndexPlan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Gist-NestedLoopJoin-Postgis-IndexPlan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Gist-NestedLoopJoin-Postgis-IndexPlan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Gist-NonPart-Lossy-BitmapIndexPlan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Gist-NonPart-Lossy-BitmapIndexPlan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Gist-NonPart-Lossy-BitmapIndexPlan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Gist-NonPart-Lossy-BitmapIndexPlan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Gist-NonPart-Lossy-IndexPlan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Gist-NonPart-Lossy-IndexPlan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Gist-NonPart-Lossy-IndexPlan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Gist-NonPart-Lossy-IndexPlan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Gist-OrderBy-BitmapPlan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Gist-OrderBy-BitmapPlan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Gist-OrderBy-BitmapPlan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Gist-OrderBy-BitmapPlan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Gist-OrderBy-IndexPlan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Gist-OrderBy-IndexPlan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Gist-OrderBy-IndexPlan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Gist-OrderBy-IndexPlan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Gist-PartTable-Lossy-IndexPlan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Gist-PartTable-Lossy-IndexPlan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Gist-PartTable-Lossy-IndexPlan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Gist-PartTable-Lossy-IndexPlan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Gist-PartTable-NonLossy-BitmapIndexPlan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Gist-PartTable-NonLossy-BitmapIndexPlan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Gist-PartTable-NonLossy-BitmapIndexPlan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Gist-PartTable-NonLossy-BitmapIndexPlan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Gist-PartialIndex-TableScan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Gist-PartialIndex-TableScan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Gist-PartialIndex-TableScan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Gist-PartialIndex-TableScan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/GreedyNAryDelayCrossJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/GreedyNAryDelayCrossJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/GreedyNAryDelayCrossJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/GreedyNAryDelayCrossJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/GreedyNAryJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/GreedyNAryJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/GreedyNAryJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/GreedyNAryJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/GreedyNAryJoinWithDisconnectedEdges.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/GreedyNAryJoinWithDisconnectedEdges.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/GreedyNAryJoinWithDisconnectedEdges.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/GreedyNAryJoinWithDisconnectedEdges.mdp diff --git a/src/backend/gporca/data/dxl/minidump/GreedyNAryOnlyCrossJoins.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/GreedyNAryOnlyCrossJoins.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/GreedyNAryOnlyCrossJoins.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/GreedyNAryOnlyCrossJoins.mdp diff --git a/src/backend/gporca/data/dxl/minidump/GroupByEmptySetNoAgg.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/GroupByEmptySetNoAgg.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/GroupByEmptySetNoAgg.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/GroupByEmptySetNoAgg.mdp diff --git a/src/backend/gporca/data/dxl/minidump/GroupByOuterRef.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/GroupByOuterRef.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/GroupByOuterRef.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/GroupByOuterRef.mdp diff --git a/src/backend/gporca/data/dxl/minidump/GroupingOnSameTblCol-1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/GroupingOnSameTblCol-1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/GroupingOnSameTblCol-1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/GroupingOnSameTblCol-1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/GroupingOnSameTblCol-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/GroupingOnSameTblCol-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/GroupingOnSameTblCol-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/GroupingOnSameTblCol-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/GroupingSets.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/GroupingSets.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/GroupingSets.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/GroupingSets.mdp diff --git a/src/backend/gporca/data/dxl/minidump/HAWQ-TPCH-Stat-Derivation.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/HAWQ-TPCH-Stat-Derivation.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/HAWQ-TPCH-Stat-Derivation.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/HAWQ-TPCH-Stat-Derivation.mdp diff --git a/src/backend/gporca/data/dxl/minidump/HJN-DPE-Bitmap-Outer-Child.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/HJN-DPE-Bitmap-Outer-Child.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/HJN-DPE-Bitmap-Outer-Child.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/HJN-DPE-Bitmap-Outer-Child.mdp diff --git a/src/backend/gporca/data/dxl/minidump/HJN-DeeperOuter.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/HJN-DeeperOuter.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/HJN-DeeperOuter.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/HJN-DeeperOuter.mdp diff --git a/src/backend/gporca/data/dxl/minidump/HJN-Redistribute-One-Side.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/HJN-Redistribute-One-Side.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/HJN-Redistribute-One-Side.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/HJN-Redistribute-One-Side.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Hash-BitmapScan-InArray.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Hash-BitmapScan-InArray.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Hash-BitmapScan-InArray.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Hash-BitmapScan-InArray.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Hash-BitmapScan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Hash-BitmapScan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Hash-BitmapScan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Hash-BitmapScan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Hash-IndexScan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Hash-IndexScan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Hash-IndexScan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Hash-IndexScan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Hash-TableScan-AllArray.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Hash-TableScan-AllArray.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Hash-TableScan-AllArray.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Hash-TableScan-AllArray.mdp diff --git a/src/backend/gporca/data/dxl/minidump/HashJoinOnRelabeledColumns.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/HashJoinOnRelabeledColumns.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/HashJoinOnRelabeledColumns.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/HashJoinOnRelabeledColumns.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Hint-AbsoluteRows-Over-Join.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-AbsoluteRows-Over-Join.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Hint-AbsoluteRows-Over-Join.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-AbsoluteRows-Over-Join.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Hint-AddRows-Over-Join.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-AddRows-Over-Join.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Hint-AddRows-Over-Join.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-AddRows-Over-Join.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Hint-BitmapScan-Over-Table.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-BitmapScan-Over-Table.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Hint-BitmapScan-Over-Table.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-BitmapScan-Over-Table.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Hint-IndexOnlyScan-Over-Table.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-IndexOnlyScan-Over-Table.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Hint-IndexOnlyScan-Over-Table.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-IndexOnlyScan-Over-Table.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Hint-IndexScan-Over-Join.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-IndexScan-Over-Join.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Hint-IndexScan-Over-Join.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-IndexScan-Over-Join.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Hint-IndexScan-Over-Table.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-IndexScan-Over-Table.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Hint-IndexScan-Over-Table.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-IndexScan-Over-Table.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Hint-Leading-Directed.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-Leading-Directed.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Hint-Leading-Directed.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-Leading-Directed.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Hint-Leading-Multiple.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-Leading-Multiple.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Hint-Leading-Multiple.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-Leading-Multiple.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Hint-Leading-NonDirected.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-Leading-NonDirected.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Hint-Leading-NonDirected.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-Leading-NonDirected.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Hint-MultiplyRows-Over-Join.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-MultiplyRows-Over-Join.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Hint-MultiplyRows-Over-Join.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-MultiplyRows-Over-Join.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Hint-NoBitmapScan-Over-Table.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-NoBitmapScan-Over-Table.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Hint-NoBitmapScan-Over-Table.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-NoBitmapScan-Over-Table.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Hint-NoIndexOnlyScan-Over-Table.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-NoIndexOnlyScan-Over-Table.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Hint-NoIndexOnlyScan-Over-Table.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-NoIndexOnlyScan-Over-Table.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Hint-NoIndexScan-Over-Table.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-NoIndexScan-Over-Table.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Hint-NoIndexScan-Over-Table.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-NoIndexScan-Over-Table.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Hint-SeqScan-Over-Join.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-SeqScan-Over-Join.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Hint-SeqScan-Over-Join.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-SeqScan-Over-Join.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Hint-SeqScan-Over-Table.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-SeqScan-Over-Table.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Hint-SeqScan-Over-Table.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-SeqScan-Over-Table.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Hint-SubtractRows-Over-Join.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-SubtractRows-Over-Join.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Hint-SubtractRows-Over-Join.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Hint-SubtractRows-Over-Join.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IDF-NotNullConstant.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IDF-NotNullConstant.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IDF-NotNullConstant.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IDF-NotNullConstant.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IDF-NullConstant.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IDF-NullConstant.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IDF-NullConstant.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IDF-NullConstant.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IN-ArrayCmp.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IN-ArrayCmp.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IN-ArrayCmp.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IN-ArrayCmp.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IN-Nulls-ArrayCmpAny.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IN-Nulls-ArrayCmpAny.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IN-Nulls-ArrayCmpAny.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IN-Nulls-ArrayCmpAny.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IN-Numeric.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IN-Numeric.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IN-Numeric.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IN-Numeric.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IN.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IN.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IN.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IN.mdp diff --git a/src/backend/gporca/data/dxl/minidump/INDF-NotNullConstant.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/INDF-NotNullConstant.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/INDF-NotNullConstant.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/INDF-NotNullConstant.mdp diff --git a/src/backend/gporca/data/dxl/minidump/INDF-NullConstant.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/INDF-NullConstant.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/INDF-NullConstant.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/INDF-NullConstant.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InClauseWithMCV.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InClauseWithMCV.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InClauseWithMCV.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InClauseWithMCV.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InEqualityJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InEqualityJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InEqualityJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InEqualityJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefColumnIn.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefColumnIn.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefColumnIn.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefColumnIn.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefColumnPlusConstIn.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefColumnPlusConstIn.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefColumnPlusConstIn.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefColumnPlusConstIn.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefConstIn.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefConstIn.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefConstIn.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefConstIn.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InSubqWithPrjListReturnSet.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InSubqWithPrjListReturnSet.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InSubqWithPrjListReturnSet.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InSubqWithPrjListReturnSet.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InSubqueryWithNotNullCol.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InSubqueryWithNotNullCol.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InSubqueryWithNotNullCol.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InSubqueryWithNotNullCol.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Index-Join-With-Subquery-In-Pred.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Index-Join-With-Subquery-In-Pred.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Index-Join-With-Subquery-In-Pred.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Index-Join-With-Subquery-In-Pred.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-Heterogeneous-BothSidesPartitioned.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-Heterogeneous-BothSidesPartitioned.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply-Heterogeneous-BothSidesPartitioned.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-Heterogeneous-BothSidesPartitioned.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-Heterogeneous-DTS.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-Heterogeneous-DTS.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply-Heterogeneous-DTS.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-Heterogeneous-DTS.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-Heterogeneous-NoDTS.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-Heterogeneous-NoDTS.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply-Heterogeneous-NoDTS.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-Heterogeneous-NoDTS.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-IndexCondDisjointWithHashedDistr.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-IndexCondDisjointWithHashedDistr.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply-IndexCondDisjointWithHashedDistr.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-IndexCondDisjointWithHashedDistr.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-IndexCondIntersectWithHashedDistr.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-IndexCondIntersectWithHashedDistr.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply-IndexCondIntersectWithHashedDistr.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-IndexCondIntersectWithHashedDistr.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-IndexCondMatchHashedDistr.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-IndexCondMatchHashedDistr.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply-IndexCondMatchHashedDistr.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-IndexCondMatchHashedDistr.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-IndexCondSubsetOfHashedDistr.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-IndexCondSubsetOfHashedDistr.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply-IndexCondSubsetOfHashedDistr.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-IndexCondSubsetOfHashedDistr.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-IndexCondSupersetOfHashedDistr.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-IndexCondSupersetOfHashedDistr.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply-IndexCondSupersetOfHashedDistr.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-IndexCondSupersetOfHashedDistr.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-IndexOnCoordinatorOnlyTable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-IndexOnCoordinatorOnlyTable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply-IndexOnCoordinatorOnlyTable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-IndexOnCoordinatorOnlyTable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-InnerSelect-Basic.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-InnerSelect-Basic.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply-InnerSelect-Basic.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-InnerSelect-Basic.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-InnerSelect-Heterogeneous-DTS.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-InnerSelect-Heterogeneous-DTS.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply-InnerSelect-Heterogeneous-DTS.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-InnerSelect-Heterogeneous-DTS.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-InnerSelect-PartTable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-InnerSelect-PartTable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply-InnerSelect-PartTable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-InnerSelect-PartTable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-InnerSelect-PartTable2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-InnerSelect-PartTable2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply-InnerSelect-PartTable2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-InnerSelect-PartTable2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-LeftOuter-NLJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-LeftOuter-NLJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply-LeftOuter-NLJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-LeftOuter-NLJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-MultiDistKey-WithComplexPreds.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-MultiDistKey-WithComplexPreds.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply-MultiDistKey-WithComplexPreds.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-MultiDistKey-WithComplexPreds.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-MultiDistKeys-Bitmap-WithComplexPreds.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-MultiDistKeys-Bitmap-WithComplexPreds.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply-MultiDistKeys-Bitmap-WithComplexPreds.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-MultiDistKeys-Bitmap-WithComplexPreds.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-MultiDistKeys-Bitmap.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-MultiDistKeys-Bitmap.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply-MultiDistKeys-Bitmap.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-MultiDistKeys-Bitmap.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-MultiDistKeys-IncompletePDS-3-DistCols.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-MultiDistKeys-IncompletePDS-3-DistCols.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply-MultiDistKeys-IncompletePDS-3-DistCols.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-MultiDistKeys-IncompletePDS-3-DistCols.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-No-Motion-Below-Join.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-No-Motion-Below-Join.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply-No-Motion-Below-Join.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-No-Motion-Below-Join.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-PartKey-Is-IndexKey.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-PartKey-Is-IndexKey.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply-PartKey-Is-IndexKey.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-PartKey-Is-IndexKey.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-PartResolverExpand.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-PartResolverExpand.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply-PartResolverExpand.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-PartResolverExpand.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-PartTable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-PartTable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply-PartTable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-PartTable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-Redistribute-Const-Table.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-Redistribute-Const-Table.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply-Redistribute-Const-Table.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply-Redistribute-Const-Table.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply1-CalibratedCostModel.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply1-CalibratedCostModel.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply1-CalibratedCostModel.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply1-CalibratedCostModel.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply3.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply3.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply3.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply3.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply4.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply4.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply4.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply4.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply_NestLoopWithNestParamTrue.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply_NestLoopWithNestParamTrue.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexApply_NestLoopWithNestParamTrue.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexApply_NestLoopWithNestParamTrue.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexConstraintsMDidCache.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexConstraintsMDidCache.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexConstraintsMDidCache.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexConstraintsMDidCache.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexGet-OuterRefs.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexGet-OuterRefs.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexGet-OuterRefs.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexGet-OuterRefs.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexNLJ-IndexGet-OuterRef.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexNLJ-IndexGet-OuterRef.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexNLJ-IndexGet-OuterRef.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexNLJ-IndexGet-OuterRef.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexNLJoin_Cast_NoMotion.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexNLJoin_Cast_NoMotion.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexNLJoin_Cast_NoMotion.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexNLJoin_Cast_NoMotion.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-AddNewPartitionToRootTableContainingHeterogenousIndex.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-AddNewPartitionToRootTableContainingHeterogenousIndex.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexOnLeaf-AddNewPartitionToRootTableContainingHeterogenousIndex.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-AddNewPartitionToRootTableContainingHeterogenousIndex.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-AddPartitionToRootWithHomogenousIndex.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-AddPartitionToRootWithHomogenousIndex.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexOnLeaf-AddPartitionToRootWithHomogenousIndex.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-AddPartitionToRootWithHomogenousIndex.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-IndexOnPartitionsWithDifferentStorageTypes.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-IndexOnPartitionsWithDifferentStorageTypes.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexOnLeaf-IndexOnPartitionsWithDifferentStorageTypes.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-IndexOnPartitionsWithDifferentStorageTypes.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHeterogenousIndex-ANDPredicate-AO.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHeterogenousIndex-ANDPredicate-AO.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHeterogenousIndex-ANDPredicate-AO.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHeterogenousIndex-ANDPredicate-AO.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHeterogenousIndex-ANDPredicate-HEAP.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHeterogenousIndex-ANDPredicate-HEAP.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHeterogenousIndex-ANDPredicate-HEAP.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHeterogenousIndex-ANDPredicate-HEAP.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHomogenousIndexesOnRoot-ANDPredicate-AO.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHomogenousIndexesOnRoot-ANDPredicate-AO.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHomogenousIndexesOnRoot-ANDPredicate-AO.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHomogenousIndexesOnRoot-ANDPredicate-AO.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHomogenousIndexesOnRoot-ORPredicate-AO.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHomogenousIndexesOnRoot-ORPredicate-AO.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHomogenousIndexesOnRoot-ORPredicate-AO.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHomogenousIndexesOnRoot-ORPredicate-AO.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ANDPredicate-AO.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ANDPredicate-AO.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ANDPredicate-AO.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ANDPredicate-AO.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ANDPredicate-HEAP.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ANDPredicate-HEAP.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ANDPredicate-HEAP.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ANDPredicate-HEAP.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ORPredicate-AO.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ORPredicate-AO.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ORPredicate-AO.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ORPredicate-AO.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHomogenousIndexesOnRoot-ANDPredicate-AO.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHomogenousIndexesOnRoot-ANDPredicate-AO.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHomogenousIndexesOnRoot-ANDPredicate-AO.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHomogenousIndexesOnRoot-ANDPredicate-AO.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHomogenousIndexesOnRoot-AO.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHomogenousIndexesOnRoot-AO.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHomogenousIndexesOnRoot-AO.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHomogenousIndexesOnRoot-AO.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHomogenousIndexesOnRoot-ORPredicate-AO.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHomogenousIndexesOnRoot-ORPredicate-AO.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHomogenousIndexesOnRoot-ORPredicate-AO.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHomogenousIndexesOnRoot-ORPredicate-AO.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-1-AO.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-1-AO.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-1-AO.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-1-AO.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-1-HEAP.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-1-HEAP.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-1-HEAP.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-1-HEAP.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-2-AO.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-2-AO.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-2-AO.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-2-AO.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-2-HEAP.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-2-HEAP.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-2-HEAP.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-2-HEAP.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnlyScan-CTE.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnlyScan-CTE.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexOnlyScan-CTE.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnlyScan-CTE.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnlyScan-NoDistKeyInIndex.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnlyScan-NoDistKeyInIndex.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexOnlyScan-NoDistKeyInIndex.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnlyScan-NoDistKeyInIndex.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnlyScan-OrderBy-on-MultiCol-NonIndex.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnlyScan-OrderBy-on-MultiCol-NonIndex.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexOnlyScan-OrderBy-on-MultiCol-NonIndex.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnlyScan-OrderBy-on-MultiCol-NonIndex.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnlyScanCosting.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnlyScanCosting.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexOnlyScanCosting.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexOnlyScanCosting.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexScan-AOTable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-AOTable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexScan-AOTable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-AOTable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexScan-AndedIn.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-AndedIn.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexScan-AndedIn.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-AndedIn.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexScan-BoolFalse.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-BoolFalse.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexScan-BoolFalse.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-BoolFalse.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexScan-BoolTrue.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-BoolTrue.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexScan-BoolTrue.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-BoolTrue.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexScan-DroppedColumns.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-DroppedColumns.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexScan-DroppedColumns.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-DroppedColumns.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexScan-IsNotNullPred.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-IsNotNullPred.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexScan-IsNotNullPred.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-IsNotNullPred.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexScan-IsNullPred.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-IsNullPred.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexScan-IsNullPred.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-IsNullPred.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexScan-ORPredsAOPart.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-ORPredsAOPart.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexScan-ORPredsAOPart.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-ORPredsAOPart.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexScan-ORPredsNonPart.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-ORPredsNonPart.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexScan-ORPredsNonPart.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-ORPredsNonPart.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexScan-OrderBy-on-MultiCol-NonIndex.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-OrderBy-on-MultiCol-NonIndex.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexScan-OrderBy-on-MultiCol-NonIndex.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-OrderBy-on-MultiCol-NonIndex.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexScan-OrderBy-on-Multiple-IndexCols.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-OrderBy-on-Multiple-IndexCols.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexScan-OrderBy-on-Multiple-IndexCols.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-OrderBy-on-Multiple-IndexCols.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexScan-OrderBy-on-NonIndexCol.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-OrderBy-on-NonIndexCol.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexScan-OrderBy-on-NonIndexCol.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-OrderBy-on-NonIndexCol.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexScan-OrderBy-on-Single-IndexCol.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-OrderBy-on-Single-IndexCol.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexScan-OrderBy-on-Single-IndexCol.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-OrderBy-on-Single-IndexCol.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexScan-Relabel.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-Relabel.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexScan-Relabel.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScan-Relabel.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexScanCosting.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScanCosting.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexScanCosting.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScanCosting.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexScanWithNestedCTEAndSetOp.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScanWithNestedCTEAndSetOp.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexScanWithNestedCTEAndSetOp.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexScanWithNestedCTEAndSetOp.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IndexedNLJBitmap.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexedNLJBitmap.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IndexedNLJBitmap.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IndexedNLJBitmap.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicates.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicates.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InferPredicates.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicates.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-oid-oid.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesBCC-oid-oid.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-oid-oid.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesBCC-oid-oid.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-txt-txt.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesBCC-txt-txt.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-txt-txt.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesBCC-txt-txt.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-vc-txt.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesBCC-vc-txt.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-vc-txt.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesBCC-vc-txt.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-vc-vc.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesBCC-vc-vc.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-vc-vc.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesBCC-vc-vc.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-vcpart-txt.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesBCC-vcpart-txt.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-vcpart-txt.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesBCC-vcpart-txt.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesForLimit.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesForLimit.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InferPredicatesForLimit.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesForLimit.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesForPartSQ.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesForPartSQ.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InferPredicatesForPartSQ.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesForPartSQ.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesForProcessedColumn.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesForProcessedColumn.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InferPredicatesForProcessedColumn.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesForProcessedColumn.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesForQuantifiedSQ.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesForQuantifiedSQ.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InferPredicatesForQuantifiedSQ.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesForQuantifiedSQ.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesFromExistsSubquery.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesFromExistsSubquery.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InferPredicatesFromExistsSubquery.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesFromExistsSubquery.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesFromMultiSubquery.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesFromMultiSubquery.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InferPredicatesFromMultiSubquery.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesFromMultiSubquery.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesInnerOfLOJ.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesInnerOfLOJ.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InferPredicatesInnerOfLOJ.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesInnerOfLOJ.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesIntFromExistsSubquery.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesIntFromExistsSubquery.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InferPredicatesIntFromExistsSubquery.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesIntFromExistsSubquery.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesIntFromSubquery.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesIntFromSubquery.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InferPredicatesIntFromSubquery.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesIntFromSubquery.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesJoinSubquery.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesJoinSubquery.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InferPredicatesJoinSubquery.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesJoinSubquery.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesMultiColumns.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesMultiColumns.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InferPredicatesMultiColumns.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InferPredicatesMultiColumns.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InferredPredicatesConstraintSimplification.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InferredPredicatesConstraintSimplification.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InferredPredicatesConstraintSimplification.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InferredPredicatesConstraintSimplification.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InnerJoin-With-OuterRefs.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InnerJoin-With-OuterRefs.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InnerJoin-With-OuterRefs.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InnerJoin-With-OuterRefs.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InnerJoinBroadcastTableHashSpec.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InnerJoinBroadcastTableHashSpec.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InnerJoinBroadcastTableHashSpec.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InnerJoinBroadcastTableHashSpec.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InnerJoinOverJoinExcept.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InnerJoinOverJoinExcept.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InnerJoinOverJoinExcept.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InnerJoinOverJoinExcept.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InnerJoinOverJoinExceptAll.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InnerJoinOverJoinExceptAll.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InnerJoinOverJoinExceptAll.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InnerJoinOverJoinExceptAll.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InnerJoinReplicatedTableHashSpec.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InnerJoinReplicatedTableHashSpec.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InnerJoinReplicatedTableHashSpec.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InnerJoinReplicatedTableHashSpec.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Insert-AO-Partitioned-SortDisabled.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Insert-AO-Partitioned-SortDisabled.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Insert-AO-Partitioned-SortDisabled.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Insert-AO-Partitioned-SortDisabled.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Insert-AO-Partitioned.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Insert-AO-Partitioned.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Insert-AO-Partitioned.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Insert-AO-Partitioned.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Insert-AO.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Insert-AO.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Insert-AO.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Insert-AO.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Insert-With-HJ-CTE-Agg.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Insert-With-HJ-CTE-Agg.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Insert-With-HJ-CTE-Agg.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Insert-With-HJ-CTE-Agg.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Insert.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Insert.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Insert.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Insert.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InsertAssertSort.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertAssertSort.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InsertAssertSort.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertAssertSort.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InsertCheckConstraint.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertCheckConstraint.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InsertCheckConstraint.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertCheckConstraint.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InsertConstTuple.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertConstTuple.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InsertConstTuple.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertConstTuple.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InsertConstTupleRandomDistribution.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertConstTupleRandomDistribution.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InsertConstTupleRandomDistribution.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertConstTupleRandomDistribution.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InsertConstTupleVolatileFunction.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertConstTupleVolatileFunction.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InsertConstTupleVolatileFunction.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertConstTupleVolatileFunction.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InsertConstTupleVolatileFunctionMOTable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertConstTupleVolatileFunctionMOTable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InsertConstTupleVolatileFunctionMOTable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertConstTupleVolatileFunctionMOTable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InsertCoordinatorOnlyTable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertCoordinatorOnlyTable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InsertCoordinatorOnlyTable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertCoordinatorOnlyTable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InsertCoordinatorOnlyTableConstTuple.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertCoordinatorOnlyTableConstTuple.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InsertCoordinatorOnlyTableConstTuple.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertCoordinatorOnlyTableConstTuple.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InsertDirectedDispatchNullValue.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertDirectedDispatchNullValue.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InsertDirectedDispatchNullValue.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertDirectedDispatchNullValue.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InsertIntoNonNullAfterDroppingColumn.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertIntoNonNullAfterDroppingColumn.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InsertIntoNonNullAfterDroppingColumn.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertIntoNonNullAfterDroppingColumn.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InsertMismatchedDistrubution-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertMismatchedDistrubution-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InsertMismatchedDistrubution-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertMismatchedDistrubution-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InsertMismatchedDistrubution.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertMismatchedDistrubution.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InsertMismatchedDistrubution.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertMismatchedDistrubution.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InsertNULLNotNULLConstraint.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertNULLNotNULLConstraint.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InsertNULLNotNULLConstraint.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertNULLNotNULLConstraint.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InsertNoEnforceConstraints.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertNoEnforceConstraints.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InsertNoEnforceConstraints.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertNoEnforceConstraints.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InsertNonSingleton.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertNonSingleton.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InsertNonSingleton.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertNonSingleton.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InsertNotNullCols.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertNotNullCols.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InsertNotNullCols.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertNotNullCols.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InsertPrimaryKeyFromMOTable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertPrimaryKeyFromMOTable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InsertPrimaryKeyFromMOTable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertPrimaryKeyFromMOTable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InsertProjectSort.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertProjectSort.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InsertProjectSort.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertProjectSort.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InsertRandomDistr.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertRandomDistr.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InsertRandomDistr.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertRandomDistr.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InsertReplicatedIntoSerialHashDistributedTable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertReplicatedIntoSerialHashDistributedTable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InsertReplicatedIntoSerialHashDistributedTable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertReplicatedIntoSerialHashDistributedTable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InsertSort.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertSort.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InsertSort.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertSort.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InsertSortDistributed2CoordinatorOnly.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertSortDistributed2CoordinatorOnly.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InsertSortDistributed2CoordinatorOnly.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertSortDistributed2CoordinatorOnly.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InsertWithDroppedCol.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertWithDroppedCol.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InsertWithDroppedCol.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InsertWithDroppedCol.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Int2Predicate.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Int2Predicate.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Int2Predicate.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Int2Predicate.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Intersect-OuterRefs.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Intersect-OuterRefs.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Intersect-OuterRefs.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Intersect-OuterRefs.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Intersect-Volatile-Func.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Intersect-Volatile-Func.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Intersect-Volatile-Func.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Intersect-Volatile-Func.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InvalidDeleteGather.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InvalidDeleteGather.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InvalidDeleteGather.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InvalidDeleteGather.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InvalidPlan_CTE-2-all-plans.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InvalidPlan_CTE-2-all-plans.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InvalidPlan_CTE-2-all-plans.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InvalidPlan_CTE-2-all-plans.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InvalidPlan_IncompatibleDistributionOnJoinBranches.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InvalidPlan_IncompatibleDistributionOnJoinBranches.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InvalidPlan_IncompatibleDistributionOnJoinBranches.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InvalidPlan_IncompatibleDistributionOnJoinBranches.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InvalidPlan_MotionGatherFromCoordinatorToCoordinator-ScalarDQA.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InvalidPlan_MotionGatherFromCoordinatorToCoordinator-ScalarDQA.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InvalidPlan_MotionGatherFromCoordinatorToCoordinator-ScalarDQA.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InvalidPlan_MotionGatherFromCoordinatorToCoordinator-ScalarDQA.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InvalidPlan_MotionGatherFromCoordinatorToCoordinator.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InvalidPlan_MotionGatherFromCoordinatorToCoordinator.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InvalidPlan_MotionGatherFromCoordinatorToCoordinator.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InvalidPlan_MotionGatherFromCoordinatorToCoordinator.mdp diff --git a/src/backend/gporca/data/dxl/minidump/InvalidUpdatePlan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/InvalidUpdatePlan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/InvalidUpdatePlan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/InvalidUpdatePlan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/IsNullUnionAllIsNotNull.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/IsNullUnionAllIsNotNull.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/IsNullUnionAllIsNotNull.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/IsNullUnionAllIsNotNull.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JOIN-NonRedistributableCol.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JOIN-NonRedistributableCol.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JOIN-NonRedistributableCol.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JOIN-NonRedistributableCol.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JOIN-Pred-Cast-Int4.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JOIN-Pred-Cast-Int4.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JOIN-Pred-Cast-Int4.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JOIN-Pred-Cast-Int4.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JOIN-Pred-Cast-Varchar.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JOIN-Pred-Cast-Varchar.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JOIN-Pred-Cast-Varchar.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JOIN-Pred-Cast-Varchar.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JOIN-cast2text-int4-Eq-cast2text-double.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JOIN-cast2text-int4-Eq-cast2text-double.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JOIN-cast2text-int4-Eq-cast2text-double.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JOIN-cast2text-int4-Eq-cast2text-double.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JOIN-int4-Eq-double.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JOIN-int4-Eq-double.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JOIN-int4-Eq-double.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JOIN-int4-Eq-double.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JOIN-int4-Eq-int2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JOIN-int4-Eq-int2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JOIN-int4-Eq-int2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JOIN-int4-Eq-int2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Join-Disj-Subqs.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Join-Disj-Subqs.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Join-Disj-Subqs.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Join-Disj-Subqs.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Join-IDF.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Join-IDF.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Join-IDF.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Join-IDF.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Join-INDF-NoBroadcast.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Join-INDF-NoBroadcast.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Join-INDF-NoBroadcast.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Join-INDF-NoBroadcast.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Join-INDF-Nulls-Not-Collocated.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Join-INDF-Nulls-Not-Collocated.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Join-INDF-Nulls-Not-Collocated.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Join-INDF-Nulls-Not-Collocated.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Join-INDF.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Join-INDF.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Join-INDF.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Join-INDF.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Join-Varchar-Equality.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Join-Varchar-Equality.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Join-Varchar-Equality.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Join-Varchar-Equality.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Join-WinFunc-Preds.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Join-WinFunc-Preds.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Join-WinFunc-Preds.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Join-WinFunc-Preds.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Join-With-Subq-Preds-1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Join-With-Subq-Preds-1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Join-With-Subq-Preds-1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Join-With-Subq-Preds-1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Join-With-Subq-Preds-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Join-With-Subq-Preds-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Join-With-Subq-Preds-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Join-With-Subq-Preds-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JoinAbsEqWithoutOpfamilies.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinAbsEqWithoutOpfamilies.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JoinAbsEqWithoutOpfamilies.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinAbsEqWithoutOpfamilies.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityAboveLimit.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityAboveLimit.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityAboveLimit.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityAboveLimit.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityAtLimit.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityAtLimit.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityAtLimit.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityAtLimit.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityBelowLimit.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityBelowLimit.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityBelowLimit.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityBelowLimit.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JoinBelowUnionAll.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinBelowUnionAll.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JoinBelowUnionAll.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinBelowUnionAll.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JoinCitextVarchar.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinCitextVarchar.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JoinCitextVarchar.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinCitextVarchar.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JoinColWithOnlyNDV.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinColWithOnlyNDV.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JoinColWithOnlyNDV.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinColWithOnlyNDV.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JoinCombinedHashSpecNullsNotColocated.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinCombinedHashSpecNullsNotColocated.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JoinCombinedHashSpecNullsNotColocated.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinCombinedHashSpecNullsNotColocated.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JoinDefaultOpfamiliesUsingNonDefaultOpfamilyOp.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinDefaultOpfamiliesUsingNonDefaultOpfamilyOp.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JoinDefaultOpfamiliesUsingNonDefaultOpfamilyOp.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinDefaultOpfamiliesUsingNonDefaultOpfamilyOp.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JoinNDVRemain.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinNDVRemain.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JoinNDVRemain.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinNDVRemain.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JoinOnReplicatedUniversal.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinOnReplicatedUniversal.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JoinOnReplicatedUniversal.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinOnReplicatedUniversal.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JoinOnViewWithCastedColumn.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinOnViewWithCastedColumn.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JoinOnViewWithCastedColumn.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinOnViewWithCastedColumn.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JoinOnViewWithCastedColumnAndSubqueryInPredicate.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinOnViewWithCastedColumnAndSubqueryInPredicate.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JoinOnViewWithCastedColumnAndSubqueryInPredicate.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinOnViewWithCastedColumnAndSubqueryInPredicate.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JoinOnViewWithMixOfPushableAndNonpushablePredicates.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinOnViewWithMixOfPushableAndNonpushablePredicates.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JoinOnViewWithMixOfPushableAndNonpushablePredicates.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinOnViewWithMixOfPushableAndNonpushablePredicates.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JoinOnViewWithSetReturningColumn.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinOnViewWithSetReturningColumn.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JoinOnViewWithSetReturningColumn.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinOnViewWithSetReturningColumn.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JoinOnViewWithVolatileColumn.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinOnViewWithVolatileColumn.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JoinOnViewWithVolatileColumn.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinOnViewWithVolatileColumn.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JoinOptimizationLevelGreedyNonPartTblInnerJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinOptimizationLevelGreedyNonPartTblInnerJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JoinOptimizationLevelGreedyNonPartTblInnerJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinOptimizationLevelGreedyNonPartTblInnerJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JoinOptimizationLevelQuery3WayHashJoinPartTbl.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinOptimizationLevelQuery3WayHashJoinPartTbl.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JoinOptimizationLevelQuery3WayHashJoinPartTbl.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinOptimizationLevelQuery3WayHashJoinPartTbl.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JoinOptimizationLevelQueryNonPartTblInnerJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinOptimizationLevelQueryNonPartTblInnerJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JoinOptimizationLevelQueryNonPartTblInnerJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinOptimizationLevelQueryNonPartTblInnerJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JoinOrderDPE.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinOrderDPE.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JoinOrderDPE.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinOrderDPE.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JoinPlan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinPlan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JoinPlan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinPlan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JoinPlanWithRedistribute.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinPlanWithRedistribute.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JoinPlanWithRedistribute.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinPlanWithRedistribute.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JoinPredFalseFilter.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinPredFalseFilter.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JoinPredFalseFilter.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinPredFalseFilter.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JoinTinterval.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinTinterval.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JoinTinterval.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinTinterval.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JoinWithSingletonAndSingletonBranches.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinWithSingletonAndSingletonBranches.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JoinWithSingletonAndSingletonBranches.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinWithSingletonAndSingletonBranches.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JoinWithSingletonAndUniversalBranches.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinWithSingletonAndUniversalBranches.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JoinWithSingletonAndUniversalBranches.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinWithSingletonAndUniversalBranches.mdp diff --git a/src/backend/gporca/data/dxl/minidump/JoinWithSubqueryProjectColumn.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinWithSubqueryProjectColumn.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/JoinWithSubqueryProjectColumn.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/JoinWithSubqueryProjectColumn.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Join_OuterChild_DistUniversal.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Join_OuterChild_DistUniversal.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Join_OuterChild_DistUniversal.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Join_OuterChild_DistUniversal.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LASJ-Not-In-Force-Broadcast.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LASJ-Not-In-Force-Broadcast.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LASJ-Not-In-Force-Broadcast.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LASJ-Not-In-Force-Broadcast.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LIKE-Pattern-Empty.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LIKE-Pattern-Empty.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LIKE-Pattern-Empty.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LIKE-Pattern-Empty.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LIKE-Pattern-green-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LIKE-Pattern-green-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LIKE-Pattern-green-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LIKE-Pattern-green-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LIKE-Pattern-green.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LIKE-Pattern-green.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LIKE-Pattern-green.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LIKE-Pattern-green.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-Condition-False.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-Condition-False.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ-Condition-False.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-Condition-False.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-DynBitmapIndex.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-DynBitmapIndex.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ-DynBitmapIndex.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-DynBitmapIndex.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-DynBitmapIndexWithSelect.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-DynBitmapIndexWithSelect.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ-DynBitmapIndexWithSelect.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-DynBitmapIndexWithSelect.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-DynBtreeIndex.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-DynBtreeIndex.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ-DynBtreeIndex.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-DynBtreeIndex.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-DynBtreeIndexWithSelect.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-DynBtreeIndexWithSelect.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ-DynBtreeIndexWithSelect.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-DynBtreeIndexWithSelect.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-HashJoin-MultiDistKeys-WithComplexPreds.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-HashJoin-MultiDistKeys-WithComplexPreds.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ-HashJoin-MultiDistKeys-WithComplexPreds.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-HashJoin-MultiDistKeys-WithComplexPreds.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-CompsiteKey-Equiv.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-CompsiteKey-Equiv.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-CompsiteKey-Equiv.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-CompsiteKey-Equiv.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-CompsiteKey-NoMotion.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-CompsiteKey-NoMotion.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-CompsiteKey-NoMotion.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-CompsiteKey-NoMotion.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-CoordinatorOnly-Table.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-CoordinatorOnly-Table.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-CoordinatorOnly-Table.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-CoordinatorOnly-Table.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-DistKey-Multiple-Predicates.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-DistKey-Multiple-Predicates.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-DistKey-Multiple-Predicates.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-DistKey-Multiple-Predicates.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKey-MultiIndexKey-NoExtraFilter.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKey-MultiIndexKey-NoExtraFilter.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKey-MultiIndexKey-NoExtraFilter.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKey-MultiIndexKey-NoExtraFilter.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKey-MultiIndexKey.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKey-MultiIndexKey.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKey-MultiIndexKey.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKey-MultiIndexKey.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-Bitmap-WithComplexPreds.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-Bitmap-WithComplexPreds.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-Bitmap-WithComplexPreds.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-Bitmap-WithComplexPreds.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-Bitmap.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-Bitmap.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-Bitmap.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-Bitmap.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-IndexKeys.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-IndexKeys.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-IndexKeys.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-IndexKeys.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-WithComplexPreds.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-WithComplexPreds.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-WithComplexPreds.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-WithComplexPreds.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiIndexes.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-MultiIndexes.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-MultiIndexes.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-MultiIndexes.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-Negative-NonEqual-Predicate.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-Negative-NonEqual-Predicate.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-Negative-NonEqual-Predicate.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-Negative-NonEqual-Predicate.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-NonDistKey.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-NonDistKey.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-NonDistKey.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-NonDistKey.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-WithComplexPredicates.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-WithComplexPredicates.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-WithComplexPredicates.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IndexApply-WithComplexPredicates.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IsNullPred.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IsNullPred.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ-IsNullPred.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-IsNullPred.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-PushDown.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-PushDown.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ-PushDown.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-PushDown.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-With-Agg.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-With-Agg.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ-With-Agg.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-With-Agg.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-With-Single-Pred-On-Outer.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-With-Single-Pred-On-Outer.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ-With-Single-Pred-On-Outer.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ-With-Single-Pred-On-Outer.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJNonNullRejectingPredicates.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJNonNullRejectingPredicates.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJNonNullRejectingPredicates.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJNonNullRejectingPredicates.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJNullRejectingPredicates.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJNullRejectingPredicates.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJNullRejectingPredicates.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJNullRejectingPredicates.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJNullRejectingZeroPlacePredicates.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJNullRejectingZeroPlacePredicates.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJNullRejectingZeroPlacePredicates.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJNullRejectingZeroPlacePredicates.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJReorderComplexNestedLOJs.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJReorderComplexNestedLOJs.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJReorderComplexNestedLOJs.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJReorderComplexNestedLOJs.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJReorderWithComplexPredicate.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJReorderWithComplexPredicate.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJReorderWithComplexPredicate.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJReorderWithComplexPredicate.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJReorderWithIDF.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJReorderWithIDF.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJReorderWithIDF.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJReorderWithIDF.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJReorderWithNestedLOJAndFilter.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJReorderWithNestedLOJAndFilter.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJReorderWithNestedLOJAndFilter.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJReorderWithNestedLOJAndFilter.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJReorderWithOneSidedFilter.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJReorderWithOneSidedFilter.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJReorderWithOneSidedFilter.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJReorderWithOneSidedFilter.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJReorderWithSimplePredicate.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJReorderWithSimplePredicate.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJReorderWithSimplePredicate.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJReorderWithSimplePredicate.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJWithFalsePred.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJWithFalsePred.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJWithFalsePred.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJWithFalsePred.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ_IDF_no_convert_outer_ref_predicate_with_NULL.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ_IDF_no_convert_outer_ref_predicate_with_NULL.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ_IDF_no_convert_outer_ref_predicate_with_NULL.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ_IDF_no_convert_outer_ref_predicate_with_NULL.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ_IDF_no_convert_outer_ref_predicate_with_inner_ref.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ_IDF_no_convert_outer_ref_predicate_with_inner_ref.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ_IDF_no_convert_outer_ref_predicate_with_inner_ref.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ_IDF_no_convert_outer_ref_predicate_with_inner_ref.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ_NULLTEST-On-SelfCheck-Pred.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ_NULLTEST-On-SelfCheck-Pred.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ_NULLTEST-On-SelfCheck-Pred.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ_NULLTEST-On-SelfCheck-Pred.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ_bb_mpph.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ_bb_mpph.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ_bb_mpph.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ_bb_mpph.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ_convert_to_inner_with_and_predicate.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ_convert_to_inner_with_and_predicate.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ_convert_to_inner_with_and_predicate.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ_convert_to_inner_with_and_predicate.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ_convert_to_inner_with_inner_predicate_IDF.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ_convert_to_inner_with_inner_predicate_IDF.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ_convert_to_inner_with_inner_predicate_IDF.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ_convert_to_inner_with_inner_predicate_IDF.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ_convert_to_inner_with_or_predicate.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ_convert_to_inner_with_or_predicate.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ_convert_to_inner_with_or_predicate.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ_convert_to_inner_with_or_predicate.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ_dont_convert_to_inner_with_inner_predicate_IDF_const.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ_dont_convert_to_inner_with_inner_predicate_IDF_const.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ_dont_convert_to_inner_with_inner_predicate_IDF_const.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ_dont_convert_to_inner_with_inner_predicate_IDF_const.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ_dont_convert_to_inner_with_outer_predicate_INDF.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ_dont_convert_to_inner_with_outer_predicate_INDF.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ_dont_convert_to_inner_with_outer_predicate_INDF.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ_dont_convert_to_inner_with_outer_predicate_INDF.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LOJ_dont_convert_to_inner_with_outer_predicate_INDF_const.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ_dont_convert_to_inner_with_outer_predicate_INDF_const.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LOJ_dont_convert_to_inner_with_outer_predicate_INDF_const.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LOJ_dont_convert_to_inner_with_outer_predicate_INDF_const.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LargeJoins.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LargeJoins.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LargeJoins.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LargeJoins.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LargeMultiColumnInList.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LargeMultiColumnInList.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LargeMultiColumnInList.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LargeMultiColumnInList.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Lead-Lag-WinFuncs.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Lead-Lag-WinFuncs.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Lead-Lag-WinFuncs.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Lead-Lag-WinFuncs.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Least-Greatest-Subselect.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Least-Greatest-Subselect.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Least-Greatest-Subselect.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Least-Greatest-Subselect.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Least-Greatest.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Least-Greatest.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Least-Greatest.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Least-Greatest.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LeftJoin-DPv2-With-Select.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftJoin-DPv2-With-Select.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LeftJoin-DPv2-With-Select.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftJoin-DPv2-With-Select.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LeftJoin-UnsupportedFilter-Cardinality.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftJoin-UnsupportedFilter-Cardinality.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LeftJoin-UnsupportedFilter-Cardinality.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftJoin-UnsupportedFilter-Cardinality.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LeftJoin-With-Coalesce.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftJoin-With-Coalesce.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LeftJoin-With-Coalesce.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftJoin-With-Coalesce.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LeftJoin-With-Col-Const-Pred.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftJoin-With-Col-Const-Pred.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LeftJoin-With-Col-Const-Pred.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftJoin-With-Col-Const-Pred.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LeftJoin-With-Pred-On-Inner.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftJoin-With-Pred-On-Inner.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LeftJoin-With-Pred-On-Inner.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftJoin-With-Pred-On-Inner.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LeftJoin-With-Pred-On-Inner2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftJoin-With-Pred-On-Inner2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LeftJoin-With-Pred-On-Inner2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftJoin-With-Pred-On-Inner2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LeftJoinBroadcastTableHashSpec.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftJoinBroadcastTableHashSpec.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LeftJoinBroadcastTableHashSpec.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftJoinBroadcastTableHashSpec.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LeftJoinDPv2JoinOrder.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftJoinDPv2JoinOrder.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LeftJoinDPv2JoinOrder.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftJoinDPv2JoinOrder.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LeftJoinNullsNotColocated.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftJoinNullsNotColocated.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LeftJoinNullsNotColocated.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftJoinNullsNotColocated.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LeftJoinPruning.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftJoinPruning.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LeftJoinPruning.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftJoinPruning.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LeftJoinPruningInOuterInnerQuery.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftJoinPruningInOuterInnerQuery.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LeftJoinPruningInOuterInnerQuery.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftJoinPruningInOuterInnerQuery.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LeftJoinPruningInnerQuery.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftJoinPruningInnerQuery.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LeftJoinPruningInnerQuery.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftJoinPruningInnerQuery.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LeftJoinPruningOuterQuery.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftJoinPruningOuterQuery.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LeftJoinPruningOuterQuery.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftJoinPruningOuterQuery.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LeftOuter2InnerUnionAllAntiSemiJoin-Tpcds.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftOuter2InnerUnionAllAntiSemiJoin-Tpcds.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LeftOuter2InnerUnionAllAntiSemiJoin-Tpcds.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftOuter2InnerUnionAllAntiSemiJoin-Tpcds.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LeftOuter2InnerUnionAllAntiSemiJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftOuter2InnerUnionAllAntiSemiJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LeftOuter2InnerUnionAllAntiSemiJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftOuter2InnerUnionAllAntiSemiJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LeftSemiJoinCE.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftSemiJoinCE.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LeftSemiJoinCE.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftSemiJoinCE.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LeftSemiJoinWithRepOuterTab.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftSemiJoinWithRepOuterTab.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LeftSemiJoinWithRepOuterTab.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LeftSemiJoinWithRepOuterTab.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LikePredStatsNotComparable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LikePredStatsNotComparable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LikePredStatsNotComparable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LikePredStatsNotComparable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ListPartLossyCastEq.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ListPartLossyCastEq.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ListPartLossyCastEq.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ListPartLossyCastEq.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ListPartLossyCastLT.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ListPartLossyCastLT.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ListPartLossyCastLT.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ListPartLossyCastLT.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ListPartLossyCastNEq.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ListPartLossyCastNEq.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ListPartLossyCastNEq.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ListPartLossyCastNEq.mdp diff --git a/src/backend/gporca/data/dxl/minidump/LogicalIndexGetDroppedCols.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/LogicalIndexGetDroppedCols.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/LogicalIndexGetDroppedCols.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/LogicalIndexGetDroppedCols.mdp diff --git a/src/backend/gporca/data/dxl/minidump/MDQA-SameDQAColumn.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MDQA-SameDQAColumn.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MDQA-SameDQAColumn.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MDQA-SameDQAColumn.mdp diff --git a/src/backend/gporca/data/dxl/minidump/MDQAs-Grouping-OrderBy.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MDQAs-Grouping-OrderBy.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MDQAs-Grouping-OrderBy.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MDQAs-Grouping-OrderBy.mdp diff --git a/src/backend/gporca/data/dxl/minidump/MDQAs-Grouping.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MDQAs-Grouping.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MDQAs-Grouping.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MDQAs-Grouping.mdp diff --git a/src/backend/gporca/data/dxl/minidump/MDQAs-Union.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MDQAs-Union.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MDQAs-Union.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MDQAs-Union.mdp diff --git a/src/backend/gporca/data/dxl/minidump/MDQAs1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MDQAs1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MDQAs1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MDQAs1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ManyTextUnionsInSubquery.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ManyTextUnionsInSubquery.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ManyTextUnionsInSubquery.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ManyTextUnionsInSubquery.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Max-Aggregate-uses-IndexScan-and-Limit.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Max-Aggregate-uses-IndexScan-and-Limit.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Max-Aggregate-uses-IndexScan-and-Limit.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Max-Aggregate-uses-IndexScan-and-Limit.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Min-Aggregate-uses-IndexScan-and-Limit.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Min-Aggregate-uses-IndexScan-and-Limit.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Min-Aggregate-uses-IndexScan-and-Limit.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Min-Aggregate-uses-IndexScan-and-Limit.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Minidump.xml b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Minidump.xml similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Minidump.xml rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Minidump.xml diff --git a/src/backend/gporca/data/dxl/minidump/MissingBoolColStats.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MissingBoolColStats.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MissingBoolColStats.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MissingBoolColStats.mdp diff --git a/src/backend/gporca/data/dxl/minidump/MissingStats.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MissingStats.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MissingStats.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MissingStats.mdp diff --git a/src/backend/gporca/data/dxl/minidump/MotionHazard-MaterializeUnderResult.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MotionHazard-MaterializeUnderResult.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MotionHazard-MaterializeUnderResult.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MotionHazard-MaterializeUnderResult.mdp diff --git a/src/backend/gporca/data/dxl/minidump/MotionHazard-NoMaterializeGatherUnderResult.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MotionHazard-NoMaterializeGatherUnderResult.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MotionHazard-NoMaterializeGatherUnderResult.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MotionHazard-NoMaterializeGatherUnderResult.mdp diff --git a/src/backend/gporca/data/dxl/minidump/MotionHazard-NoMaterializeHashAggUnderResult.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MotionHazard-NoMaterializeHashAggUnderResult.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MotionHazard-NoMaterializeHashAggUnderResult.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MotionHazard-NoMaterializeHashAggUnderResult.mdp diff --git a/src/backend/gporca/data/dxl/minidump/MotionHazard-NoMaterializeSortUnderResult.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MotionHazard-NoMaterializeSortUnderResult.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MotionHazard-NoMaterializeSortUnderResult.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MotionHazard-NoMaterializeSortUnderResult.mdp diff --git a/src/backend/gporca/data/dxl/minidump/MultiColumnAggWithDefaultOpfamilies.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MultiColumnAggWithDefaultOpfamilies.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MultiColumnAggWithDefaultOpfamilies.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MultiColumnAggWithDefaultOpfamilies.mdp diff --git a/src/backend/gporca/data/dxl/minidump/MultiColumnDQA-InnerJoin-GroupBy-HashAggregate.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MultiColumnDQA-InnerJoin-GroupBy-HashAggregate.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MultiColumnDQA-InnerJoin-GroupBy-HashAggregate.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MultiColumnDQA-InnerJoin-GroupBy-HashAggregate.mdp diff --git a/src/backend/gporca/data/dxl/minidump/MultiDistKeyJoinCardinality.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MultiDistKeyJoinCardinality.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MultiDistKeyJoinCardinality.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MultiDistKeyJoinCardinality.mdp diff --git a/src/backend/gporca/data/dxl/minidump/MultiDistKeyWithOtherPredsJoinCardinality.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MultiDistKeyWithOtherPredsJoinCardinality.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MultiDistKeyWithOtherPredsJoinCardinality.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MultiDistKeyWithOtherPredsJoinCardinality.mdp diff --git a/src/backend/gporca/data/dxl/minidump/MultiLevel-CorrelatedExec.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MultiLevel-CorrelatedExec.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MultiLevel-CorrelatedExec.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MultiLevel-CorrelatedExec.mdp diff --git a/src/backend/gporca/data/dxl/minidump/MultiLevel-IN-Subquery.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MultiLevel-IN-Subquery.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MultiLevel-IN-Subquery.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MultiLevel-IN-Subquery.mdp diff --git a/src/backend/gporca/data/dxl/minidump/MultiLevel-NOT-IN-Subquery.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MultiLevel-NOT-IN-Subquery.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MultiLevel-NOT-IN-Subquery.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MultiLevel-NOT-IN-Subquery.mdp diff --git a/src/backend/gporca/data/dxl/minidump/MultiLevelDecorrelationWithSemiJoins.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MultiLevelDecorrelationWithSemiJoins.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MultiLevelDecorrelationWithSemiJoins.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MultiLevelDecorrelationWithSemiJoins.mdp diff --git a/src/backend/gporca/data/dxl/minidump/MultiLevelPartLossyCastNEq.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MultiLevelPartLossyCastNEq.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MultiLevelPartLossyCastNEq.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MultiLevelPartLossyCastNEq.mdp diff --git a/src/backend/gporca/data/dxl/minidump/MultipleDampedPredJoinCardinality.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MultipleDampedPredJoinCardinality.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MultipleDampedPredJoinCardinality.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MultipleDampedPredJoinCardinality.mdp diff --git a/src/backend/gporca/data/dxl/minidump/MultipleIndependentPredJoinCardinality.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MultipleIndependentPredJoinCardinality.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MultipleIndependentPredJoinCardinality.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MultipleIndependentPredJoinCardinality.mdp diff --git a/src/backend/gporca/data/dxl/minidump/MultipleIndexPredicate.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MultipleIndexPredicate.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MultipleIndexPredicate.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MultipleIndexPredicate.mdp diff --git a/src/backend/gporca/data/dxl/minidump/MultipleSetReturningFunction-1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MultipleSetReturningFunction-1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MultipleSetReturningFunction-1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MultipleSetReturningFunction-1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/MultipleSetReturningFunction-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MultipleSetReturningFunction-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MultipleSetReturningFunction-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MultipleSetReturningFunction-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/MultipleSetReturningFunction-3.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MultipleSetReturningFunction-3.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MultipleSetReturningFunction-3.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MultipleSetReturningFunction-3.mdp diff --git a/src/backend/gporca/data/dxl/minidump/MultipleSubqueriesInSelectClause.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MultipleSubqueriesInSelectClause.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MultipleSubqueriesInSelectClause.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MultipleSubqueriesInSelectClause.mdp diff --git a/src/backend/gporca/data/dxl/minidump/MultipleUpdateWithJoinOnDistCol.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/MultipleUpdateWithJoinOnDistCol.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/MultipleUpdateWithJoinOnDistCol.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/MultipleUpdateWithJoinOnDistCol.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NLJ-BC-Outer-Spool-Inner.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NLJ-BC-Outer-Spool-Inner.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NLJ-BC-Outer-Spool-Inner.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NLJ-BC-Outer-Spool-Inner.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NLJ-Broadcast-DPE-Outer-Child.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NLJ-Broadcast-DPE-Outer-Child.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NLJ-Broadcast-DPE-Outer-Child.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NLJ-Broadcast-DPE-Outer-Child.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NLJ-DistCol-No-Broadcast.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NLJ-DistCol-No-Broadcast.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NLJ-DistCol-No-Broadcast.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NLJ-DistCol-No-Broadcast.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NLJ-EqAllCol-No-Broadcast.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NLJ-EqAllCol-No-Broadcast.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NLJ-EqAllCol-No-Broadcast.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NLJ-EqAllCol-No-Broadcast.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NLJ-EqDistCol-InEqNonDistCol-No-Broadcast.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NLJ-EqDistCol-InEqNonDistCol-No-Broadcast.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NLJ-EqDistCol-InEqNonDistCol-No-Broadcast.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NLJ-EqDistCol-InEqNonDistCol-No-Broadcast.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NLJ-InEqDistCol-EqNonDistCol-Redistribute.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NLJ-InEqDistCol-EqNonDistCol-Redistribute.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NLJ-InEqDistCol-EqNonDistCol-Redistribute.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NLJ-InEqDistCol-EqNonDistCol-Redistribute.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NLJ-Rewindability-CTAS.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NLJ-Rewindability-CTAS.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NLJ-Rewindability-CTAS.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NLJ-Rewindability-CTAS.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NLJ-Rewindability.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NLJ-Rewindability.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NLJ-Rewindability.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NLJ-Rewindability.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NOT-IN-ArrayCmp.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NOT-IN-ArrayCmp.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NOT-IN-ArrayCmp.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NOT-IN-ArrayCmp.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NOT-IN-NotNullBoth.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NOT-IN-NotNullBoth.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NOT-IN-NotNullBoth.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NOT-IN-NotNullBoth.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NOT-IN-NullInner.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NOT-IN-NullInner.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NOT-IN-NullInner.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NOT-IN-NullInner.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NOT-IN-NullOuter.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NOT-IN-NullOuter.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NOT-IN-NullOuter.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NOT-IN-NullOuter.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Name-Cardinality.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Name-Cardinality.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Name-Cardinality.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Name-Cardinality.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NaryWithLojAndNonLojChilds.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NaryWithLojAndNonLojChilds.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NaryWithLojAndNonLojChilds.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NaryWithLojAndNonLojChilds.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NdvPreservingExprProjectionEquiJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NdvPreservingExprProjectionEquiJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NdvPreservingExprProjectionEquiJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NdvPreservingExprProjectionEquiJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NdvPreservingExprProjectionNonEquiJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NdvPreservingExprProjectionNonEquiJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NdvPreservingExprProjectionNonEquiJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NdvPreservingExprProjectionNonEquiJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Negative-IndexApply1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Negative-IndexApply1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Negative-IndexApply1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Negative-IndexApply1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Negative-IndexApply2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Negative-IndexApply2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Negative-IndexApply2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Negative-IndexApply2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Nested-Or-Predicates.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Nested-Or-Predicates.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Nested-Or-Predicates.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Nested-Or-Predicates.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Nested-Setops-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Nested-Setops-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Nested-Setops-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Nested-Setops-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Nested-Setops.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Nested-Setops.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Nested-Setops.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Nested-Setops.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NestedInSubqWithPrjListOuterRefNoInnerRef.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NestedInSubqWithPrjListOuterRefNoInnerRef.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NestedInSubqWithPrjListOuterRefNoInnerRef.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NestedInSubqWithPrjListOuterRefNoInnerRef.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NestedJoinWithCastedColumn.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NestedJoinWithCastedColumn.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NestedJoinWithCastedColumn.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NestedJoinWithCastedColumn.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NestedNLJWithBlockingSpool.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NestedNLJWithBlockingSpool.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NestedNLJWithBlockingSpool.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NestedNLJWithBlockingSpool.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NestedProjectCountStarWithOuterRefs.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NestedProjectCountStarWithOuterRefs.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NestedProjectCountStarWithOuterRefs.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NestedProjectCountStarWithOuterRefs.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NestedSubqLimitBindings.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NestedSubqLimitBindings.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NestedSubqLimitBindings.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NestedSubqLimitBindings.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NewBtreeIndexScanCost.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NewBtreeIndexScanCost.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NewBtreeIndexScanCost.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NewBtreeIndexScanCost.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NoBroadcastUnderGatherForWindowFunction.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NoBroadcastUnderGatherForWindowFunction.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NoBroadcastUnderGatherForWindowFunction.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NoBroadcastUnderGatherForWindowFunction.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NoDistKeyMultiPredJoinCardinality.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NoDistKeyMultiPredJoinCardinality.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NoDistKeyMultiPredJoinCardinality.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NoDistKeyMultiPredJoinCardinality.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NoHashAggWithoutPrelimFunc.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NoHashAggWithoutPrelimFunc.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NoHashAggWithoutPrelimFunc.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NoHashAggWithoutPrelimFunc.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NoMissingStats.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NoMissingStats.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NoMissingStats.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NoMissingStats.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NoMissingStatsAfterDroppedCol.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NoMissingStatsAfterDroppedCol.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NoMissingStatsAfterDroppedCol.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NoMissingStatsAfterDroppedCol.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NoMissingStatsAskingForSystemColFOJ.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NoMissingStatsAskingForSystemColFOJ.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NoMissingStatsAskingForSystemColFOJ.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NoMissingStatsAskingForSystemColFOJ.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NoMissingStatsForEmptyTable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NoMissingStatsForEmptyTable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NoMissingStatsForEmptyTable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NoMissingStatsForEmptyTable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NoMotionsPlan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NoMotionsPlan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NoMotionsPlan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NoMotionsPlan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NoPartConstraint-WhenNoDefaultPartsAndIndices.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NoPartConstraint-WhenNoDefaultPartsAndIndices.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NoPartConstraint-WhenNoDefaultPartsAndIndices.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NoPartConstraint-WhenNoDefaultPartsAndIndices.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NoPartPropagationPlan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NoPartPropagationPlan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NoPartPropagationPlan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NoPartPropagationPlan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NoPushdownPredicateWithCTEAnchor.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NoPushdownPredicateWithCTEAnchor.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NoPushdownPredicateWithCTEAnchor.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NoPushdownPredicateWithCTEAnchor.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NoRedistributeOnAppend.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NoRedistributeOnAppend.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NoRedistributeOnAppend.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NoRedistributeOnAppend.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NoSortPlan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NoSortPlan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NoSortPlan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NoSortPlan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Non-Hashjoinable-Pred-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Non-Hashjoinable-Pred-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Non-Hashjoinable-Pred-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Non-Hashjoinable-Pred-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Non-Hashjoinable-Pred.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Non-Hashjoinable-Pred.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Non-Hashjoinable-Pred.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Non-Hashjoinable-Pred.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NonOverlappingHomogenousIndexesOnRoot-ANDPredicate-HEAP.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NonOverlappingHomogenousIndexesOnRoot-ANDPredicate-HEAP.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NonOverlappingHomogenousIndexesOnRoot-ANDPredicate-HEAP.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NonOverlappingHomogenousIndexesOnRoot-ANDPredicate-HEAP.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NonSingleton.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NonSingleton.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NonSingleton.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NonSingleton.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NonSplittableAgg.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NonSplittableAgg.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NonSplittableAgg.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NonSplittableAgg.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NotExists-SuperflousOuterRefWithGbAgg.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NotExists-SuperflousOuterRefWithGbAgg.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NotExists-SuperflousOuterRefWithGbAgg.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NotExists-SuperflousOuterRefWithGbAgg.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NotExists-SuperfluousEquality.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NotExists-SuperfluousEquality.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NotExists-SuperfluousEquality.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NotExists-SuperfluousEquality.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NotInToLASJ.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NotInToLASJ.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NotInToLASJ.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NotInToLASJ.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NotWellDefinedDisjunctConjunctPredicates.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NotWellDefinedDisjunctConjunctPredicates.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NotWellDefinedDisjunctConjunctPredicates.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NotWellDefinedDisjunctConjunctPredicates.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NullConstant-INDF-Col.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NullConstant-INDF-Col.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NullConstant-INDF-Col.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NullConstant-INDF-Col.mdp diff --git a/src/backend/gporca/data/dxl/minidump/NullIf-With-Subquery.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/NullIf-With-Subquery.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/NullIf-With-Subquery.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/NullIf-With-Subquery.mdp diff --git a/src/backend/gporca/data/dxl/minidump/OR-WithIsNullPred.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/OR-WithIsNullPred.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/OR-WithIsNullPred.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/OR-WithIsNullPred.mdp diff --git a/src/backend/gporca/data/dxl/minidump/OR.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/OR.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/OR.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/OR.mdp diff --git a/src/backend/gporca/data/dxl/minidump/OneDistKeyMultiPredJoinCardinality.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/OneDistKeyMultiPredJoinCardinality.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/OneDistKeyMultiPredJoinCardinality.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/OneDistKeyMultiPredJoinCardinality.mdp diff --git a/src/backend/gporca/data/dxl/minidump/OneLevel-CorrelatedExec.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/OneLevel-CorrelatedExec.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/OneLevel-CorrelatedExec.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/OneLevel-CorrelatedExec.mdp diff --git a/src/backend/gporca/data/dxl/minidump/OneSegmentGather.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/OneSegmentGather.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/OneSegmentGather.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/OneSegmentGather.mdp diff --git a/src/backend/gporca/data/dxl/minidump/OptimizerConfigWithSegmentsForCosting.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/OptimizerConfigWithSegmentsForCosting.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/OptimizerConfigWithSegmentsForCosting.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/OptimizerConfigWithSegmentsForCosting.mdp diff --git a/src/backend/gporca/data/dxl/minidump/OrderByNoRedundantSort.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderByNoRedundantSort.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/OrderByNoRedundantSort.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderByNoRedundantSort.mdp diff --git a/src/backend/gporca/data/dxl/minidump/OrderByNullsFirst.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderByNullsFirst.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/OrderByNullsFirst.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderByNullsFirst.mdp diff --git a/src/backend/gporca/data/dxl/minidump/OrderByOuterRef.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderByOuterRef.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/OrderByOuterRef.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderByOuterRef.mdp diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAggUsingGroupColumnInDirectArg.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderedAggUsingGroupColumnInDirectArg.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/OrderedAggUsingGroupColumnInDirectArg.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderedAggUsingGroupColumnInDirectArg.mdp diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_array_fraction.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderedAgg_array_fraction.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/OrderedAgg_array_fraction.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderedAgg_array_fraction.mdp diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_computed_col.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderedAgg_computed_col.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/OrderedAgg_computed_col.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderedAgg_computed_col.mdp diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_multiple_diffcol.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderedAgg_multiple_diffcol.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/OrderedAgg_multiple_diffcol.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderedAgg_multiple_diffcol.mdp diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_multiple_samecol.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderedAgg_multiple_samecol.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/OrderedAgg_multiple_samecol.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderedAgg_multiple_samecol.mdp diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_multiple_samecol_difforderespec.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderedAgg_multiple_samecol_difforderespec.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/OrderedAgg_multiple_samecol_difforderespec.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderedAgg_multiple_samecol_difforderespec.mdp diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_single.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderedAgg_single.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/OrderedAgg_single.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderedAgg_single.mdp diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_skewed_data.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderedAgg_skewed_data.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/OrderedAgg_skewed_data.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderedAgg_skewed_data.mdp diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_with_groupby.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderedAgg_with_groupby.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/OrderedAgg_with_groupby.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderedAgg_with_groupby.mdp diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_with_nonOrderedAgg.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderedAgg_with_nonOrderedAgg.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/OrderedAgg_with_nonOrderedAgg.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderedAgg_with_nonOrderedAgg.mdp diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_with_nonconst_fraction.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderedAgg_with_nonconst_fraction.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/OrderedAgg_with_nonconst_fraction.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/OrderedAgg_with_nonconst_fraction.mdp diff --git a/src/backend/gporca/data/dxl/minidump/OuterJoin-With-OuterRefs.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/OuterJoin-With-OuterRefs.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/OuterJoin-With-OuterRefs.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/OuterJoin-With-OuterRefs.mdp diff --git a/src/backend/gporca/data/dxl/minidump/OuterJoinOnViewWithCastedColumn.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/OuterJoinOnViewWithCastedColumn.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/OuterJoinOnViewWithCastedColumn.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/OuterJoinOnViewWithCastedColumn.mdp diff --git a/src/backend/gporca/data/dxl/minidump/OverlappingHomogenousIndexesOnRoot-ANDPredicate-HEAP.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/OverlappingHomogenousIndexesOnRoot-ANDPredicate-HEAP.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/OverlappingHomogenousIndexesOnRoot-ANDPredicate-HEAP.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/OverlappingHomogenousIndexesOnRoot-ANDPredicate-HEAP.mdp diff --git a/src/backend/gporca/data/dxl/minidump/OverlappingHomogenousIndexesOnRoot-HEAP.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/OverlappingHomogenousIndexesOnRoot-HEAP.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/OverlappingHomogenousIndexesOnRoot-HEAP.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/OverlappingHomogenousIndexesOnRoot-HEAP.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ParallelUnionAllWithJson.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ParallelUnionAllWithJson.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ParallelUnionAllWithJson.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ParallelUnionAllWithJson.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Part-Selection-ConstArray-1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Part-Selection-ConstArray-1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Part-Selection-ConstArray-1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Part-Selection-ConstArray-1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Part-Selection-ConstArray-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Part-Selection-ConstArray-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Part-Selection-ConstArray-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Part-Selection-ConstArray-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Part-Selection-IN.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Part-Selection-IN.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Part-Selection-IN.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Part-Selection-IN.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Part-Selection-NOT-IN.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Part-Selection-NOT-IN.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Part-Selection-NOT-IN.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Part-Selection-NOT-IN.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartConstraint-WhenDefaultPartsAndIndices.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartConstraint-WhenDefaultPartsAndIndices.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartConstraint-WhenDefaultPartsAndIndices.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartConstraint-WhenDefaultPartsAndIndices.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartConstraint-WhenIndicesAndNoDefaultParts.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartConstraint-WhenIndicesAndNoDefaultParts.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartConstraint-WhenIndicesAndNoDefaultParts.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartConstraint-WhenIndicesAndNoDefaultParts.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartConstraint-WithOnlyDefaultPartInfo.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartConstraint-WithOnlyDefaultPartInfo.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartConstraint-WithOnlyDefaultPartInfo.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartConstraint-WithOnlyDefaultPartInfo.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartForeignDifferentExecLocation.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartForeignDifferentExecLocation.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartForeignDifferentExecLocation.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartForeignDifferentExecLocation.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartForeignDifferentServer.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartForeignDifferentServer.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartForeignDifferentServer.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartForeignDifferentServer.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartForeignMixed.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartForeignMixed.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartForeignMixed.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartForeignMixed.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartForeignMixedDPE.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartForeignMixedDPE.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartForeignMixedDPE.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartForeignMixedDPE.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartForeignMixedSPE.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartForeignMixedSPE.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartForeignMixedSPE.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartForeignMixedSPE.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartForeignUniformSPE.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartForeignUniformSPE.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartForeignUniformSPE.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartForeignUniformSPE.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartPredsWithRandom.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartPredsWithRandom.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartPredsWithRandom.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartPredsWithRandom.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartSelectorOnJoinSide.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartSelectorOnJoinSide.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartSelectorOnJoinSide.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartSelectorOnJoinSide.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartSelectorOnJoinSide2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartSelectorOnJoinSide2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartSelectorOnJoinSide2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartSelectorOnJoinSide2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-AggWithExistentialSubquery.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-AggWithExistentialSubquery.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-AggWithExistentialSubquery.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-AggWithExistentialSubquery.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-ArrayCoerce.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-ArrayCoerce.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-ArrayCoerce.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-ArrayCoerce.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-ArrayIn.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-ArrayIn.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-ArrayIn.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-ArrayIn.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-AsymmetricRangePredicate.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-AsymmetricRangePredicate.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-AsymmetricRangePredicate.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-AsymmetricRangePredicate.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-AvoidRangePred-DPE.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-AvoidRangePred-DPE.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-AvoidRangePred-DPE.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-AvoidRangePred-DPE.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-CSQ-NonPartKey.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-CSQ-NonPartKey.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-CSQ-NonPartKey.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-CSQ-NonPartKey.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-CSQ-PartKey.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-CSQ-PartKey.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-CSQ-PartKey.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-CSQ-PartKey.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-ComplexPredicate1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-ComplexPredicate1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-ComplexPredicate1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-ComplexPredicate1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-ComplexPredicate2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-ComplexPredicate2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-ComplexPredicate2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-ComplexPredicate2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-ComplexPredicate3.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-ComplexPredicate3.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-ComplexPredicate3.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-ComplexPredicate3.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-ComplexPredicate4.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-ComplexPredicate4.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-ComplexPredicate4.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-ComplexPredicate4.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-ComplexPredicate5.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-ComplexPredicate5.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-ComplexPredicate5.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-ComplexPredicate5.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-ComplexRangePredicate-DefaultPart.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-ComplexRangePredicate-DefaultPart.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-ComplexRangePredicate-DefaultPart.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-ComplexRangePredicate-DefaultPart.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-ComplexRangePredicate-NoDefaultPart.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-ComplexRangePredicate-NoDefaultPart.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-ComplexRangePredicate-NoDefaultPart.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-ComplexRangePredicate-NoDefaultPart.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-DPE-Correlated-NLOuter.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-DPE-Correlated-NLOuter.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-DPE-Correlated-NLOuter.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-DPE-Correlated-NLOuter.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-DPE-DynamicIndexOnlyScan-Range.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-DPE-DynamicIndexOnlyScan-Range.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-DPE-DynamicIndexOnlyScan-Range.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-DPE-DynamicIndexOnlyScan-Range.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-DPE-GroupBy.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-DPE-GroupBy.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-DPE-GroupBy.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-DPE-GroupBy.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-DPE-Limit.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-DPE-Limit.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-DPE-Limit.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-DPE-Limit.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-DPE-Opfamily.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-DPE-Opfamily.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-DPE-Opfamily.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-DPE-Opfamily.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-DPE-WindowFunction.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-DPE-WindowFunction.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-DPE-WindowFunction.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-DPE-WindowFunction.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-DPE.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-DPE.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-DPE.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-DPE.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-DTS.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-DTS.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-DTS.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-DTS.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-DTSEq.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-DTSEq.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-DTSEq.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-DTSEq.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-DTSLessThan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-DTSLessThan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-DTSLessThan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-DTSLessThan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-DateTime.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-DateTime.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-DateTime.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-DateTime.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-DisablePartSelection.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-DisablePartSelection.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-DisablePartSelection.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-DisablePartSelection.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-DisablePartSelectionJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-DisablePartSelectionJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-DisablePartSelectionJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-DisablePartSelectionJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-Disjunction.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-Disjunction.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-Disjunction.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-Disjunction.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-EqPredicateWithCastRange.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-EqPredicateWithCastRange.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-EqPredicateWithCastRange.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-EqPredicateWithCastRange.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-HJ1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-HJ1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-HJ1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-HJ1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-HJ2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-HJ2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-HJ2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-HJ2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-HJ3.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-HJ3.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-HJ3.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-HJ3.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-HJ4.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-HJ4.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-HJ4.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-HJ4.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-HJ5.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-HJ5.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-HJ5.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-HJ5.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-IDFList.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-IDFList.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-IDFList.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-IDFList.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-IDFNull.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-IDFNull.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-IDFNull.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-IDFNull.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-IDFWithCast.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-IDFWithCast.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-IDFWithCast.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-IDFWithCast.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-IndexOnDefPartOnly.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-IndexOnDefPartOnly.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-IndexOnDefPartOnly.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-IndexOnDefPartOnly.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-IsNotNullPredicate.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-IsNotNullPredicate.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-IsNotNullPredicate.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-IsNotNullPredicate.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-IsNullPredicate.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-IsNullPredicate.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-IsNullPredicate.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-IsNullPredicate.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-JoinOverExcept.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-JoinOverExcept.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-JoinOverExcept.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-JoinOverExcept.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-JoinOverGbAgg-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-JoinOverGbAgg-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-JoinOverGbAgg-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-JoinOverGbAgg-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-JoinOverGbAgg.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-JoinOverGbAgg.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-JoinOverGbAgg.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-JoinOverGbAgg.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-JoinOverIntersect.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-JoinOverIntersect.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-JoinOverIntersect.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-JoinOverIntersect.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-JoinOverUnion-1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-JoinOverUnion-1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-JoinOverUnion-1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-JoinOverUnion-1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-JoinOverUnion-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-JoinOverUnion-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-JoinOverUnion-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-JoinOverUnion-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-LASJ.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-LASJ.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-LASJ.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-LASJ.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-LeftOuterHashJoin-DPE-IsNull.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-LeftOuterHashJoin-DPE-IsNull.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-LeftOuterHashJoin-DPE-IsNull.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-LeftOuterHashJoin-DPE-IsNull.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-LeftOuterNLJoin-DPE-IsNull.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-LeftOuterNLJoin-DPE-IsNull.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-LeftOuterNLJoin-DPE-IsNull.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-LeftOuterNLJoin-DPE-IsNull.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-List-DPE-Int-Predicates.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-List-DPE-Int-Predicates.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-List-DPE-Int-Predicates.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-List-DPE-Int-Predicates.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-List-DPE-Varchar-Predicates.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-List-DPE-Varchar-Predicates.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-List-DPE-Varchar-Predicates.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-List-DPE-Varchar-Predicates.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-MultiWayJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-MultiWayJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-MultiWayJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-MultiWayJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-MultiWayJoinWithDPE-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-MultiWayJoinWithDPE-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-MultiWayJoinWithDPE-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-MultiWayJoinWithDPE-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-MultipleEqPredicates.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-MultipleEqPredicates.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-MultipleEqPredicates.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-MultipleEqPredicates.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-NEqPredicate.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-NEqPredicate.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-NEqPredicate.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-NEqPredicate.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-NLJ.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-NLJ.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-NLJ.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-NLJ.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-NonConstSelect.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-NonConstSelect.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-NonConstSelect.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-NonConstSelect.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-PredicateWithCast.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-PredicateWithCast.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-PredicateWithCast.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-PredicateWithCast.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-PredicateWithCastList.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-PredicateWithCastList.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-PredicateWithCastList.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-PredicateWithCastList.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-PredicateWithCastMultiLevelList.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-PredicateWithCastMultiLevelList.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-PredicateWithCastMultiLevelList.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-PredicateWithCastMultiLevelList.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-RangeJoinPred.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-RangeJoinPred.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-RangeJoinPred.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-RangeJoinPred.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-Relabel-Equality.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-Relabel-Equality.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-Relabel-Equality.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-Relabel-Equality.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-Relabel-Range.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-Relabel-Range.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-Relabel-Range.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-Relabel-Range.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-RightOuterHashJoin-DPE-IsNull-V2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-RightOuterHashJoin-DPE-IsNull-V2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-RightOuterHashJoin-DPE-IsNull-V2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-RightOuterHashJoin-DPE-IsNull-V2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-Boolean1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SPE-Boolean1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-SPE-Boolean1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SPE-Boolean1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-Boolean2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SPE-Boolean2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-SPE-Boolean2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SPE-Boolean2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost3.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost3.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost3.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost3.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost4.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost4.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost4.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost4.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost5.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost5.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost5.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost5.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost3.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost3.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost3.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost3.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost4.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost4.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost4.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost4.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost5.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost5.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost5.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost5.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SQAll.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SQAll.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-SQAll.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SQAll.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SQAny.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SQAny.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-SQAny.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SQAny.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SQExists.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SQExists.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-SQExists.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SQExists.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SQNotExists.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SQNotExists.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-SQNotExists.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SQNotExists.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SQScalar.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SQScalar.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-SQScalar.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SQScalar.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SubqueryOuterRef.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SubqueryOuterRef.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-SubqueryOuterRef.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-SubqueryOuterRef.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-VolatileFunc.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-VolatileFunc.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-VolatileFunc.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-VolatileFunc.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncNoDisjunctPredPushDown.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-WindowFuncNoDisjunctPredPushDown.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncNoDisjunctPredPushDown.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-WindowFuncNoDisjunctPredPushDown.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncNoPredPushDown.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-WindowFuncNoPredPushDown.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncNoPredPushDown.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-WindowFuncNoPredPushDown.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncPartialPredPushDown.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-WindowFuncPartialPredPushDown.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncPartialPredPushDown.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-WindowFuncPartialPredPushDown.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncPredPushDown.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-WindowFuncPredPushDown.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncPredPushDown.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-WindowFuncPredPushDown.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncSinglePredPushDown.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-WindowFuncSinglePredPushDown.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncSinglePredPushDown.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-WindowFuncSinglePredPushDown.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFunction.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-WindowFunction.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PartTbl-WindowFunction.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PartTbl-WindowFunction.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PredStatsNotComparable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PredStatsNotComparable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PredStatsNotComparable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PredStatsNotComparable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PredicateWithConjunctsAndDisjuncts.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PredicateWithConjunctsAndDisjuncts.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PredicateWithConjunctsAndDisjuncts.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PredicateWithConjunctsAndDisjuncts.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PredicateWithConjunctsOfDisjuncts.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PredicateWithConjunctsOfDisjuncts.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PredicateWithConjunctsOfDisjuncts.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PredicateWithConjunctsOfDisjuncts.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PredicateWithLongConjunction.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PredicateWithLongConjunction.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PredicateWithLongConjunction.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PredicateWithLongConjunction.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Preds-Over-WinFunc1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Preds-Over-WinFunc1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Preds-Over-WinFunc1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Preds-Over-WinFunc1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Preds-Over-WinFunc2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Preds-Over-WinFunc2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Preds-Over-WinFunc2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Preds-Over-WinFunc2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Preds-Over-WinFunc3.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Preds-Over-WinFunc3.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Preds-Over-WinFunc3.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Preds-Over-WinFunc3.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Preds-Over-WinFunc4.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Preds-Over-WinFunc4.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Preds-Over-WinFunc4.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Preds-Over-WinFunc4.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Preds-Over-WinFunc5.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Preds-Over-WinFunc5.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Preds-Over-WinFunc5.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Preds-Over-WinFunc5.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PreventIndexOnlyScanOnAppendOnlyVersion6UpgradedTable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PreventIndexOnlyScanOnAppendOnlyVersion6UpgradedTable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PreventIndexOnlyScanOnAppendOnlyVersion6UpgradedTable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PreventIndexOnlyScanOnAppendOnlyVersion6UpgradedTable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PreventIndexOnlyScanOnMixedAppendOnlyPartitionedTableContainingAppendOnlyVersion6Child.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PreventIndexOnlyScanOnMixedAppendOnlyPartitionedTableContainingAppendOnlyVersion6Child.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PreventIndexOnlyScanOnMixedAppendOnlyPartitionedTableContainingAppendOnlyVersion6Child.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PreventIndexOnlyScanOnMixedAppendOnlyPartitionedTableContainingAppendOnlyVersion6Child.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PreventIndexOnlyScanOnMixedPartitionedTableContainingAppendOnlyVersion6Child.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PreventIndexOnlyScanOnMixedPartitionedTableContainingAppendOnlyVersion6Child.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PreventIndexOnlyScanOnMixedPartitionedTableContainingAppendOnlyVersion6Child.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PreventIndexOnlyScanOnMixedPartitionedTableContainingAppendOnlyVersion6Child.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Project-With-NonScalar-Func.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Project-With-NonScalar-Func.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Project-With-NonScalar-Func.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Project-With-NonScalar-Func.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ProjectCountStar.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ProjectCountStar.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ProjectCountStar.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ProjectCountStar.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ProjectCountStarWithOuterRefs.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ProjectCountStarWithOuterRefs.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ProjectCountStarWithOuterRefs.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ProjectCountStarWithOuterRefs.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ProjectOutsideCountStar.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ProjectOutsideCountStar.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ProjectOutsideCountStar.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ProjectOutsideCountStar.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ProjectRepeatedColumn1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ProjectRepeatedColumn1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ProjectRepeatedColumn1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ProjectRepeatedColumn1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ProjectRepeatedColumn2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ProjectRepeatedColumn2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ProjectRepeatedColumn2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ProjectRepeatedColumn2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ProjectSetFunction.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ProjectSetFunction.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ProjectSetFunction.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ProjectSetFunction.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ProjectUnderSubq.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ProjectUnderSubq.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ProjectUnderSubq.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ProjectUnderSubq.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ProjectWithConstant.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ProjectWithConstant.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ProjectWithConstant.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ProjectWithConstant.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ProjectWithTextConstant.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ProjectWithTextConstant.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ProjectWithTextConstant.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ProjectWithTextConstant.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Push-Subplan-Below-Union.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Push-Subplan-Below-Union.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Push-Subplan-Below-Union.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Push-Subplan-Below-Union.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-10.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-10.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-10.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-10.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-11.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-11.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-11.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-11.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-12.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-12.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-12.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-12.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-13.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-13.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-13.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-13.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-14.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-14.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-14.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-14.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-15.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-15.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-15.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-15.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-16.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-16.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-16.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-16.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-17.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-17.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-17.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-17.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-3.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-3.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-3.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-3.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-4.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-4.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-4.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-4.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-5.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-5.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-5.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-5.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-6.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-6.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-6.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-6.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-7.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-7.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-7.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-7.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-8.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-8.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-8.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-8.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-9.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-9.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-9.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-9.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PushFilterToSemiJoinLeftChild.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PushFilterToSemiJoinLeftChild.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PushFilterToSemiJoinLeftChild.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PushFilterToSemiJoinLeftChild.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PushGbBelowJoin-NegativeCase.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PushGbBelowJoin-NegativeCase.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PushGbBelowJoin-NegativeCase.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PushGbBelowJoin-NegativeCase.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PushGbBelowNaryUnion-1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PushGbBelowNaryUnion-1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PushGbBelowNaryUnion-1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PushGbBelowNaryUnion-1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PushGbBelowNaryUnion-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PushGbBelowNaryUnion-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PushGbBelowNaryUnion-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PushGbBelowNaryUnion-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PushGbBelowNaryUnionAll.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PushGbBelowNaryUnionAll.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PushGbBelowNaryUnionAll.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PushGbBelowNaryUnionAll.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PushGbBelowUnion.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PushGbBelowUnion.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PushGbBelowUnion.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PushGbBelowUnion.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PushGbBelowUnionAll.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PushGbBelowUnionAll.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PushGbBelowUnionAll.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PushGbBelowUnionAll.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PushSelectDownUnionAllOfCTG.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PushSelectDownUnionAllOfCTG.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PushSelectDownUnionAllOfCTG.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PushSelectDownUnionAllOfCTG.mdp diff --git a/src/backend/gporca/data/dxl/minidump/PushSelectWithOuterRefBelowUnion.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/PushSelectWithOuterRefBelowUnion.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/PushSelectWithOuterRefBelowUnion.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/PushSelectWithOuterRefBelowUnion.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Query.xml b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Query.xml similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Query.xml rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Query.xml diff --git a/src/backend/gporca/data/dxl/minidump/QueryMismatchedDistribution-DynamicIndexScan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/QueryMismatchedDistribution-DynamicIndexScan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/QueryMismatchedDistribution-DynamicIndexScan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/QueryMismatchedDistribution-DynamicIndexScan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/QueryMismatchedDistribution.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/QueryMismatchedDistribution.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/QueryMismatchedDistribution.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/QueryMismatchedDistribution.mdp diff --git a/src/backend/gporca/data/dxl/minidump/RTErequiredPerms.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/RTErequiredPerms.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/RTErequiredPerms.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/RTErequiredPerms.mdp diff --git a/src/backend/gporca/data/dxl/minidump/RangePartLossyCastEqInPartitionRange.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/RangePartLossyCastEqInPartitionRange.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/RangePartLossyCastEqInPartitionRange.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/RangePartLossyCastEqInPartitionRange.mdp diff --git a/src/backend/gporca/data/dxl/minidump/RangePartLossyCastEqOnEndPartitionRange.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/RangePartLossyCastEqOnEndPartitionRange.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/RangePartLossyCastEqOnEndPartitionRange.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/RangePartLossyCastEqOnEndPartitionRange.mdp diff --git a/src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTEqInPartitionRange.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/RangePartLossyCastLTEqInPartitionRange.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTEqInPartitionRange.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/RangePartLossyCastLTEqInPartitionRange.mdp diff --git a/src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTEqOnEndPartitionRange.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/RangePartLossyCastLTEqOnEndPartitionRange.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTEqOnEndPartitionRange.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/RangePartLossyCastLTEqOnEndPartitionRange.mdp diff --git a/src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTInPartitionRange.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/RangePartLossyCastLTInPartitionRange.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTInPartitionRange.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/RangePartLossyCastLTInPartitionRange.mdp diff --git a/src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTOnEndPartitionRange.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/RangePartLossyCastLTOnEndPartitionRange.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTOnEndPartitionRange.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/RangePartLossyCastLTOnEndPartitionRange.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Remove-Distinct-From-Subquery.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Remove-Distinct-From-Subquery.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Remove-Distinct-From-Subquery.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Remove-Distinct-From-Subquery.mdp diff --git a/src/backend/gporca/data/dxl/minidump/RemoveImpliedPredOnBCCPredicates.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/RemoveImpliedPredOnBCCPredicates.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/RemoveImpliedPredOnBCCPredicates.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/RemoveImpliedPredOnBCCPredicates.mdp diff --git a/src/backend/gporca/data/dxl/minidump/RemoveUnusedProjElements.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/RemoveUnusedProjElements.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/RemoveUnusedProjElements.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/RemoveUnusedProjElements.mdp diff --git a/src/backend/gporca/data/dxl/minidump/RemoveUnusedProjElementsInGbAgg.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/RemoveUnusedProjElementsInGbAgg.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/RemoveUnusedProjElementsInGbAgg.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/RemoveUnusedProjElementsInGbAgg.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedHashJoinReplicated.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedHashJoinReplicated.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ReplicatedHashJoinReplicated.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedHashJoinReplicated.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedJoinHashDistributedTable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedJoinHashDistributedTable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ReplicatedJoinHashDistributedTable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedJoinHashDistributedTable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedJoinPartitionedTable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedJoinPartitionedTable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ReplicatedJoinPartitionedTable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedJoinPartitionedTable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedJoinRandomDistributedTable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedJoinRandomDistributedTable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ReplicatedJoinRandomDistributedTable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedJoinRandomDistributedTable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedLOJHashDistributedTable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedLOJHashDistributedTable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ReplicatedLOJHashDistributedTable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedLOJHashDistributedTable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedLOJRandomDistributedTable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedLOJRandomDistributedTable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ReplicatedLOJRandomDistributedTable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedLOJRandomDistributedTable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedLOJReplicated.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedLOJReplicated.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ReplicatedLOJReplicated.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedLOJReplicated.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedNLJReplicated.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedNLJReplicated.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ReplicatedNLJReplicated.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedNLJReplicated.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedTable-CTAS.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedTable-CTAS.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ReplicatedTable-CTAS.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedTable-CTAS.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedTableAggregate.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedTableAggregate.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ReplicatedTableAggregate.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedTableAggregate.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedTableCTE.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedTableCTE.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ReplicatedTableCTE.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedTableCTE.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedTableGroupBy.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedTableGroupBy.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ReplicatedTableGroupBy.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedTableGroupBy.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedTableInClause.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedTableInClause.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ReplicatedTableInClause.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedTableInClause.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedTableInsert.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedTableInsert.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ReplicatedTableInsert.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedTableInsert.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedTableSelect.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedTableSelect.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ReplicatedTableSelect.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedTableSelect.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedTableSequenceInsert.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedTableSequenceInsert.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ReplicatedTableSequenceInsert.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedTableSequenceInsert.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedTableWithAggNoMotion.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedTableWithAggNoMotion.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ReplicatedTableWithAggNoMotion.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ReplicatedTableWithAggNoMotion.mdp diff --git a/src/backend/gporca/data/dxl/minidump/RightJoinBothReplicated.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/RightJoinBothReplicated.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/RightJoinBothReplicated.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/RightJoinBothReplicated.mdp diff --git a/src/backend/gporca/data/dxl/minidump/RightJoinDPE.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/RightJoinDPE.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/RightJoinDPE.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/RightJoinDPE.mdp diff --git a/src/backend/gporca/data/dxl/minidump/RightJoinDpeWithWhereClause.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/RightJoinDpeWithWhereClause.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/RightJoinDpeWithWhereClause.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/RightJoinDpeWithWhereClause.mdp diff --git a/src/backend/gporca/data/dxl/minidump/RightJoinHashed.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/RightJoinHashed.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/RightJoinHashed.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/RightJoinHashed.mdp diff --git a/src/backend/gporca/data/dxl/minidump/RightJoinNoDPSNonDistKey.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/RightJoinNoDPSNonDistKey.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/RightJoinNoDPSNonDistKey.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/RightJoinNoDPSNonDistKey.mdp diff --git a/src/backend/gporca/data/dxl/minidump/RightJoinRedistribute.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/RightJoinRedistribute.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/RightJoinRedistribute.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/RightJoinRedistribute.mdp diff --git a/src/backend/gporca/data/dxl/minidump/RightJoinReplicated.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/RightJoinReplicated.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/RightJoinReplicated.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/RightJoinReplicated.mdp diff --git a/src/backend/gporca/data/dxl/minidump/RightJoinTVF.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/RightJoinTVF.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/RightJoinTVF.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/RightJoinTVF.mdp diff --git a/src/backend/gporca/data/dxl/minidump/RollupNoAgg.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/RollupNoAgg.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/RollupNoAgg.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/RollupNoAgg.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ScSubqueryWithOuterRef.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ScSubqueryWithOuterRef.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ScSubqueryWithOuterRef.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ScSubqueryWithOuterRef.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ScalarCorrelatedSubqueryCountStar.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ScalarCorrelatedSubqueryCountStar.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ScalarCorrelatedSubqueryCountStar.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ScalarCorrelatedSubqueryCountStar.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ScalarDQAWithNonScalarAgg.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ScalarDQAWithNonScalarAgg.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ScalarDQAWithNonScalarAgg.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ScalarDQAWithNonScalarAgg.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ScalarFuncPushedBelowGather.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ScalarFuncPushedBelowGather.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ScalarFuncPushedBelowGather.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ScalarFuncPushedBelowGather.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ScalarSubq-Eq-SubqAll-1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ScalarSubq-Eq-SubqAll-1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ScalarSubq-Eq-SubqAll-1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ScalarSubq-Eq-SubqAll-1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ScalarSubq-Eq-SubqAll-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ScalarSubq-Eq-SubqAll-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ScalarSubq-Eq-SubqAll-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ScalarSubq-Eq-SubqAll-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ScalarSubqueryCountStar.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ScalarSubqueryCountStar.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ScalarSubqueryCountStar.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ScalarSubqueryCountStar.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ScalarSubqueryCountStarInJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ScalarSubqueryCountStarInJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ScalarSubqueryCountStarInJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ScalarSubqueryCountStarInJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Select-Over-CTEAnchor.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Select-Over-CTEAnchor.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Select-Over-CTEAnchor.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Select-Over-CTEAnchor.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Select-Over-PartTbl.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Select-Over-PartTbl.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Select-Over-PartTbl.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Select-Over-PartTbl.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Select-Proj-OuterJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Select-Proj-OuterJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Select-Proj-OuterJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Select-Proj-OuterJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SelectCheckConstraint.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SelectCheckConstraint.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SelectCheckConstraint.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SelectCheckConstraint.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SelectOnBpchar.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SelectOnBpchar.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SelectOnBpchar.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SelectOnBpchar.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SelectOnCastedCol.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SelectOnCastedCol.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SelectOnCastedCol.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SelectOnCastedCol.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Self-Comparison-Nullable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Self-Comparison-Nullable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Self-Comparison-Nullable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Self-Comparison-Nullable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Self-Comparison.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Self-Comparison.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Self-Comparison.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Self-Comparison.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SelfJoinDampedPredJoinCardinality.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SelfJoinDampedPredJoinCardinality.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SelfJoinDampedPredJoinCardinality.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SelfJoinDampedPredJoinCardinality.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SelfUpdate.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SelfUpdate.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SelfUpdate.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SelfUpdate.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SemiJoin2InnerJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SemiJoin2InnerJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SemiJoin2InnerJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SemiJoin2InnerJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SemiJoin2Select-1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SemiJoin2Select-1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SemiJoin2Select-1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SemiJoin2Select-1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SemiJoin2Select-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SemiJoin2Select-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SemiJoin2Select-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SemiJoin2Select-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SemiJoin2Select-EnforceSubplan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SemiJoin2Select-EnforceSubplan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SemiJoin2Select-EnforceSubplan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SemiJoin2Select-EnforceSubplan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SemiJoinDPE.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SemiJoinDPE.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SemiJoinDPE.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SemiJoinDPE.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SemiJoinWithWindowsFuncInSubquery.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SemiJoinWithWindowsFuncInSubquery.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SemiJoinWithWindowsFuncInSubquery.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SemiJoinWithWindowsFuncInSubquery.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Sequence-With-Universal-Outer.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Sequence-With-Universal-Outer.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Sequence-With-Universal-Outer.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Sequence-With-Universal-Outer.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SimpleArrayCoerceCast.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SimpleArrayCoerceCast.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SimpleArrayCoerceCast.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SimpleArrayCoerceCast.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SimplifyExistsSubquery2Limit.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SimplifyExistsSubquery2Limit.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SimplifyExistsSubquery2Limit.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SimplifyExistsSubquery2Limit.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SingleColumnHomogenousIndexOnRoot-AO.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SingleColumnHomogenousIndexOnRoot-AO.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SingleColumnHomogenousIndexOnRoot-AO.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SingleColumnHomogenousIndexOnRoot-AO.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SingleColumnHomogenousIndexOnRoot-HEAP.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SingleColumnHomogenousIndexOnRoot-HEAP.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SingleColumnHomogenousIndexOnRoot-HEAP.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SingleColumnHomogenousIndexOnRoot-HEAP.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SixWayDPv2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SixWayDPv2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SixWayDPv2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SixWayDPv2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SortOverStreamAgg.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SortOverStreamAgg.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SortOverStreamAgg.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SortOverStreamAgg.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SpoolShouldInvalidateUnresolvedDynamicScans.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SpoolShouldInvalidateUnresolvedDynamicScans.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SpoolShouldInvalidateUnresolvedDynamicScans.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SpoolShouldInvalidateUnresolvedDynamicScans.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SqlFuncDmlScalar.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SqlFuncDmlScalar.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SqlFuncDmlScalar.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SqlFuncDmlScalar.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SqlFuncDmlTvf.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SqlFuncDmlTvf.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SqlFuncDmlTvf.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SqlFuncDmlTvf.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SqlFuncNullReject.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SqlFuncNullReject.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SqlFuncNullReject.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SqlFuncNullReject.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SqlFuncPredFactorize.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SqlFuncPredFactorize.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SqlFuncPredFactorize.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SqlFuncPredFactorize.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Stat-Derivation-Leaf-Pattern.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Stat-Derivation-Leaf-Pattern.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Stat-Derivation-Leaf-Pattern.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Stat-Derivation-Leaf-Pattern.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Stats-For-Select-With-Outer-Refs.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Stats-For-Select-With-Outer-Refs.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Stats-For-Select-With-Outer-Refs.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Stats-For-Select-With-Outer-Refs.mdp diff --git a/src/backend/gporca/data/dxl/minidump/StatsFilter-AnyWithNewColStats.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/StatsFilter-AnyWithNewColStats.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/StatsFilter-AnyWithNewColStats.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/StatsFilter-AnyWithNewColStats.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Subq-JoinWithOuterRef.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Subq-JoinWithOuterRef.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Subq-JoinWithOuterRef.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Subq-JoinWithOuterRef.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Subq-NoParams.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Subq-NoParams.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Subq-NoParams.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Subq-NoParams.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Subq-On-OuterRef.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Subq-On-OuterRef.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Subq-On-OuterRef.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Subq-On-OuterRef.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Subq-With-OuterRefCol.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Subq-With-OuterRefCol.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Subq-With-OuterRefCol.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Subq-With-OuterRefCol.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Subq2CorrSQInLOJOn.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Subq2CorrSQInLOJOn.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Subq2CorrSQInLOJOn.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Subq2CorrSQInLOJOn.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Subq2NotInWhereLOJ.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Subq2NotInWhereLOJ.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Subq2NotInWhereLOJ.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Subq2NotInWhereLOJ.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Subq2OuterRef2InJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Subq2OuterRef2InJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Subq2OuterRef2InJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Subq2OuterRef2InJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Subq2OuterRefMultiLevelInOn.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Subq2OuterRefMultiLevelInOn.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Subq2OuterRefMultiLevelInOn.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Subq2OuterRefMultiLevelInOn.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Subq2PartialDecorrelate.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Subq2PartialDecorrelate.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Subq2PartialDecorrelate.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Subq2PartialDecorrelate.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SubqAll-InsideScalarExpression.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqAll-InsideScalarExpression.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SubqAll-InsideScalarExpression.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqAll-InsideScalarExpression.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SubqAll-Limit1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqAll-Limit1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SubqAll-Limit1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqAll-Limit1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SubqAll-To-ScalarSubq.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqAll-To-ScalarSubq.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SubqAll-To-ScalarSubq.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqAll-To-ScalarSubq.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SubqAny-InsideScalarExpression.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqAny-InsideScalarExpression.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SubqAny-InsideScalarExpression.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqAny-InsideScalarExpression.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SubqEnforceSubplan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqEnforceSubplan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SubqEnforceSubplan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqEnforceSubplan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SubqExists-With-External-Corrs.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqExists-With-External-Corrs.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SubqExists-With-External-Corrs.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqExists-With-External-Corrs.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SubqExists-Without-External-Corrs.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqExists-Without-External-Corrs.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SubqExists-Without-External-Corrs.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqExists-Without-External-Corrs.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SubqInIndexPred.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqInIndexPred.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SubqInIndexPred.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqInIndexPred.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SubqOuterReferenceInClause.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqOuterReferenceInClause.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SubqOuterReferenceInClause.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqOuterReferenceInClause.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Subquery-AnyAllAggregates.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Subquery-AnyAllAggregates.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Subquery-AnyAllAggregates.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Subquery-AnyAllAggregates.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Subquery-ExistsAllAggregates.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Subquery-ExistsAllAggregates.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Subquery-ExistsAllAggregates.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Subquery-ExistsAllAggregates.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Subquery-ExistsAllAggregatesWithDisjuncts.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Subquery-ExistsAllAggregatesWithDisjuncts.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Subquery-ExistsAllAggregatesWithDisjuncts.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Subquery-ExistsAllAggregatesWithDisjuncts.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SubqueryInsideArrayRef.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqueryInsideArrayRef.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SubqueryInsideArrayRef.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqueryInsideArrayRef.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SubqueryInsideArrayRefIndexList.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqueryInsideArrayRefIndexList.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SubqueryInsideArrayRefIndexList.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqueryInsideArrayRefIndexList.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SubqueryInsideScalarIf.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqueryInsideScalarIf.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SubqueryInsideScalarIf.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqueryInsideScalarIf.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SubqueryNoPullUpTableValueFunction.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqueryNoPullUpTableValueFunction.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SubqueryNoPullUpTableValueFunction.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqueryNoPullUpTableValueFunction.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SubqueryNullTest.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqueryNullTest.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SubqueryNullTest.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqueryNullTest.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SubqueryOuterRefLimit.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqueryOuterRefLimit.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SubqueryOuterRefLimit.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqueryOuterRefLimit.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SubqueryOuterRefTVF.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqueryOuterRefTVF.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SubqueryOuterRefTVF.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SubqueryOuterRefTVF.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Switch-With-Subquery.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Switch-With-Subquery.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Switch-With-Subquery.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Switch-With-Subquery.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SystemColCtidStats.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SystemColCtidStats.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SystemColCtidStats.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SystemColCtidStats.mdp diff --git a/src/backend/gporca/data/dxl/minidump/SystemColSegIdStats.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/SystemColSegIdStats.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/SystemColSegIdStats.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/SystemColSegIdStats.mdp diff --git a/src/backend/gporca/data/dxl/minidump/TPCDS-39-InnerJoin-JoinEstimate.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/TPCDS-39-InnerJoin-JoinEstimate.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/TPCDS-39-InnerJoin-JoinEstimate.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/TPCDS-39-InnerJoin-JoinEstimate.mdp diff --git a/src/backend/gporca/data/dxl/minidump/TPCH-Partitioned-256GB.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/TPCH-Partitioned-256GB.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/TPCH-Partitioned-256GB.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/TPCH-Partitioned-256GB.mdp diff --git a/src/backend/gporca/data/dxl/minidump/TVF-With-Deep-Subq-Args.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/TVF-With-Deep-Subq-Args.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/TVF-With-Deep-Subq-Args.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/TVF-With-Deep-Subq-Args.mdp diff --git a/src/backend/gporca/data/dxl/minidump/TVF.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/TVF.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/TVF.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/TVF.mdp diff --git a/src/backend/gporca/data/dxl/minidump/TVFAnyelement.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/TVFAnyelement.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/TVFAnyelement.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/TVFAnyelement.mdp diff --git a/src/backend/gporca/data/dxl/minidump/TVFCorrelatedExecution.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/TVFCorrelatedExecution.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/TVFCorrelatedExecution.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/TVFCorrelatedExecution.mdp diff --git a/src/backend/gporca/data/dxl/minidump/TVFGenerateSeries.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/TVFGenerateSeries.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/TVFGenerateSeries.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/TVFGenerateSeries.mdp diff --git a/src/backend/gporca/data/dxl/minidump/TVFRandom.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/TVFRandom.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/TVFRandom.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/TVFRandom.mdp diff --git a/src/backend/gporca/data/dxl/minidump/TVFVolatileJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/TVFVolatileJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/TVFVolatileJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/TVFVolatileJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/TaintedReplicatedAgg.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/TaintedReplicatedAgg.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/TaintedReplicatedAgg.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/TaintedReplicatedAgg.mdp diff --git a/src/backend/gporca/data/dxl/minidump/TaintedReplicatedFilter.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/TaintedReplicatedFilter.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/TaintedReplicatedFilter.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/TaintedReplicatedFilter.mdp diff --git a/src/backend/gporca/data/dxl/minidump/TaintedReplicatedLimit.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/TaintedReplicatedLimit.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/TaintedReplicatedLimit.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/TaintedReplicatedLimit.mdp diff --git a/src/backend/gporca/data/dxl/minidump/TaintedReplicatedTablesCTE.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/TaintedReplicatedTablesCTE.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/TaintedReplicatedTablesCTE.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/TaintedReplicatedTablesCTE.mdp diff --git a/src/backend/gporca/data/dxl/minidump/TaintedReplicatedWindowAgg.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/TaintedReplicatedWindowAgg.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/TaintedReplicatedWindowAgg.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/TaintedReplicatedWindowAgg.mdp diff --git a/src/backend/gporca/data/dxl/minidump/TextMCVCardinalityEquals.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/TextMCVCardinalityEquals.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/TextMCVCardinalityEquals.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/TextMCVCardinalityEquals.mdp diff --git a/src/backend/gporca/data/dxl/minidump/TextMCVCardinalityGreaterThan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/TextMCVCardinalityGreaterThan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/TextMCVCardinalityGreaterThan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/TextMCVCardinalityGreaterThan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ThreeStageAgg-DistinctOnComputedCol.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ThreeStageAgg-DistinctOnComputedCol.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ThreeStageAgg-DistinctOnComputedCol.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ThreeStageAgg-DistinctOnComputedCol.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ThreeStageAgg-DistinctOnDistrCol.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ThreeStageAgg-DistinctOnDistrCol.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ThreeStageAgg-DistinctOnDistrCol.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ThreeStageAgg-DistinctOnDistrCol.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ThreeStageAgg-DistinctOnSameNonDistrCol.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ThreeStageAgg-DistinctOnSameNonDistrCol.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ThreeStageAgg-DistinctOnSameNonDistrCol.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ThreeStageAgg-DistinctOnSameNonDistrCol.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ThreeStageAgg-GbMultipleCol-DistinctOnDistrCol.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ThreeStageAgg-GbMultipleCol-DistinctOnDistrCol.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ThreeStageAgg-GbMultipleCol-DistinctOnDistrCol.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ThreeStageAgg-GbMultipleCol-DistinctOnDistrCol.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ThreeStageAgg-GbandDistinctOnDistrCol.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ThreeStageAgg-GbandDistinctOnDistrCol.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ThreeStageAgg-GbandDistinctOnDistrCol.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ThreeStageAgg-GbandDistinctOnDistrCol.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ThreeStageAgg-ScalarAgg-DistinctComputedCol.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ThreeStageAgg-ScalarAgg-DistinctComputedCol.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ThreeStageAgg-ScalarAgg-DistinctComputedCol.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ThreeStageAgg-ScalarAgg-DistinctComputedCol.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ThreeStageAgg-ScalarAgg-DistinctDistrCol.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ThreeStageAgg-ScalarAgg-DistinctDistrCol.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ThreeStageAgg-ScalarAgg-DistinctDistrCol.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ThreeStageAgg-ScalarAgg-DistinctDistrCol.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ThreeStageAgg-ScalarAgg-DistinctNonDistrCol.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ThreeStageAgg-ScalarAgg-DistinctNonDistrCol.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ThreeStageAgg-ScalarAgg-DistinctNonDistrCol.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ThreeStageAgg-ScalarAgg-DistinctNonDistrCol.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ThreeStageAgg.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ThreeStageAgg.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ThreeStageAgg.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ThreeStageAgg.mdp diff --git a/src/backend/gporca/data/dxl/minidump/TimeStamp-Date-HashJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/TimeStamp-Date-HashJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/TimeStamp-Date-HashJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/TimeStamp-Date-HashJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Tpcds-10TB-Q37-NoIndexJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Tpcds-10TB-Q37-NoIndexJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Tpcds-10TB-Q37-NoIndexJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Tpcds-10TB-Q37-NoIndexJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Tpcds-NonPart-Q70a.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Tpcds-NonPart-Q70a.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Tpcds-NonPart-Q70a.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Tpcds-NonPart-Q70a.mdp diff --git a/src/backend/gporca/data/dxl/minidump/TranslateFilterDisjunctQuals.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/TranslateFilterDisjunctQuals.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/TranslateFilterDisjunctQuals.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/TranslateFilterDisjunctQuals.mdp diff --git a/src/backend/gporca/data/dxl/minidump/TranslateFilterWithCTEAndTableScanIntoFilterAndOneTimeFilter.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/TranslateFilterWithCTEAndTableScanIntoFilterAndOneTimeFilter.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/TranslateFilterWithCTEAndTableScanIntoFilterAndOneTimeFilter.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/TranslateFilterWithCTEAndTableScanIntoFilterAndOneTimeFilter.mdp diff --git a/src/backend/gporca/data/dxl/minidump/TranslateOneTimeFilterConjunctQuals.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/TranslateOneTimeFilterConjunctQuals.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/TranslateOneTimeFilterConjunctQuals.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/TranslateOneTimeFilterConjunctQuals.mdp diff --git a/src/backend/gporca/data/dxl/minidump/TypeModifierArrayRef.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/TypeModifierArrayRef.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/TypeModifierArrayRef.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/TypeModifierArrayRef.mdp diff --git a/src/backend/gporca/data/dxl/minidump/TypeModifierCast.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/TypeModifierCast.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/TypeModifierCast.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/TypeModifierCast.mdp diff --git a/src/backend/gporca/data/dxl/minidump/TypeModifierColumn.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/TypeModifierColumn.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/TypeModifierColumn.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/TypeModifierColumn.mdp diff --git a/src/backend/gporca/data/dxl/minidump/TypeModifierConst.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/TypeModifierConst.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/TypeModifierConst.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/TypeModifierConst.mdp diff --git a/src/backend/gporca/data/dxl/minidump/TypeModifierDoubleMappableConst.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/TypeModifierDoubleMappableConst.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/TypeModifierDoubleMappableConst.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/TypeModifierDoubleMappableConst.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UDA-AnyArray.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UDA-AnyArray.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UDA-AnyArray.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UDA-AnyArray.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UDA-AnyElement-1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UDA-AnyElement-1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UDA-AnyElement-1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UDA-AnyElement-1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UDA-AnyElement-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UDA-AnyElement-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UDA-AnyElement-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UDA-AnyElement-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Union-Distributed-Table-With-Const-Table.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Union-Distributed-Table-With-Const-Table.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Union-Distributed-Table-With-Const-Table.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Union-Distributed-Table-With-Const-Table.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Union-NOT-Plus-OR-Constraint.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Union-NOT-Plus-OR-Constraint.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Union-NOT-Plus-OR-Constraint.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Union-NOT-Plus-OR-Constraint.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Union-OuterRefs-Casting-Output.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Union-OuterRefs-Casting-Output.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Union-OuterRefs-Casting-Output.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Union-OuterRefs-Casting-Output.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Union-OuterRefs-InnerChild.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Union-OuterRefs-InnerChild.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Union-OuterRefs-InnerChild.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Union-OuterRefs-InnerChild.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Union-OuterRefs-Output.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Union-OuterRefs-Output.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Union-OuterRefs-Output.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Union-OuterRefs-Output.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Union-Over-UnionAll.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Union-Over-UnionAll.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Union-Over-UnionAll.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Union-Over-UnionAll.mdp diff --git a/src/backend/gporca/data/dxl/minidump/Union-Volatile-Func.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/Union-Volatile-Func.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/Union-Volatile-Func.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/Union-Volatile-Func.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UnionAll.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UnionAll.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UnionAll.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UnionAll.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UnionAllCompatibleDataType.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UnionAllCompatibleDataType.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UnionAllCompatibleDataType.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UnionAllCompatibleDataType.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UnionAllWithTruncatedOutput.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UnionAllWithTruncatedOutput.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UnionAllWithTruncatedOutput.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UnionAllWithTruncatedOutput.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UnionGbSubquery.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UnionGbSubquery.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UnionGbSubquery.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UnionGbSubquery.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UnionOfDQAQueries.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UnionOfDQAQueries.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UnionOfDQAQueries.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UnionOfDQAQueries.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UnionWithCTE.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UnionWithCTE.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UnionWithCTE.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UnionWithCTE.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UnionWithOuterRefs.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UnionWithOuterRefs.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UnionWithOuterRefs.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UnionWithOuterRefs.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UnnestSQJoins.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UnnestSQJoins.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UnnestSQJoins.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UnnestSQJoins.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UnsupportedStatsPredicate.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UnsupportedStatsPredicate.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UnsupportedStatsPredicate.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UnsupportedStatsPredicate.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UpdateCardinalityAssert.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateCardinalityAssert.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UpdateCardinalityAssert.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateCardinalityAssert.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UpdateCheckConstraint.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateCheckConstraint.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UpdateCheckConstraint.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateCheckConstraint.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UpdateDistKeyMismatchedDistribution.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateDistKeyMismatchedDistribution.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UpdateDistKeyMismatchedDistribution.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateDistKeyMismatchedDistribution.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UpdateDistKeyWithNestedJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateDistKeyWithNestedJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UpdateDistKeyWithNestedJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateDistKeyWithNestedJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UpdateDistrKey.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateDistrKey.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UpdateDistrKey.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateDistrKey.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UpdateDroppedCols.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateDroppedCols.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UpdateDroppedCols.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateDroppedCols.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UpdateNoCardinalityAssert.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateNoCardinalityAssert.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UpdateNoCardinalityAssert.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateNoCardinalityAssert.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UpdateNoDistKeyMismatchedDistribution.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateNoDistKeyMismatchedDistribution.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UpdateNoDistKeyMismatchedDistribution.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateNoDistKeyMismatchedDistribution.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UpdateNoEnforceConstraints.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateNoEnforceConstraints.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UpdateNoEnforceConstraints.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateNoEnforceConstraints.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UpdateNotNullCols.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateNotNullCols.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UpdateNotNullCols.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateNotNullCols.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UpdatePartTable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdatePartTable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UpdatePartTable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdatePartTable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UpdateRandomDistr.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateRandomDistr.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UpdateRandomDistr.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateRandomDistr.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UpdateUniqueConstraint-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateUniqueConstraint-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UpdateUniqueConstraint-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateUniqueConstraint-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UpdateUniqueConstraint.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateUniqueConstraint.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UpdateUniqueConstraint.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateUniqueConstraint.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UpdateVolatileFunction.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateVolatileFunction.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UpdateVolatileFunction.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateVolatileFunction.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UpdateWindowGatherMerge.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateWindowGatherMerge.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UpdateWindowGatherMerge.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateWindowGatherMerge.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UpdateWithHashJoin.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateWithHashJoin.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UpdateWithHashJoin.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateWithHashJoin.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UpdateZeroRows.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateZeroRows.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UpdateZeroRows.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdateZeroRows.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UpdatingDistributionColumn.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdatingDistributionColumn.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UpdatingDistributionColumn.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdatingDistributionColumn.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UpdatingMultipleColumn.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdatingMultipleColumn.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UpdatingMultipleColumn.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdatingMultipleColumn.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UpdatingNonDistColSameTable.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdatingNonDistColSameTable.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UpdatingNonDistColSameTable.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdatingNonDistColSameTable.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UpdatingNonDistributionColumnFunc.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdatingNonDistributionColumnFunc.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UpdatingNonDistributionColumnFunc.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UpdatingNonDistributionColumnFunc.mdp diff --git a/src/backend/gporca/data/dxl/minidump/UseDistributionSatisfactionForUniversalInnerChild.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/UseDistributionSatisfactionForUniversalInnerChild.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/UseDistributionSatisfactionForUniversalInnerChild.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/UseDistributionSatisfactionForUniversalInnerChild.mdp diff --git a/src/backend/gporca/data/dxl/minidump/ValueScanWithDuplicateAndSelfComparison.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/ValueScanWithDuplicateAndSelfComparison.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/ValueScanWithDuplicateAndSelfComparison.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/ValueScanWithDuplicateAndSelfComparison.mdp diff --git a/src/backend/gporca/data/dxl/minidump/VarcharMCVCardinalityEquals.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/VarcharMCVCardinalityEquals.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/VarcharMCVCardinalityEquals.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/VarcharMCVCardinalityEquals.mdp diff --git a/src/backend/gporca/data/dxl/minidump/VarcharMCVCardinalityGreaterThan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/VarcharMCVCardinalityGreaterThan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/VarcharMCVCardinalityGreaterThan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/VarcharMCVCardinalityGreaterThan.mdp diff --git a/src/backend/gporca/data/dxl/minidump/VariadicFlagWithFormatQuery.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/VariadicFlagWithFormatQuery.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/VariadicFlagWithFormatQuery.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/VariadicFlagWithFormatQuery.mdp diff --git a/src/backend/gporca/data/dxl/minidump/VariadicFlagWithJson.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/VariadicFlagWithJson.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/VariadicFlagWithJson.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/VariadicFlagWithJson.mdp diff --git a/src/backend/gporca/data/dxl/minidump/VariadicFlagWithUnionAll.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/VariadicFlagWithUnionAll.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/VariadicFlagWithUnionAll.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/VariadicFlagWithUnionAll.mdp diff --git a/src/backend/gporca/data/dxl/minidump/VolatileFunctionsBelowScalarAgg.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/VolatileFunctionsBelowScalarAgg.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/VolatileFunctionsBelowScalarAgg.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/VolatileFunctionsBelowScalarAgg.mdp diff --git a/src/backend/gporca/data/dxl/minidump/WinFunc-Redistribute-Sort-CTE-Producer.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/WinFunc-Redistribute-Sort-CTE-Producer.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/WinFunc-Redistribute-Sort-CTE-Producer.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/WinFunc-Redistribute-Sort-CTE-Producer.mdp diff --git a/src/backend/gporca/data/dxl/minidump/WinFunc-Simple.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/WinFunc-Simple.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/WinFunc-Simple.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/WinFunc-Simple.mdp diff --git a/src/backend/gporca/data/dxl/minidump/WinFuncWithSubqArgs.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/WinFuncWithSubqArgs.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/WinFuncWithSubqArgs.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/WinFuncWithSubqArgs.mdp diff --git a/src/backend/gporca/data/dxl/minidump/WindowFrame-SingleEdged.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/WindowFrame-SingleEdged.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/WindowFrame-SingleEdged.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/WindowFrame-SingleEdged.mdp diff --git a/src/backend/gporca/data/dxl/minidump/WindowFrameExcludeCurrentRow.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/WindowFrameExcludeCurrentRow.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/WindowFrameExcludeCurrentRow.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/WindowFrameExcludeCurrentRow.mdp diff --git a/src/backend/gporca/data/dxl/minidump/WindowFrameExcludeGroup.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/WindowFrameExcludeGroup.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/WindowFrameExcludeGroup.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/WindowFrameExcludeGroup.mdp diff --git a/src/backend/gporca/data/dxl/minidump/WindowFrameExcludeTies.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/WindowFrameExcludeTies.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/WindowFrameExcludeTies.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/WindowFrameExcludeTies.mdp diff --git a/src/backend/gporca/data/dxl/minidump/WindowFrameGroups.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/WindowFrameGroups.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/WindowFrameGroups.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/WindowFrameGroups.mdp diff --git a/src/backend/gporca/data/dxl/minidump/WindowFrameRangePrecedingAndFollowing.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/WindowFrameRangePrecedingAndFollowing.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/WindowFrameRangePrecedingAndFollowing.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/WindowFrameRangePrecedingAndFollowing.mdp diff --git a/src/backend/gporca/data/dxl/minidump/cte-duplicate-columns-1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/cte-duplicate-columns-1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/cte-duplicate-columns-1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/cte-duplicate-columns-1.mdp diff --git a/src/backend/gporca/data/dxl/minidump/cte-duplicate-columns-2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/cte-duplicate-columns-2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/cte-duplicate-columns-2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/cte-duplicate-columns-2.mdp diff --git a/src/backend/gporca/data/dxl/minidump/cte-duplicate-columns-3.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/cte-duplicate-columns-3.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/cte-duplicate-columns-3.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/cte-duplicate-columns-3.mdp diff --git a/src/backend/gporca/data/dxl/minidump/cte-duplicate-columns-4.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/cte-duplicate-columns-4.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/cte-duplicate-columns-4.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/cte-duplicate-columns-4.mdp diff --git a/src/backend/gporca/data/dxl/minidump/retail_28.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/retail_28.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/retail_28.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/retail_28.mdp diff --git a/src/backend/gporca/data/dxl/minidump/sql/BitmapIndexScan.sql b/gpcontrib/gp_orca/gporca/data/dxl/minidump/sql/BitmapIndexScan.sql similarity index 100% rename from src/backend/gporca/data/dxl/minidump/sql/BitmapIndexScan.sql rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/sql/BitmapIndexScan.sql diff --git a/src/backend/gporca/data/dxl/minidump/sql/DynamicBitmapIndexScan.sql b/gpcontrib/gp_orca/gporca/data/dxl/minidump/sql/DynamicBitmapIndexScan.sql similarity index 100% rename from src/backend/gporca/data/dxl/minidump/sql/DynamicBitmapIndexScan.sql rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/sql/DynamicBitmapIndexScan.sql diff --git a/src/backend/gporca/data/dxl/minidump/window-count-gpdb6.mdp b/gpcontrib/gp_orca/gporca/data/dxl/minidump/window-count-gpdb6.mdp similarity index 100% rename from src/backend/gporca/data/dxl/minidump/window-count-gpdb6.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/minidump/window-count-gpdb6.mdp diff --git a/src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-cast_boundary_value_to_date.mdp b/gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-cast_boundary_value_to_date.mdp similarity index 100% rename from src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-cast_boundary_value_to_date.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-cast_boundary_value_to_date.mdp diff --git a/src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-cast_partition_column_to_text.mdp b/gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-cast_partition_column_to_text.mdp similarity index 100% rename from src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-cast_partition_column_to_text.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-cast_partition_column_to_text.mdp diff --git a/src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-no_casting.mdp b/gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-no_casting.mdp similarity index 100% rename from src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-no_casting.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-no_casting.mdp diff --git a/src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-predicate-on-all-levels.mdp b/gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-predicate-on-all-levels.mdp similarity index 100% rename from src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-predicate-on-all-levels.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-predicate-on-all-levels.mdp diff --git a/src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-predicate-on-non-leaf-levels.mdp b/gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-predicate-on-non-leaf-levels.mdp similarity index 100% rename from src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-predicate-on-non-leaf-levels.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-predicate-on-non-leaf-levels.mdp diff --git a/src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-predicate-on-non-root-levels.mdp b/gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-predicate-on-non-root-levels.mdp similarity index 100% rename from src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-predicate-on-non-root-levels.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-predicate-on-non-root-levels.mdp diff --git a/src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-AllLevels-Default.mdp b/gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-AllLevels-Default.mdp similarity index 100% rename from src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-AllLevels-Default.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-AllLevels-Default.mdp diff --git a/src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-AllLevels-NoDefault.mdp b/gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-AllLevels-NoDefault.mdp similarity index 100% rename from src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-AllLevels-NoDefault.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-AllLevels-NoDefault.mdp diff --git a/src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-Level1-Default.mdp b/gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-Level1-Default.mdp similarity index 100% rename from src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-Level1-Default.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-Level1-Default.mdp diff --git a/src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-Level1-NoDefault.mdp b/gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-Level1-NoDefault.mdp similarity index 100% rename from src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-Level1-NoDefault.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-Level1-NoDefault.mdp diff --git a/src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-Level2-Default.mdp b/gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-Level2-Default.mdp similarity index 100% rename from src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-Level2-Default.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-Level2-Default.mdp diff --git a/src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-Level2-NoDefault.mdp b/gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-Level2-NoDefault.mdp similarity index 100% rename from src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-Level2-NoDefault.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-Level2-NoDefault.mdp diff --git a/src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-FullScan.mdp b/gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-FullScan.mdp similarity index 100% rename from src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-FullScan.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-FullScan.mdp diff --git a/src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-JoinPred-AllLevels.mdp b/gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-JoinPred-AllLevels.mdp similarity index 100% rename from src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-JoinPred-AllLevels.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-JoinPred-AllLevels.mdp diff --git a/src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-JoinPred-Level1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-JoinPred-Level1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-JoinPred-Level1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-JoinPred-Level1.mdp diff --git a/src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-JoinPred-Level2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-JoinPred-Level2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-JoinPred-Level2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-JoinPred-Level2.mdp diff --git a/src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-Nary-Join.mdp b/gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-Nary-Join.mdp similarity index 100% rename from src/backend/gporca/data/dxl/multilevel-partitioning/Multilevel-Nary-Join.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/multilevel-partitioning/Multilevel-Nary-Join.mdp diff --git a/src/backend/gporca/data/dxl/parse_tests/CostModelConfigCalibrated.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/CostModelConfigCalibrated.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/CostModelConfigCalibrated.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/CostModelConfigCalibrated.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/MDRequest.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/MDRequest.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/MDRequest.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/MDRequest.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/OptimizerConfig.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/OptimizerConfig.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/OptimizerConfig.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/OptimizerConfig.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/f1-MissingAttribute.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f1-MissingAttribute.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/f1-MissingAttribute.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f1-MissingAttribute.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/f10-BoolExpr-MissingChild.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f10-BoolExpr-MissingChild.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/f10-BoolExpr-MissingChild.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f10-BoolExpr-MissingChild.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/f11-BoolExpr-ExtraChild.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f11-BoolExpr-ExtraChild.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/f11-BoolExpr-ExtraChild.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f11-BoolExpr-ExtraChild.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/f12-Const-MissingAttribute.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f12-Const-MissingAttribute.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/f12-Const-MissingAttribute.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f12-Const-MissingAttribute.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/f13-Case-Noelse.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f13-Case-Noelse.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/f13-Case-Noelse.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f13-Case-Noelse.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/f14-Case-IncorrectCondition.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f14-Case-IncorrectCondition.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/f14-Case-IncorrectCondition.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f14-Case-IncorrectCondition.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/f15-Case-MultipleElse.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f15-Case-MultipleElse.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/f15-Case-MultipleElse.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f15-Case-MultipleElse.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/f16-Case-NoResultClause.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f16-Case-NoResultClause.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/f16-Case-NoResultClause.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f16-Case-NoResultClause.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/f17-Limit-MissingCount.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f17-Limit-MissingCount.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/f17-Limit-MissingCount.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f17-Limit-MissingCount.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/f2-UnrecognizedOp.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f2-UnrecognizedOp.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/f2-UnrecognizedOp.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f2-UnrecognizedOp.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/f3-UnexpectedTag.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f3-UnexpectedTag.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/f3-UnexpectedTag.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f3-UnexpectedTag.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/f4-InvalidAttrValue.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f4-InvalidAttrValue.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/f4-InvalidAttrValue.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f4-InvalidAttrValue.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/f5-UnexpectedTag.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f5-UnexpectedTag.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/f5-UnexpectedTag.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f5-UnexpectedTag.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/f6-UnexpectedTag.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f6-UnexpectedTag.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/f6-UnexpectedTag.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f6-UnexpectedTag.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/f7-UnexpectedTag.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f7-UnexpectedTag.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/f7-UnexpectedTag.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f7-UnexpectedTag.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/f8-UnexpectedTag.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f8-UnexpectedTag.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/f8-UnexpectedTag.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f8-UnexpectedTag.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/f9-UnexpectedTag.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f9-UnexpectedTag.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/f9-UnexpectedTag.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/f9-UnexpectedTag.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q1-TS.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q1-TS.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q1-TS.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q1-TS.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q10-Case.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q10-Case.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q10-Case.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q10-Case.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q11-Limit.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q11-Limit.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q11-Limit.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q11-Limit.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q12-Limit-NoOffset.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q12-Limit-NoOffset.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q12-Limit-NoOffset.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q12-Limit-NoOffset.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q13-AGG-TS.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q13-AGG-TS.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q13-AGG-TS.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q13-AGG-TS.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q14-FuncExpr-NoArg.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q14-FuncExpr-NoArg.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q14-FuncExpr-NoArg.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q14-FuncExpr-NoArg.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q15-FuncExpr-WithArgs.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q15-FuncExpr-WithArgs.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q15-FuncExpr-WithArgs.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q15-FuncExpr-WithArgs.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q16-FuncExpr-WithNestedFuncExpr.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q16-FuncExpr-WithNestedFuncExpr.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q16-FuncExpr-WithNestedFuncExpr.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q16-FuncExpr-WithNestedFuncExpr.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q17-AggRef.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q17-AggRef.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q17-AggRef.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q17-AggRef.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q18-Sort-TS.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q18-Sort-TS.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q18-Sort-TS.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q18-Sort-TS.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q19-DistinctFrom.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q19-DistinctFrom.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q19-DistinctFrom.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q19-DistinctFrom.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q2-HJ.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q2-HJ.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q2-HJ.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q2-HJ.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q20-DistinctFrom-HJ.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q20-DistinctFrom-HJ.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q20-DistinctFrom-HJ.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q20-DistinctFrom-HJ.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q22-Result.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q22-Result.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q22-Result.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q22-Result.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q23-MJ.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q23-MJ.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q23-MJ.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q23-MJ.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q25-AppendPartTable.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q25-AppendPartTable.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q25-AppendPartTable.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q25-AppendPartTable.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q26-Metadata.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q26-Metadata.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q26-Metadata.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q26-Metadata.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q28-Materialize.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q28-Materialize.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q28-Materialize.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q28-Materialize.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q3-HJ2.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q3-HJ2.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q3-HJ2.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q3-HJ2.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q30-LogicalOrderBy.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q30-LogicalOrderBy.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q30-LogicalOrderBy.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q30-LogicalOrderBy.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q31-LogicalLimit.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q31-LogicalLimit.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q31-LogicalLimit.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q31-LogicalLimit.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q32-ScalarSubquery.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q32-ScalarSubquery.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q32-ScalarSubquery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q32-ScalarSubquery.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q33-ScalarSubqueryAny.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q33-ScalarSubqueryAny.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q33-ScalarSubqueryAny.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q33-ScalarSubqueryAny.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q34-SubqueryExists.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q34-SubqueryExists.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q34-SubqueryExists.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q34-SubqueryExists.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q35-ConstTable.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q35-ConstTable.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q35-ConstTable.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q35-ConstTable.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q36-Statistics.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q36-Statistics.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q36-Statistics.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q36-Statistics.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q37-IndexScan.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q37-IndexScan.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q37-IndexScan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q37-IndexScan.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q39-Array.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q39-Array.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q39-Array.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q39-Array.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q4-NLJ-GM.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q4-NLJ-GM.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q4-NLJ-GM.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q4-NLJ-GM.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q40-SubPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q40-SubPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q40-SubPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q40-SubPlan.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q41-LogicalTVF.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q41-LogicalTVF.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q41-LogicalTVF.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q41-LogicalTVF.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q41-SetOp.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q41-SetOp.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q41-SetOp.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q41-SetOp.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q42-TableValuedFunction.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q42-TableValuedFunction.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q42-TableValuedFunction.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q42-TableValuedFunction.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q43-LogicalCTE.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q43-LogicalCTE.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q43-LogicalCTE.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q43-LogicalCTE.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q44-Window.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q44-Window.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q44-Window.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q44-Window.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q45-WindowWithFraming.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q45-WindowWithFraming.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q45-WindowWithFraming.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q45-WindowWithFraming.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q46-LogicalWindow.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q46-LogicalWindow.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q46-LogicalWindow.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q46-LogicalWindow.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q47-WindowWithFraming.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q47-WindowWithFraming.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q47-WindowWithFraming.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q47-WindowWithFraming.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q48-IndexOnlyScan.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q48-IndexOnlyScan.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q48-IndexOnlyScan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q48-IndexOnlyScan.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q49-Coalesce.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q49-Coalesce.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q49-Coalesce.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q49-Coalesce.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q5-HJ-RM.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q5-HJ-RM.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q5-HJ-RM.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q5-HJ-RM.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q50-Switch.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q50-Switch.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q50-Switch.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q50-Switch.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q51-SwitchNoDefault.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q51-SwitchNoDefault.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q51-SwitchNoDefault.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q51-SwitchNoDefault.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q52-CaseTest.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q52-CaseTest.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q52-CaseTest.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q52-CaseTest.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q53-NullIf.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q53-NullIf.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q53-NullIf.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q53-NullIf.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q54-WindowWithNoLeadingFrameEdge.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q54-WindowWithNoLeadingFrameEdge.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q54-WindowWithNoLeadingFrameEdge.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q54-WindowWithNoLeadingFrameEdge.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q55-Insert.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q55-Insert.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q55-Insert.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q55-Insert.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q56-Delete.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q56-Delete.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q56-Delete.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q56-Delete.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q57-DMLDelete.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q57-DMLDelete.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q57-DMLDelete.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q57-DMLDelete.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q59-Update.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q59-Update.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q59-Update.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q59-Update.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q6-opexpr.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q6-opexpr.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q6-opexpr.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q6-opexpr.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q60-DMLUpdate.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q60-DMLUpdate.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q60-DMLUpdate.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q60-DMLUpdate.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q61-PlanWithStats.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q61-PlanWithStats.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q61-PlanWithStats.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q61-PlanWithStats.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q62-CTEPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q62-CTEPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q62-CTEPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q62-CTEPlan.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q63-LogicalForeignGet.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q63-LogicalForeignGet.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q63-LogicalForeignGet.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q63-LogicalForeignGet.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q64-ExternalScan.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q64-ExternalScan.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q64-ExternalScan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q64-ExternalScan.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q65-LogicalCTASHash.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q65-LogicalCTASHash.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q65-LogicalCTASHash.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q65-LogicalCTASHash.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q66-LogicalCTASRandom.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q66-LogicalCTASRandom.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q66-LogicalCTASRandom.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q66-LogicalCTASRandom.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q67-PhysicalCTAS.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q67-PhysicalCTAS.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q67-PhysicalCTAS.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q67-PhysicalCTAS.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q68-ArrayRef1.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q68-ArrayRef1.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q68-ArrayRef1.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q68-ArrayRef1.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q69-ArrayRef2.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q69-ArrayRef2.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q69-ArrayRef2.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q69-ArrayRef2.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q7-boolexpr.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q7-boolexpr.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q7-boolexpr.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q7-boolexpr.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q70-BitmapIndexProbe.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q70-BitmapIndexProbe.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q70-BitmapIndexProbe.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q70-BitmapIndexProbe.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q72-BitmapBoolOp.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q72-BitmapBoolOp.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q72-BitmapBoolOp.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q72-BitmapBoolOp.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q73-LogicalLimit-NonRemovable.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q73-LogicalLimit-NonRemovable.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q73-LogicalLimit-NonRemovable.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q73-LogicalLimit-NonRemovable.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q74-DirectDispatchInfo.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q74-DirectDispatchInfo.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q74-DirectDispatchInfo.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q74-DirectDispatchInfo.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q75-MinMax.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q75-MinMax.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q75-MinMax.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q75-MinMax.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q76-ValuesScan.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q76-ValuesScan.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q76-ValuesScan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q76-ValuesScan.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q8-boolexpr-not.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q8-boolexpr-not.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q8-boolexpr-not.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q8-boolexpr-not.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/q9-constval.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q9-constval.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/q9-constval.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/q9-constval.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/s01-ConstValue.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/s01-ConstValue.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/s01-ConstValue.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/s01-ConstValue.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/s02-NestedFuncExpr.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/s02-NestedFuncExpr.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/s02-NestedFuncExpr.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/s02-NestedFuncExpr.xml diff --git a/src/backend/gporca/data/dxl/parse_tests/sax-fail.xml b/gpcontrib/gp_orca/gporca/data/dxl/parse_tests/sax-fail.xml similarity index 100% rename from src/backend/gporca/data/dxl/parse_tests/sax-fail.xml rename to gpcontrib/gp_orca/gporca/data/dxl/parse_tests/sax-fail.xml diff --git a/src/backend/gporca/data/dxl/query/dxl-q17.xml b/gpcontrib/gp_orca/gporca/data/dxl/query/dxl-q17.xml similarity index 100% rename from src/backend/gporca/data/dxl/query/dxl-q17.xml rename to gpcontrib/gp_orca/gporca/data/dxl/query/dxl-q17.xml diff --git a/src/backend/gporca/data/dxl/query/dxl-q18.xml b/gpcontrib/gp_orca/gporca/data/dxl/query/dxl-q18.xml similarity index 100% rename from src/backend/gporca/data/dxl/query/dxl-q18.xml rename to gpcontrib/gp_orca/gporca/data/dxl/query/dxl-q18.xml diff --git a/src/backend/gporca/data/dxl/query/dxl-q19.xml b/gpcontrib/gp_orca/gporca/data/dxl/query/dxl-q19.xml similarity index 100% rename from src/backend/gporca/data/dxl/query/dxl-q19.xml rename to gpcontrib/gp_orca/gporca/data/dxl/query/dxl-q19.xml diff --git a/src/backend/gporca/data/dxl/query/dxl-q23.xml b/gpcontrib/gp_orca/gporca/data/dxl/query/dxl-q23.xml similarity index 100% rename from src/backend/gporca/data/dxl/query/dxl-q23.xml rename to gpcontrib/gp_orca/gporca/data/dxl/query/dxl-q23.xml diff --git a/src/backend/gporca/data/dxl/search/strategy0.xml b/gpcontrib/gp_orca/gporca/data/dxl/search/strategy0.xml similarity index 100% rename from src/backend/gporca/data/dxl/search/strategy0.xml rename to gpcontrib/gp_orca/gporca/data/dxl/search/strategy0.xml diff --git a/src/backend/gporca/data/dxl/search/timeout-strategy.xml b/gpcontrib/gp_orca/gporca/data/dxl/search/timeout-strategy.xml similarity index 100% rename from src/backend/gporca/data/dxl/search/timeout-strategy.xml rename to gpcontrib/gp_orca/gporca/data/dxl/search/timeout-strategy.xml diff --git a/src/backend/gporca/data/dxl/search/wrong-strategy.xml b/gpcontrib/gp_orca/gporca/data/dxl/search/wrong-strategy.xml similarity index 100% rename from src/backend/gporca/data/dxl/search/wrong-strategy.xml rename to gpcontrib/gp_orca/gporca/data/dxl/search/wrong-strategy.xml diff --git a/src/backend/gporca/data/dxl/statistics/ArrayCmpAny-Input-1.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/ArrayCmpAny-Input-1.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/ArrayCmpAny-Input-1.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/ArrayCmpAny-Input-1.xml diff --git a/src/backend/gporca/data/dxl/statistics/ArrayCmpAny-Output-1.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/ArrayCmpAny-Output-1.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/ArrayCmpAny-Output-1.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/ArrayCmpAny-Output-1.xml diff --git a/src/backend/gporca/data/dxl/statistics/Basic-Statistics-Input.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Basic-Statistics-Input.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Basic-Statistics-Input.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Basic-Statistics-Input.xml diff --git a/src/backend/gporca/data/dxl/statistics/Basic-Statistics-Output.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Basic-Statistics-Output.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Basic-Statistics-Output.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Basic-Statistics-Output.xml diff --git a/src/backend/gporca/data/dxl/statistics/Disj-Input-1.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Disj-Input-1.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Disj-Input-1.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Disj-Input-1.xml diff --git a/src/backend/gporca/data/dxl/statistics/Disj-Input-2.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Disj-Input-2.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Disj-Input-2.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Disj-Input-2.xml diff --git a/src/backend/gporca/data/dxl/statistics/Disj-Output-1.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Disj-Output-1.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Disj-Output-1.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Disj-Output-1.xml diff --git a/src/backend/gporca/data/dxl/statistics/Disj-Output-2-1.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Disj-Output-2-1.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Disj-Output-2-1.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Disj-Output-2-1.xml diff --git a/src/backend/gporca/data/dxl/statistics/Disj-Output-2-2.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Disj-Output-2-2.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Disj-Output-2-2.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Disj-Output-2-2.xml diff --git a/src/backend/gporca/data/dxl/statistics/Disj-Output-2-3.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Disj-Output-2-3.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Disj-Output-2-3.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Disj-Output-2-3.xml diff --git a/src/backend/gporca/data/dxl/statistics/Disj-Output-2-4.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Disj-Output-2-4.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Disj-Output-2-4.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Disj-Output-2-4.xml diff --git a/src/backend/gporca/data/dxl/statistics/Disj-Output-2-5.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Disj-Output-2-5.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Disj-Output-2-5.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Disj-Output-2-5.xml diff --git a/src/backend/gporca/data/dxl/statistics/Disj-Output-8.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Disj-Output-8.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Disj-Output-8.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Disj-Output-8.xml diff --git a/src/backend/gporca/data/dxl/statistics/Join-Statistics-DDistinct-Input.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Join-Statistics-DDistinct-Input.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Join-Statistics-DDistinct-Input.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Join-Statistics-DDistinct-Input.xml diff --git a/src/backend/gporca/data/dxl/statistics/Join-Statistics-DDistinct-Output.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Join-Statistics-DDistinct-Output.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Join-Statistics-DDistinct-Output.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Join-Statistics-DDistinct-Output.xml diff --git a/src/backend/gporca/data/dxl/statistics/Join-Statistics-Input-Null-Bucket.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Join-Statistics-Input-Null-Bucket.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Join-Statistics-Input-Null-Bucket.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Join-Statistics-Input-Null-Bucket.xml diff --git a/src/backend/gporca/data/dxl/statistics/Join-Statistics-Input-Only-Nulls.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Join-Statistics-Input-Only-Nulls.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Join-Statistics-Input-Only-Nulls.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Join-Statistics-Input-Only-Nulls.xml diff --git a/src/backend/gporca/data/dxl/statistics/Join-Statistics-Input.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Join-Statistics-Input.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Join-Statistics-Input.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Join-Statistics-Input.xml diff --git a/src/backend/gporca/data/dxl/statistics/Join-Statistics-Output-LOJ-Only-Nulls.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Join-Statistics-Output-LOJ-Only-Nulls.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Join-Statistics-Output-LOJ-Only-Nulls.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Join-Statistics-Output-LOJ-Only-Nulls.xml diff --git a/src/backend/gporca/data/dxl/statistics/Join-Statistics-Output-Null-Bucket.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Join-Statistics-Output-Null-Bucket.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Join-Statistics-Output-Null-Bucket.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Join-Statistics-Output-Null-Bucket.xml diff --git a/src/backend/gporca/data/dxl/statistics/Join-Statistics-Output-Only-Nulls.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Join-Statistics-Output-Only-Nulls.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Join-Statistics-Output-Only-Nulls.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Join-Statistics-Output-Only-Nulls.xml diff --git a/src/backend/gporca/data/dxl/statistics/Join-Statistics-Output.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Join-Statistics-Output.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Join-Statistics-Output.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Join-Statistics-Output.xml diff --git a/src/backend/gporca/data/dxl/statistics/LOJ-Input.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/LOJ-Input.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/LOJ-Input.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/LOJ-Input.xml diff --git a/src/backend/gporca/data/dxl/statistics/LOJ-Output.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/LOJ-Output.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/LOJ-Output.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/LOJ-Output.xml diff --git a/src/backend/gporca/data/dxl/statistics/MCV-Sort-Output.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/MCV-Sort-Output.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/MCV-Sort-Output.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/MCV-Sort-Output.xml diff --git a/src/backend/gporca/data/dxl/statistics/Merge-Input-Histogram-Int.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Merge-Input-Histogram-Int.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Merge-Input-Histogram-Int.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Merge-Input-Histogram-Int.xml diff --git a/src/backend/gporca/data/dxl/statistics/Merge-Input-Histogram-Numeric.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Merge-Input-Histogram-Numeric.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Merge-Input-Histogram-Numeric.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Merge-Input-Histogram-Numeric.xml diff --git a/src/backend/gporca/data/dxl/statistics/Merge-Input-MCV-Int.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Merge-Input-MCV-Int.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Merge-Input-MCV-Int.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Merge-Input-MCV-Int.xml diff --git a/src/backend/gporca/data/dxl/statistics/Merge-Input-MCV-Numeric.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Merge-Input-MCV-Numeric.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Merge-Input-MCV-Numeric.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Merge-Input-MCV-Numeric.xml diff --git a/src/backend/gporca/data/dxl/statistics/Merge-Output-Int.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Merge-Output-Int.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Merge-Output-Int.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Merge-Output-Int.xml diff --git a/src/backend/gporca/data/dxl/statistics/Merge-Output-Numeric.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Merge-Output-Numeric.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Merge-Output-Numeric.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Merge-Output-Numeric.xml diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Input-1.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Input-1.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/NestedPred-Input-1.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Input-1.xml diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Input-10.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Input-10.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/NestedPred-Input-10.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Input-10.xml diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Input-2.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Input-2.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/NestedPred-Input-2.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Input-2.xml diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Input-3.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Input-3.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/NestedPred-Input-3.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Input-3.xml diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Input-8.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Input-8.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/NestedPred-Input-8.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Input-8.xml diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Input-9.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Input-9.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/NestedPred-Input-9.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Input-9.xml diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Output-1.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Output-1.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/NestedPred-Output-1.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Output-1.xml diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Output-10.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Output-10.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/NestedPred-Output-10.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Output-10.xml diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Output-2.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Output-2.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/NestedPred-Output-2.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Output-2.xml diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Output-3.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Output-3.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/NestedPred-Output-3.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Output-3.xml diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Output-4.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Output-4.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/NestedPred-Output-4.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Output-4.xml diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Output-5.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Output-5.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/NestedPred-Output-5.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Output-5.xml diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Output-6.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Output-6.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/NestedPred-Output-6.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Output-6.xml diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Output-7.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Output-7.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/NestedPred-Output-7.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Output-7.xml diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Output-8.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Output-8.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/NestedPred-Output-8.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Output-8.xml diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Output-9.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Output-9.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/NestedPred-Output-9.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/NestedPred-Output-9.xml diff --git a/src/backend/gporca/data/dxl/statistics/Numeric-Input.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Input.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Numeric-Input.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Input.xml diff --git a/src/backend/gporca/data/dxl/statistics/Numeric-Input2.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Input2.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Numeric-Input2.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Input2.xml diff --git a/src/backend/gporca/data/dxl/statistics/Numeric-Output-2-E-MaxBoundary.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-2-E-MaxBoundary.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Numeric-Output-2-E-MaxBoundary.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-2-E-MaxBoundary.xml diff --git a/src/backend/gporca/data/dxl/statistics/Numeric-Output-2-E-MinBoundary.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-2-E-MinBoundary.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Numeric-Output-2-E-MinBoundary.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-2-E-MinBoundary.xml diff --git a/src/backend/gporca/data/dxl/statistics/Numeric-Output-2-GT-MaxBoundary.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-2-GT-MaxBoundary.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Numeric-Output-2-GT-MaxBoundary.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-2-GT-MaxBoundary.xml diff --git a/src/backend/gporca/data/dxl/statistics/Numeric-Output-2-GT-MinBoundary.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-2-GT-MinBoundary.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Numeric-Output-2-GT-MinBoundary.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-2-GT-MinBoundary.xml diff --git a/src/backend/gporca/data/dxl/statistics/Numeric-Output-2-GTE-MaxBoundary.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-2-GTE-MaxBoundary.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Numeric-Output-2-GTE-MaxBoundary.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-2-GTE-MaxBoundary.xml diff --git a/src/backend/gporca/data/dxl/statistics/Numeric-Output-2-GTE-MinBoundary.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-2-GTE-MinBoundary.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Numeric-Output-2-GTE-MinBoundary.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-2-GTE-MinBoundary.xml diff --git a/src/backend/gporca/data/dxl/statistics/Numeric-Output-2-LT-MaxBoundary.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-2-LT-MaxBoundary.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Numeric-Output-2-LT-MaxBoundary.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-2-LT-MaxBoundary.xml diff --git a/src/backend/gporca/data/dxl/statistics/Numeric-Output-2-LT-MinBoundary.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-2-LT-MinBoundary.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Numeric-Output-2-LT-MinBoundary.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-2-LT-MinBoundary.xml diff --git a/src/backend/gporca/data/dxl/statistics/Numeric-Output-2-LTE-MaxBoundary.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-2-LTE-MaxBoundary.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Numeric-Output-2-LTE-MaxBoundary.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-2-LTE-MaxBoundary.xml diff --git a/src/backend/gporca/data/dxl/statistics/Numeric-Output-2-LTE-MinBoundary.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-2-LTE-MinBoundary.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Numeric-Output-2-LTE-MinBoundary.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-2-LTE-MinBoundary.xml diff --git a/src/backend/gporca/data/dxl/statistics/Numeric-Output-E-MaxBoundary.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-E-MaxBoundary.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Numeric-Output-E-MaxBoundary.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-E-MaxBoundary.xml diff --git a/src/backend/gporca/data/dxl/statistics/Numeric-Output-E-MinBoundary.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-E-MinBoundary.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Numeric-Output-E-MinBoundary.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-E-MinBoundary.xml diff --git a/src/backend/gporca/data/dxl/statistics/Numeric-Output-GT-MaxBoundary.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-GT-MaxBoundary.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Numeric-Output-GT-MaxBoundary.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-GT-MaxBoundary.xml diff --git a/src/backend/gporca/data/dxl/statistics/Numeric-Output-GTE-MaxBoundary.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-GTE-MaxBoundary.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Numeric-Output-GTE-MaxBoundary.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-GTE-MaxBoundary.xml diff --git a/src/backend/gporca/data/dxl/statistics/Numeric-Output-LT-MinBoundary.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-LT-MinBoundary.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Numeric-Output-LT-MinBoundary.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-LT-MinBoundary.xml diff --git a/src/backend/gporca/data/dxl/statistics/Numeric-Output-LTE-MinBoundary.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-LTE-MinBoundary.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Numeric-Output-LTE-MinBoundary.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Numeric-Output-LTE-MinBoundary.xml diff --git a/src/backend/gporca/data/dxl/statistics/Select-Statistics-Input-Null-Bucket.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Select-Statistics-Input-Null-Bucket.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Select-Statistics-Input-Null-Bucket.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Select-Statistics-Input-Null-Bucket.xml diff --git a/src/backend/gporca/data/dxl/statistics/Select-Statistics-Output-NotNull-Constant.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Select-Statistics-Output-NotNull-Constant.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Select-Statistics-Output-NotNull-Constant.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Select-Statistics-Output-NotNull-Constant.xml diff --git a/src/backend/gporca/data/dxl/statistics/Select-Statistics-Output-Null-Bucket.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Select-Statistics-Output-Null-Bucket.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Select-Statistics-Output-Null-Bucket.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Select-Statistics-Output-Null-Bucket.xml diff --git a/src/backend/gporca/data/dxl/statistics/Select-Statistics-Output-Null-Constant.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/Select-Statistics-Output-Null-Constant.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/Select-Statistics-Output-Null-Constant.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/Select-Statistics-Output-Null-Constant.xml diff --git a/src/backend/gporca/data/dxl/statistics/SelectPlan.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/SelectPlan.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/SelectPlan.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/SelectPlan.xml diff --git a/src/backend/gporca/data/dxl/statistics/SelectQuery.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/SelectQuery.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/SelectQuery.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/SelectQuery.xml diff --git a/src/backend/gporca/data/dxl/statistics/UnionAll-Input-1.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/UnionAll-Input-1.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/UnionAll-Input-1.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/UnionAll-Input-1.xml diff --git a/src/backend/gporca/data/dxl/statistics/UnionAll-Output-1.xml b/gpcontrib/gp_orca/gporca/data/dxl/statistics/UnionAll-Output-1.xml similarity index 100% rename from src/backend/gporca/data/dxl/statistics/UnionAll-Output-1.xml rename to gpcontrib/gp_orca/gporca/data/dxl/statistics/UnionAll-Output-1.xml diff --git a/src/backend/gporca/data/dxl/tpch/q1-partitioned.mdp b/gpcontrib/gp_orca/gporca/data/dxl/tpch/q1-partitioned.mdp similarity index 100% rename from src/backend/gporca/data/dxl/tpch/q1-partitioned.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/tpch/q1-partitioned.mdp diff --git a/src/backend/gporca/data/dxl/tpch/q1.mdp b/gpcontrib/gp_orca/gporca/data/dxl/tpch/q1.mdp similarity index 100% rename from src/backend/gporca/data/dxl/tpch/q1.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/tpch/q1.mdp diff --git a/src/backend/gporca/data/dxl/tpch/q10.mdp b/gpcontrib/gp_orca/gporca/data/dxl/tpch/q10.mdp similarity index 100% rename from src/backend/gporca/data/dxl/tpch/q10.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/tpch/q10.mdp diff --git a/src/backend/gporca/data/dxl/tpch/q11.mdp b/gpcontrib/gp_orca/gporca/data/dxl/tpch/q11.mdp similarity index 100% rename from src/backend/gporca/data/dxl/tpch/q11.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/tpch/q11.mdp diff --git a/src/backend/gporca/data/dxl/tpch/q12.mdp b/gpcontrib/gp_orca/gporca/data/dxl/tpch/q12.mdp similarity index 100% rename from src/backend/gporca/data/dxl/tpch/q12.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/tpch/q12.mdp diff --git a/src/backend/gporca/data/dxl/tpch/q13.mdp b/gpcontrib/gp_orca/gporca/data/dxl/tpch/q13.mdp similarity index 100% rename from src/backend/gporca/data/dxl/tpch/q13.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/tpch/q13.mdp diff --git a/src/backend/gporca/data/dxl/tpch/q14.mdp b/gpcontrib/gp_orca/gporca/data/dxl/tpch/q14.mdp similarity index 100% rename from src/backend/gporca/data/dxl/tpch/q14.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/tpch/q14.mdp diff --git a/src/backend/gporca/data/dxl/tpch/q15.mdp b/gpcontrib/gp_orca/gporca/data/dxl/tpch/q15.mdp similarity index 100% rename from src/backend/gporca/data/dxl/tpch/q15.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/tpch/q15.mdp diff --git a/src/backend/gporca/data/dxl/tpch/q16.mdp b/gpcontrib/gp_orca/gporca/data/dxl/tpch/q16.mdp similarity index 100% rename from src/backend/gporca/data/dxl/tpch/q16.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/tpch/q16.mdp diff --git a/src/backend/gporca/data/dxl/tpch/q17.mdp b/gpcontrib/gp_orca/gporca/data/dxl/tpch/q17.mdp similarity index 100% rename from src/backend/gporca/data/dxl/tpch/q17.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/tpch/q17.mdp diff --git a/src/backend/gporca/data/dxl/tpch/q18.mdp b/gpcontrib/gp_orca/gporca/data/dxl/tpch/q18.mdp similarity index 100% rename from src/backend/gporca/data/dxl/tpch/q18.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/tpch/q18.mdp diff --git a/src/backend/gporca/data/dxl/tpch/q19.mdp b/gpcontrib/gp_orca/gporca/data/dxl/tpch/q19.mdp similarity index 100% rename from src/backend/gporca/data/dxl/tpch/q19.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/tpch/q19.mdp diff --git a/src/backend/gporca/data/dxl/tpch/q2.mdp b/gpcontrib/gp_orca/gporca/data/dxl/tpch/q2.mdp similarity index 100% rename from src/backend/gporca/data/dxl/tpch/q2.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/tpch/q2.mdp diff --git a/src/backend/gporca/data/dxl/tpch/q20.mdp b/gpcontrib/gp_orca/gporca/data/dxl/tpch/q20.mdp similarity index 100% rename from src/backend/gporca/data/dxl/tpch/q20.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/tpch/q20.mdp diff --git a/src/backend/gporca/data/dxl/tpch/q21.mdp b/gpcontrib/gp_orca/gporca/data/dxl/tpch/q21.mdp similarity index 100% rename from src/backend/gporca/data/dxl/tpch/q21.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/tpch/q21.mdp diff --git a/src/backend/gporca/data/dxl/tpch/q22.mdp b/gpcontrib/gp_orca/gporca/data/dxl/tpch/q22.mdp similarity index 100% rename from src/backend/gporca/data/dxl/tpch/q22.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/tpch/q22.mdp diff --git a/src/backend/gporca/data/dxl/tpch/q3.mdp b/gpcontrib/gp_orca/gporca/data/dxl/tpch/q3.mdp similarity index 100% rename from src/backend/gporca/data/dxl/tpch/q3.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/tpch/q3.mdp diff --git a/src/backend/gporca/data/dxl/tpch/q4.mdp b/gpcontrib/gp_orca/gporca/data/dxl/tpch/q4.mdp similarity index 100% rename from src/backend/gporca/data/dxl/tpch/q4.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/tpch/q4.mdp diff --git a/src/backend/gporca/data/dxl/tpch/q5.mdp b/gpcontrib/gp_orca/gporca/data/dxl/tpch/q5.mdp similarity index 100% rename from src/backend/gporca/data/dxl/tpch/q5.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/tpch/q5.mdp diff --git a/src/backend/gporca/data/dxl/tpch/q6.mdp b/gpcontrib/gp_orca/gporca/data/dxl/tpch/q6.mdp similarity index 100% rename from src/backend/gporca/data/dxl/tpch/q6.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/tpch/q6.mdp diff --git a/src/backend/gporca/data/dxl/tpch/q7.mdp b/gpcontrib/gp_orca/gporca/data/dxl/tpch/q7.mdp similarity index 100% rename from src/backend/gporca/data/dxl/tpch/q7.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/tpch/q7.mdp diff --git a/src/backend/gporca/data/dxl/tpch/q8.mdp b/gpcontrib/gp_orca/gporca/data/dxl/tpch/q8.mdp similarity index 100% rename from src/backend/gporca/data/dxl/tpch/q8.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/tpch/q8.mdp diff --git a/src/backend/gporca/data/dxl/tpch/q9.mdp b/gpcontrib/gp_orca/gporca/data/dxl/tpch/q9.mdp similarity index 100% rename from src/backend/gporca/data/dxl/tpch/q9.mdp rename to gpcontrib/gp_orca/gporca/data/dxl/tpch/q9.mdp diff --git a/src/backend/gporca/libgpdbcost/CMakeLists.txt b/gpcontrib/gp_orca/gporca/libgpdbcost/CMakeLists.txt similarity index 100% rename from src/backend/gporca/libgpdbcost/CMakeLists.txt rename to gpcontrib/gp_orca/gporca/libgpdbcost/CMakeLists.txt diff --git a/src/backend/gporca/libgpdbcost/include/gpdbcost/CCostModelGPDB.h b/gpcontrib/gp_orca/gporca/libgpdbcost/include/gpdbcost/CCostModelGPDB.h similarity index 100% rename from src/backend/gporca/libgpdbcost/include/gpdbcost/CCostModelGPDB.h rename to gpcontrib/gp_orca/gporca/libgpdbcost/include/gpdbcost/CCostModelGPDB.h diff --git a/src/backend/gporca/libgpdbcost/include/gpdbcost/CCostModelParamsGPDB.h b/gpcontrib/gp_orca/gporca/libgpdbcost/include/gpdbcost/CCostModelParamsGPDB.h similarity index 100% rename from src/backend/gporca/libgpdbcost/include/gpdbcost/CCostModelParamsGPDB.h rename to gpcontrib/gp_orca/gporca/libgpdbcost/include/gpdbcost/CCostModelParamsGPDB.h diff --git a/src/backend/gporca/libgpdbcost/src/CCostModelGPDB.cpp b/gpcontrib/gp_orca/gporca/libgpdbcost/src/CCostModelGPDB.cpp similarity index 100% rename from src/backend/gporca/libgpdbcost/src/CCostModelGPDB.cpp rename to gpcontrib/gp_orca/gporca/libgpdbcost/src/CCostModelGPDB.cpp diff --git a/src/backend/gporca/libgpdbcost/src/CCostModelParamsGPDB.cpp b/gpcontrib/gp_orca/gporca/libgpdbcost/src/CCostModelParamsGPDB.cpp similarity index 100% rename from src/backend/gporca/libgpdbcost/src/CCostModelParamsGPDB.cpp rename to gpcontrib/gp_orca/gporca/libgpdbcost/src/CCostModelParamsGPDB.cpp diff --git a/src/backend/gporca/libgpdbcost/src/ICostModel.cpp b/gpcontrib/gp_orca/gporca/libgpdbcost/src/ICostModel.cpp similarity index 100% rename from src/backend/gporca/libgpdbcost/src/ICostModel.cpp rename to gpcontrib/gp_orca/gporca/libgpdbcost/src/ICostModel.cpp diff --git a/src/backend/gporca/libgpopt/CMakeLists.txt b/gpcontrib/gp_orca/gporca/libgpopt/CMakeLists.txt similarity index 100% rename from src/backend/gporca/libgpopt/CMakeLists.txt rename to gpcontrib/gp_orca/gporca/libgpopt/CMakeLists.txt diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CAutoOptCtxt.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CAutoOptCtxt.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CAutoOptCtxt.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CAutoOptCtxt.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CCTEInfo.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CCTEInfo.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CCTEInfo.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CCTEInfo.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CCTEMap.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CCTEMap.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CCTEMap.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CCTEMap.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CCTEReq.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CCTEReq.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CCTEReq.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CCTEReq.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CCastUtils.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CCastUtils.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CCastUtils.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CCastUtils.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CColConstraintsArrayMapper.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CColConstraintsArrayMapper.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CColConstraintsArrayMapper.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CColConstraintsArrayMapper.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CColConstraintsHashMapper.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CColConstraintsHashMapper.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CColConstraintsHashMapper.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CColConstraintsHashMapper.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CColRef.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CColRef.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CColRef.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CColRef.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CColRefComputed.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CColRefComputed.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CColRefComputed.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CColRefComputed.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CColRefSet.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CColRefSet.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CColRefSet.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CColRefSet.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CColRefSetIter.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CColRefSetIter.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CColRefSetIter.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CColRefSetIter.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CColRefTable.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CColRefTable.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CColRefTable.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CColRefTable.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CColumnFactory.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CColumnFactory.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CColumnFactory.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CColumnFactory.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CConstraint.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CConstraint.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CConstraint.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CConstraint.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CConstraintConjunction.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CConstraintConjunction.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CConstraintConjunction.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CConstraintConjunction.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CConstraintDisjunction.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CConstraintDisjunction.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CConstraintDisjunction.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CConstraintDisjunction.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CConstraintInterval.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CConstraintInterval.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CConstraintInterval.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CConstraintInterval.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CConstraintNegation.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CConstraintNegation.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CConstraintNegation.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CConstraintNegation.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CCostContext.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CCostContext.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CCostContext.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CCostContext.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDatumSortedSet.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDatumSortedSet.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CDatumSortedSet.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDatumSortedSet.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDefaultComparator.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDefaultComparator.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CDefaultComparator.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDefaultComparator.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpec.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpec.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpec.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpec.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecAny.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecAny.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecAny.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecAny.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecHashed.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecHashed.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecHashed.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecHashed.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecHashedNoOp.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecHashedNoOp.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecHashedNoOp.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecHashedNoOp.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecNonReplicated.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecNonReplicated.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecNonReplicated.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecNonReplicated.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecNonSingleton.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecNonSingleton.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecNonSingleton.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecNonSingleton.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecRandom.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecRandom.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecRandom.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecRandom.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecReplicated.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecReplicated.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecReplicated.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecReplicated.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecRouted.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecRouted.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecRouted.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecRouted.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecSingleton.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecSingleton.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecSingleton.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecSingleton.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecStrictHashed.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecStrictHashed.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecStrictHashed.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecStrictHashed.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecStrictRandom.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecStrictRandom.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecStrictRandom.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecStrictRandom.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecStrictSingleton.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecStrictSingleton.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecStrictSingleton.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecStrictSingleton.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecUniversal.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecUniversal.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecUniversal.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecUniversal.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDrvdProp.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDrvdProp.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CDrvdProp.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDrvdProp.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDrvdPropCtxt.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDrvdPropCtxt.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CDrvdPropCtxt.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDrvdPropCtxt.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDrvdPropCtxtPlan.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDrvdPropCtxtPlan.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CDrvdPropCtxtPlan.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDrvdPropCtxtPlan.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDrvdPropCtxtRelational.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDrvdPropCtxtRelational.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CDrvdPropCtxtRelational.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDrvdPropCtxtRelational.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDrvdPropPlan.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDrvdPropPlan.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CDrvdPropPlan.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDrvdPropPlan.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDrvdPropRelational.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDrvdPropRelational.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CDrvdPropRelational.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDrvdPropRelational.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDrvdPropScalar.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDrvdPropScalar.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CDrvdPropScalar.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CDrvdPropScalar.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CEnfdDistribution.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CEnfdDistribution.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CEnfdDistribution.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CEnfdDistribution.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CEnfdOrder.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CEnfdOrder.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CEnfdOrder.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CEnfdOrder.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CEnfdPartitionPropagation.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CEnfdPartitionPropagation.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CEnfdPartitionPropagation.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CEnfdPartitionPropagation.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CEnfdProp.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CEnfdProp.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CEnfdProp.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CEnfdProp.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CEnfdRewindability.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CEnfdRewindability.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CEnfdRewindability.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CEnfdRewindability.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CFunctionProp.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CFunctionProp.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CFunctionProp.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CFunctionProp.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CFunctionalDependency.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CFunctionalDependency.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CFunctionalDependency.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CFunctionalDependency.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CIOUtils.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CIOUtils.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CIOUtils.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CIOUtils.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CKHeap.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CKHeap.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CKHeap.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CKHeap.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CKeyCollection.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CKeyCollection.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CKeyCollection.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CKeyCollection.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CMaxCard.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CMaxCard.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CMaxCard.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CMaxCard.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/COptCtxt.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/COptCtxt.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/COptCtxt.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/COptCtxt.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/COptimizationContext.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/COptimizationContext.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/COptimizationContext.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/COptimizationContext.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/COrderSpec.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/COrderSpec.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/COrderSpec.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/COrderSpec.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CPartInfo.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CPartInfo.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CPartInfo.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CPartInfo.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CPartKeys.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CPartKeys.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CPartKeys.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CPartKeys.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CPartitionPropagationSpec.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CPartitionPropagationSpec.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CPartitionPropagationSpec.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CPartitionPropagationSpec.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CPrintPrefix.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CPrintPrefix.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CPrintPrefix.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CPrintPrefix.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CPropConstraint.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CPropConstraint.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CPropConstraint.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CPropConstraint.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CPropSpec.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CPropSpec.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CPropSpec.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CPropSpec.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CQueryContext.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CQueryContext.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CQueryContext.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CQueryContext.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CRange.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CRange.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CRange.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CRange.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CReqdProp.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CReqdProp.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CReqdProp.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CReqdProp.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CReqdPropPlan.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CReqdPropPlan.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CReqdPropPlan.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CReqdPropPlan.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CReqdPropRelational.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CReqdPropRelational.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CReqdPropRelational.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CReqdPropRelational.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CRewindabilitySpec.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CRewindabilitySpec.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CRewindabilitySpec.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CRewindabilitySpec.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CStateMachine.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CStateMachine.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CStateMachine.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CStateMachine.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CUtils.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CUtils.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CUtils.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CUtils.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CWindowFrame.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CWindowFrame.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CWindowFrame.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CWindowFrame.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CWindowOids.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CWindowOids.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/CWindowOids.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/CWindowOids.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/IColConstraintsMapper.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/IColConstraintsMapper.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/IColConstraintsMapper.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/IColConstraintsMapper.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/IComparator.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/IComparator.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/IComparator.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/IComparator.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/SPartSelectorInfo.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/SPartSelectorInfo.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/base/SPartSelectorInfo.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/base/SPartSelectorInfo.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/cost/CCost.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/cost/CCost.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/cost/CCost.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/cost/CCost.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/cost/ICostModel.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/cost/ICostModel.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/cost/ICostModel.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/cost/ICostModel.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/cost/ICostModelParams.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/cost/ICostModelParams.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/cost/ICostModelParams.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/cost/ICostModelParams.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/engine/CCTEConfig.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/engine/CCTEConfig.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/engine/CCTEConfig.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/engine/CCTEConfig.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/engine/CEngine.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/engine/CEngine.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/engine/CEngine.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/engine/CEngine.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/engine/CEnumeratorConfig.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/engine/CEnumeratorConfig.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/engine/CEnumeratorConfig.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/engine/CEnumeratorConfig.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/engine/CHint.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/engine/CHint.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/engine/CHint.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/engine/CHint.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/engine/CPartialPlan.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/engine/CPartialPlan.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/engine/CPartialPlan.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/engine/CPartialPlan.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/engine/CStatisticsConfig.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/engine/CStatisticsConfig.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/engine/CStatisticsConfig.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/engine/CStatisticsConfig.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/eval/CConstExprEvaluatorDXL.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/eval/CConstExprEvaluatorDXL.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/eval/CConstExprEvaluatorDXL.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/eval/CConstExprEvaluatorDXL.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/eval/CConstExprEvaluatorDefault.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/eval/CConstExprEvaluatorDefault.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/eval/CConstExprEvaluatorDefault.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/eval/CConstExprEvaluatorDefault.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/eval/IConstDXLNodeEvaluator.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/eval/IConstDXLNodeEvaluator.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/eval/IConstDXLNodeEvaluator.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/eval/IConstDXLNodeEvaluator.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/eval/IConstExprEvaluator.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/eval/IConstExprEvaluator.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/eval/IConstExprEvaluator.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/eval/IConstExprEvaluator.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/exception.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/exception.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/exception.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/exception.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/hints/CHintUtils.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/hints/CHintUtils.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/hints/CHintUtils.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/hints/CHintUtils.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/hints/CJoinHint.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/hints/CJoinHint.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/hints/CJoinHint.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/hints/CJoinHint.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/hints/CPlanHint.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/hints/CPlanHint.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/hints/CPlanHint.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/hints/CPlanHint.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/hints/CRowHint.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/hints/CRowHint.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/hints/CRowHint.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/hints/CRowHint.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/hints/CScanHint.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/hints/CScanHint.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/hints/CScanHint.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/hints/CScanHint.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/hints/IHint.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/hints/IHint.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/hints/IHint.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/hints/IHint.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/init.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/init.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/init.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/init.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/mdcache/CAutoMDAccessor.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/mdcache/CAutoMDAccessor.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/mdcache/CAutoMDAccessor.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/mdcache/CAutoMDAccessor.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/mdcache/CMDAccessor.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/mdcache/CMDAccessor.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/mdcache/CMDAccessor.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/mdcache/CMDAccessor.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/mdcache/CMDAccessorUtils.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/mdcache/CMDAccessorUtils.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/mdcache/CMDAccessorUtils.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/mdcache/CMDAccessorUtils.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/mdcache/CMDCache.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/mdcache/CMDCache.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/mdcache/CMDCache.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/mdcache/CMDCache.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/mdcache/CMDKey.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/mdcache/CMDKey.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/mdcache/CMDKey.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/mdcache/CMDKey.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/metadata/CColumnDescriptor.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/metadata/CColumnDescriptor.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/metadata/CColumnDescriptor.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/metadata/CColumnDescriptor.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/metadata/CIndexDescriptor.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/metadata/CIndexDescriptor.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/metadata/CIndexDescriptor.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/metadata/CIndexDescriptor.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/metadata/CName.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/metadata/CName.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/metadata/CName.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/metadata/CName.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/metadata/CTableDescriptor.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/metadata/CTableDescriptor.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/metadata/CTableDescriptor.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/metadata/CTableDescriptor.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/minidump/CDXLMinidump.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/minidump/CDXLMinidump.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/minidump/CDXLMinidump.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/minidump/CDXLMinidump.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/minidump/CMetadataAccessorFactory.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/minidump/CMetadataAccessorFactory.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/minidump/CMetadataAccessorFactory.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/minidump/CMetadataAccessorFactory.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/minidump/CMiniDumperDXL.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/minidump/CMiniDumperDXL.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/minidump/CMiniDumperDXL.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/minidump/CMiniDumperDXL.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/minidump/CMinidumperUtils.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/minidump/CMinidumperUtils.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/minidump/CMinidumperUtils.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/minidump/CMinidumperUtils.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/minidump/CSerializableMDAccessor.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/minidump/CSerializableMDAccessor.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/minidump/CSerializableMDAccessor.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/minidump/CSerializableMDAccessor.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/minidump/CSerializableOptimizerConfig.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/minidump/CSerializableOptimizerConfig.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/minidump/CSerializableOptimizerConfig.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/minidump/CSerializableOptimizerConfig.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/minidump/CSerializablePlan.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/minidump/CSerializablePlan.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/minidump/CSerializablePlan.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/minidump/CSerializablePlan.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/minidump/CSerializableQuery.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/minidump/CSerializableQuery.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/minidump/CSerializableQuery.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/minidump/CSerializableQuery.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/minidump/CSerializableStackTrace.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/minidump/CSerializableStackTrace.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/minidump/CSerializableStackTrace.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/minidump/CSerializableStackTrace.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CExpression.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CExpression.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CExpression.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CExpression.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CExpressionFactorizer.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CExpressionFactorizer.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CExpressionFactorizer.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CExpressionFactorizer.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CExpressionHandle.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CExpressionHandle.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CExpressionHandle.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CExpressionHandle.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CExpressionPreprocessor.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CExpressionPreprocessor.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CExpressionPreprocessor.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CExpressionPreprocessor.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CExpressionUtils.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CExpressionUtils.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CExpressionUtils.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CExpressionUtils.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CHashedDistributions.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CHashedDistributions.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CHashedDistributions.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CHashedDistributions.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CJoinOrderHintsPreprocessor.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CJoinOrderHintsPreprocessor.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CJoinOrderHintsPreprocessor.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CJoinOrderHintsPreprocessor.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLeftJoinPruningPreprocessor.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLeftJoinPruningPreprocessor.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLeftJoinPruningPreprocessor.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLeftJoinPruningPreprocessor.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogical.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogical.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogical.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogical.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalApply.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalApply.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalApply.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalApply.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalAssert.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalAssert.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalAssert.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalAssert.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalBitmapTableGet.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalBitmapTableGet.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalBitmapTableGet.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalBitmapTableGet.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalCTEAnchor.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalCTEAnchor.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalCTEAnchor.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalCTEAnchor.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalCTEConsumer.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalCTEConsumer.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalCTEConsumer.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalCTEConsumer.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalCTEProducer.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalCTEProducer.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalCTEProducer.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalCTEProducer.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalConstTableGet.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalConstTableGet.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalConstTableGet.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalConstTableGet.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDML.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalDML.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDML.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalDML.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDelete.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalDelete.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDelete.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalDelete.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDifference.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalDifference.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDifference.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalDifference.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDifferenceAll.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalDifferenceAll.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDifferenceAll.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalDifferenceAll.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicBitmapTableGet.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicBitmapTableGet.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicBitmapTableGet.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicBitmapTableGet.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicForeignGet.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicForeignGet.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicForeignGet.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicForeignGet.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicGet.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicGet.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicGet.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicGet.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicGetBase.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicGetBase.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicGetBase.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicGetBase.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicIndexGet.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicIndexGet.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicIndexGet.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicIndexGet.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicIndexOnlyGet.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicIndexOnlyGet.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicIndexOnlyGet.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicIndexOnlyGet.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalForeignGet.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalForeignGet.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalForeignGet.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalForeignGet.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalFullOuterJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalFullOuterJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalFullOuterJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalFullOuterJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalGbAgg.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalGbAgg.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalGbAgg.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalGbAgg.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalGbAggDeduplicate.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalGbAggDeduplicate.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalGbAggDeduplicate.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalGbAggDeduplicate.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalGet.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalGet.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalGet.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalGet.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalIndexApply.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalIndexApply.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalIndexApply.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalIndexApply.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalIndexGet.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalIndexGet.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalIndexGet.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalIndexGet.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalIndexOnlyGet.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalIndexOnlyGet.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalIndexOnlyGet.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalIndexOnlyGet.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalInnerApply.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalInnerApply.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalInnerApply.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalInnerApply.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalInnerCorrelatedApply.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalInnerCorrelatedApply.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalInnerCorrelatedApply.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalInnerCorrelatedApply.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalInnerJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalInnerJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalInnerJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalInnerJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalInsert.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalInsert.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalInsert.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalInsert.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalIntersect.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalIntersect.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalIntersect.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalIntersect.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalIntersectAll.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalIntersectAll.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalIntersectAll.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalIntersectAll.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiApply.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiApply.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiApply.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiApply.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiApplyNotIn.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiApplyNotIn.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiApplyNotIn.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiApplyNotIn.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiCorrelatedApply.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiCorrelatedApply.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiCorrelatedApply.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiCorrelatedApply.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiCorrelatedApplyNotIn.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiCorrelatedApplyNotIn.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiCorrelatedApplyNotIn.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiCorrelatedApplyNotIn.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiJoinNotIn.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiJoinNotIn.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiJoinNotIn.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiJoinNotIn.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftOuterApply.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftOuterApply.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftOuterApply.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftOuterApply.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftOuterCorrelatedApply.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftOuterCorrelatedApply.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftOuterCorrelatedApply.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftOuterCorrelatedApply.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftOuterJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftOuterJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftOuterJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftOuterJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiApply.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiApply.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiApply.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiApply.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiApplyIn.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiApplyIn.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiApplyIn.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiApplyIn.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiCorrelatedApply.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiCorrelatedApply.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiCorrelatedApply.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiCorrelatedApply.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiCorrelatedApplyIn.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiCorrelatedApplyIn.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiCorrelatedApplyIn.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiCorrelatedApplyIn.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLimit.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLimit.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLimit.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalLimit.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalMaxOneRow.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalMaxOneRow.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalMaxOneRow.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalMaxOneRow.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalNAryJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalNAryJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalNAryJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalNAryJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalProject.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalProject.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalProject.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalProject.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalRightOuterJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalRightOuterJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalRightOuterJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalRightOuterJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalSelect.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalSelect.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalSelect.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalSelect.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalSequence.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalSequence.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalSequence.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalSequence.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalSequenceProject.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalSequenceProject.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalSequenceProject.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalSequenceProject.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalSetOp.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalSetOp.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalSetOp.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalSetOp.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalSplit.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalSplit.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalSplit.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalSplit.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalTVF.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalTVF.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalTVF.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalTVF.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalUnary.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalUnary.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalUnary.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalUnary.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalUnion.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalUnion.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalUnion.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalUnion.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalUnionAll.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalUnionAll.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalUnionAll.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalUnionAll.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalUpdate.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalUpdate.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalUpdate.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CLogicalUpdate.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CNormalizer.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CNormalizer.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CNormalizer.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CNormalizer.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/COperator.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/COperator.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/COperator.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/COperator.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/COrderedAggPreprocessor.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/COrderedAggPreprocessor.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/COrderedAggPreprocessor.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/COrderedAggPreprocessor.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPattern.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPattern.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPattern.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPattern.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPatternLeaf.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPatternLeaf.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPatternLeaf.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPatternLeaf.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPatternMultiLeaf.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPatternMultiLeaf.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPatternMultiLeaf.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPatternMultiLeaf.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPatternMultiTree.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPatternMultiTree.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPatternMultiTree.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPatternMultiTree.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPatternNode.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPatternNode.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPatternNode.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPatternNode.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPatternTree.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPatternTree.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPatternTree.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPatternTree.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysical.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysical.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysical.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysical.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalAgg.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalAgg.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalAgg.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalAgg.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalAssert.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalAssert.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalAssert.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalAssert.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalBitmapTableScan.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalBitmapTableScan.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalBitmapTableScan.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalBitmapTableScan.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCTEConsumer.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalCTEConsumer.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCTEConsumer.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalCTEConsumer.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCTEProducer.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalCTEProducer.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCTEProducer.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalCTEProducer.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalComputeScalar.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalComputeScalar.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalComputeScalar.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalComputeScalar.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalConstTableGet.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalConstTableGet.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalConstTableGet.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalConstTableGet.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedInLeftSemiNLJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedInLeftSemiNLJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedInLeftSemiNLJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedInLeftSemiNLJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedInnerNLJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedInnerNLJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedInnerNLJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedInnerNLJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedLeftAntiSemiNLJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedLeftAntiSemiNLJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedLeftAntiSemiNLJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedLeftAntiSemiNLJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedLeftOuterNLJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedLeftOuterNLJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedLeftOuterNLJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedLeftOuterNLJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedLeftSemiNLJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedLeftSemiNLJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedLeftSemiNLJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedLeftSemiNLJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedNotInLeftAntiSemiNLJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedNotInLeftAntiSemiNLJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedNotInLeftAntiSemiNLJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedNotInLeftAntiSemiNLJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalDML.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalDML.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalDML.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalDML.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicBitmapTableScan.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicBitmapTableScan.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicBitmapTableScan.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicBitmapTableScan.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicForeignScan.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicForeignScan.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicForeignScan.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicForeignScan.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicIndexOnlyScan.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicIndexOnlyScan.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicIndexOnlyScan.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicIndexOnlyScan.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicIndexScan.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicIndexScan.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicIndexScan.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicIndexScan.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicScan.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicScan.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicScan.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicScan.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicTableScan.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicTableScan.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicTableScan.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicTableScan.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalFilter.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalFilter.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalFilter.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalFilter.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalForeignScan.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalForeignScan.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalForeignScan.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalForeignScan.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalFullHashJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalFullHashJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalFullHashJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalFullHashJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalFullMergeJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalFullMergeJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalFullMergeJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalFullMergeJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalHashAgg.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalHashAgg.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalHashAgg.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalHashAgg.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalHashAggDeduplicate.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalHashAggDeduplicate.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalHashAggDeduplicate.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalHashAggDeduplicate.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalHashJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalHashJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalHashJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalHashJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalIndexOnlyScan.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalIndexOnlyScan.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalIndexOnlyScan.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalIndexOnlyScan.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalIndexScan.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalIndexScan.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalIndexScan.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalIndexScan.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalInnerHashJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalInnerHashJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalInnerHashJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalInnerHashJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalInnerIndexNLJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalInnerIndexNLJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalInnerIndexNLJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalInnerIndexNLJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalInnerNLJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalInnerNLJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalInnerNLJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalInnerNLJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiHashJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiHashJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiHashJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiHashJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiHashJoinNotIn.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiHashJoinNotIn.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiHashJoinNotIn.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiHashJoinNotIn.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiNLJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiNLJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiNLJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiNLJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiNLJoinNotIn.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiNLJoinNotIn.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiNLJoinNotIn.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiNLJoinNotIn.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftOuterHashJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftOuterHashJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftOuterHashJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftOuterHashJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftOuterIndexNLJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftOuterIndexNLJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftOuterIndexNLJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftOuterIndexNLJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftOuterNLJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftOuterNLJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftOuterNLJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftOuterNLJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftSemiHashJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftSemiHashJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftSemiHashJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftSemiHashJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftSemiNLJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftSemiNLJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftSemiNLJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftSemiNLJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLimit.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLimit.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLimit.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLimit.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalMotion.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalMotion.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalMotion.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalMotion.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionBroadcast.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionBroadcast.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionBroadcast.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionBroadcast.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionGather.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionGather.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionGather.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionGather.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionHashDistribute.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionHashDistribute.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionHashDistribute.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionHashDistribute.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionRandom.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionRandom.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionRandom.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionRandom.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionRoutedDistribute.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionRoutedDistribute.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionRoutedDistribute.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionRoutedDistribute.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalNLJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalNLJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalNLJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalNLJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalParallelUnionAll.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalParallelUnionAll.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalParallelUnionAll.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalParallelUnionAll.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalPartitionSelector.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalPartitionSelector.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalPartitionSelector.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalPartitionSelector.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalRightOuterHashJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalRightOuterHashJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalRightOuterHashJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalRightOuterHashJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalScalarAgg.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalScalarAgg.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalScalarAgg.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalScalarAgg.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalScan.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalScan.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalScan.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalScan.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalSequence.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalSequence.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalSequence.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalSequence.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalSequenceProject.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalSequenceProject.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalSequenceProject.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalSequenceProject.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalSerialUnionAll.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalSerialUnionAll.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalSerialUnionAll.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalSerialUnionAll.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalSort.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalSort.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalSort.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalSort.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalSplit.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalSplit.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalSplit.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalSplit.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalSpool.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalSpool.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalSpool.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalSpool.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalStreamAgg.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalStreamAgg.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalStreamAgg.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalStreamAgg.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalStreamAggDeduplicate.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalStreamAggDeduplicate.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalStreamAggDeduplicate.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalStreamAggDeduplicate.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalTVF.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalTVF.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalTVF.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalTVF.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalTableScan.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalTableScan.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalTableScan.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalTableScan.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalUnionAll.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalUnionAll.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalUnionAll.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalUnionAll.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalUnionAllFactory.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalUnionAllFactory.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalUnionAllFactory.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPhysicalUnionAllFactory.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPredicateUtils.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPredicateUtils.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CPredicateUtils.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CPredicateUtils.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalar.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalar.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalar.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalar.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarAggFunc.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarAggFunc.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarAggFunc.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarAggFunc.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarArray.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarArray.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarArray.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarArray.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarArrayCmp.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarArrayCmp.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarArrayCmp.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarArrayCmp.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarArrayCoerceExpr.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarArrayCoerceExpr.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarArrayCoerceExpr.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarArrayCoerceExpr.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarArrayRef.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarArrayRef.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarArrayRef.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarArrayRef.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarArrayRefIndexList.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarArrayRefIndexList.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarArrayRefIndexList.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarArrayRefIndexList.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarAssertConstraint.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarAssertConstraint.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarAssertConstraint.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarAssertConstraint.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarAssertConstraintList.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarAssertConstraintList.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarAssertConstraintList.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarAssertConstraintList.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarBitmapBoolOp.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarBitmapBoolOp.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarBitmapBoolOp.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarBitmapBoolOp.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarBitmapIndexProbe.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarBitmapIndexProbe.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarBitmapIndexProbe.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarBitmapIndexProbe.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarBoolOp.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarBoolOp.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarBoolOp.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarBoolOp.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarBooleanTest.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarBooleanTest.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarBooleanTest.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarBooleanTest.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarCaseTest.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarCaseTest.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarCaseTest.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarCaseTest.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarCast.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarCast.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarCast.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarCast.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarCmp.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarCmp.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarCmp.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarCmp.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarCoalesce.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarCoalesce.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarCoalesce.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarCoalesce.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarCoerceBase.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarCoerceBase.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarCoerceBase.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarCoerceBase.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarCoerceToDomain.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarCoerceToDomain.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarCoerceToDomain.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarCoerceToDomain.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarCoerceViaIO.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarCoerceViaIO.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarCoerceViaIO.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarCoerceViaIO.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarConst.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarConst.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarConst.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarConst.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarDMLAction.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarDMLAction.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarDMLAction.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarDMLAction.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarFieldSelect.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarFieldSelect.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarFieldSelect.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarFieldSelect.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarFunc.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarFunc.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarFunc.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarFunc.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarIdent.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarIdent.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarIdent.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarIdent.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarIf.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarIf.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarIf.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarIf.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarIsDistinctFrom.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarIsDistinctFrom.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarIsDistinctFrom.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarIsDistinctFrom.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarMinMax.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarMinMax.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarMinMax.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarMinMax.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarNAryJoinPredList.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarNAryJoinPredList.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarNAryJoinPredList.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarNAryJoinPredList.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarNullIf.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarNullIf.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarNullIf.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarNullIf.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarNullTest.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarNullTest.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarNullTest.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarNullTest.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarOp.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarOp.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarOp.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarOp.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarParam.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarParam.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarParam.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarParam.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarProjectElement.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarProjectElement.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarProjectElement.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarProjectElement.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarProjectList.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarProjectList.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarProjectList.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarProjectList.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSortGroupClause.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarSortGroupClause.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSortGroupClause.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarSortGroupClause.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSubquery.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarSubquery.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSubquery.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarSubquery.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryAll.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryAll.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryAll.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryAll.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryAny.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryAny.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryAny.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryAny.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryExistential.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryExistential.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryExistential.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryExistential.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryExists.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryExists.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryExists.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryExists.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryNotExists.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryNotExists.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryNotExists.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryNotExists.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryQuantified.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryQuantified.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryQuantified.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryQuantified.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSwitch.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarSwitch.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSwitch.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarSwitch.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSwitchCase.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarSwitchCase.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSwitchCase.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarSwitchCase.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarValuesList.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarValuesList.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarValuesList.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarValuesList.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarWindowFunc.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarWindowFunc.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CScalarWindowFunc.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CScalarWindowFunc.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CStrictHashedDistributions.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CStrictHashedDistributions.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/operators/CStrictHashedDistributions.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/operators/CStrictHashedDistributions.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/optimizer/COptimizer.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/optimizer/COptimizer.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/optimizer/COptimizer.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/optimizer/COptimizer.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/optimizer/COptimizerConfig.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/optimizer/COptimizerConfig.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/optimizer/COptimizerConfig.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/optimizer/COptimizerConfig.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CBinding.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CBinding.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/search/CBinding.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CBinding.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CGroup.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CGroup.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/search/CGroup.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CGroup.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CGroupExpression.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CGroupExpression.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/search/CGroupExpression.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CGroupExpression.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CGroupProxy.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CGroupProxy.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/search/CGroupProxy.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CGroupProxy.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJob.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJob.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/search/CJob.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJob.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJobFactory.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJobFactory.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/search/CJobFactory.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJobFactory.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJobGroup.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJobGroup.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/search/CJobGroup.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJobGroup.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJobGroupExploration.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJobGroupExploration.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/search/CJobGroupExploration.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJobGroupExploration.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJobGroupExpression.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJobGroupExpression.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/search/CJobGroupExpression.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJobGroupExpression.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJobGroupExpressionExploration.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJobGroupExpressionExploration.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/search/CJobGroupExpressionExploration.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJobGroupExpressionExploration.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJobGroupExpressionImplementation.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJobGroupExpressionImplementation.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/search/CJobGroupExpressionImplementation.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJobGroupExpressionImplementation.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJobGroupExpressionOptimization.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJobGroupExpressionOptimization.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/search/CJobGroupExpressionOptimization.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJobGroupExpressionOptimization.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJobGroupImplementation.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJobGroupImplementation.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/search/CJobGroupImplementation.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJobGroupImplementation.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJobGroupOptimization.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJobGroupOptimization.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/search/CJobGroupOptimization.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJobGroupOptimization.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJobQueue.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJobQueue.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/search/CJobQueue.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJobQueue.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJobStateMachine.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJobStateMachine.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/search/CJobStateMachine.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJobStateMachine.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJobTest.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJobTest.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/search/CJobTest.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJobTest.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJobTransformation.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJobTransformation.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/search/CJobTransformation.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CJobTransformation.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CMemo.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CMemo.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/search/CMemo.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CMemo.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CScheduler.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CScheduler.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/search/CScheduler.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CScheduler.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CSchedulerContext.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CSchedulerContext.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/search/CSchedulerContext.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CSchedulerContext.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CSearchStage.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CSearchStage.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/search/CSearchStage.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CSearchStage.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CTreeMap.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CTreeMap.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/search/CTreeMap.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/search/CTreeMap.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/translate/CTranslatorDXLToExpr.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/translate/CTranslatorDXLToExpr.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/translate/CTranslatorDXLToExpr.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/translate/CTranslatorDXLToExpr.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/translate/CTranslatorDXLToExprUtils.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/translate/CTranslatorDXLToExprUtils.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/translate/CTranslatorDXLToExprUtils.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/translate/CTranslatorDXLToExprUtils.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/translate/CTranslatorExprToDXL.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/translate/CTranslatorExprToDXL.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/translate/CTranslatorExprToDXL.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/translate/CTranslatorExprToDXL.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/translate/CTranslatorExprToDXLUtils.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/translate/CTranslatorExprToDXLUtils.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/translate/CTranslatorExprToDXLUtils.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/translate/CTranslatorExprToDXLUtils.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CDecorrelator.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CDecorrelator.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CDecorrelator.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CDecorrelator.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrder.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CJoinOrder.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrder.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CJoinOrder.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrderDP.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CJoinOrderDP.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrderDP.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CJoinOrderDP.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrderDPv2.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CJoinOrderDPv2.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrderDPv2.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CJoinOrderDPv2.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrderGreedy.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CJoinOrderGreedy.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrderGreedy.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CJoinOrderGreedy.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrderMinCard.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CJoinOrderMinCard.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrderMinCard.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CJoinOrderMinCard.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CSubqueryHandler.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CSubqueryHandler.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CSubqueryHandler.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CSubqueryHandler.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXform.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXform.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXform.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXform.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinAntiSemiJoinNotInSwap.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinAntiSemiJoinNotInSwap.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinAntiSemiJoinNotInSwap.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinAntiSemiJoinNotInSwap.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinAntiSemiJoinSwap.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinAntiSemiJoinSwap.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinAntiSemiJoinSwap.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinAntiSemiJoinSwap.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinInnerJoinSwap.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinInnerJoinSwap.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinInnerJoinSwap.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinInnerJoinSwap.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInAntiSemiJoinNotInSwap.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInAntiSemiJoinNotInSwap.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInAntiSemiJoinNotInSwap.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInAntiSemiJoinNotInSwap.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInAntiSemiJoinSwap.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInAntiSemiJoinSwap.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInAntiSemiJoinSwap.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInAntiSemiJoinSwap.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInInnerJoinSwap.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInInnerJoinSwap.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInInnerJoinSwap.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInInnerJoinSwap.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInSemiJoinSwap.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInSemiJoinSwap.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInSemiJoinSwap.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInSemiJoinSwap.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinSemiJoinSwap.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinSemiJoinSwap.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinSemiJoinSwap.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinSemiJoinSwap.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformApply2Join.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformApply2Join.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformApply2Join.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformApply2Join.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformCTEAnchor2Sequence.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformCTEAnchor2Sequence.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformCTEAnchor2Sequence.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformCTEAnchor2Sequence.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformCTEAnchor2TrivialSelect.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformCTEAnchor2TrivialSelect.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformCTEAnchor2TrivialSelect.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformCTEAnchor2TrivialSelect.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformCollapseGbAgg.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformCollapseGbAgg.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformCollapseGbAgg.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformCollapseGbAgg.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformCollapseProject.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformCollapseProject.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformCollapseProject.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformCollapseProject.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformContext.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformContext.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformContext.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformContext.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformDelete2DML.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformDelete2DML.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformDelete2DML.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformDelete2DML.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformDifference2LeftAntiSemiJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformDifference2LeftAntiSemiJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformDifference2LeftAntiSemiJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformDifference2LeftAntiSemiJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformDifferenceAll2LeftAntiSemiJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformDifferenceAll2LeftAntiSemiJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformDifferenceAll2LeftAntiSemiJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformDifferenceAll2LeftAntiSemiJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformDynamicForeignGet2DynamicForeignScan.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformDynamicForeignGet2DynamicForeignScan.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformDynamicForeignGet2DynamicForeignScan.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformDynamicForeignGet2DynamicForeignScan.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformDynamicGet2DynamicTableScan.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformDynamicGet2DynamicTableScan.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformDynamicGet2DynamicTableScan.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformDynamicGet2DynamicTableScan.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformDynamicIndexGet2DynamicIndexScan.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformDynamicIndexGet2DynamicIndexScan.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformDynamicIndexGet2DynamicIndexScan.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformDynamicIndexGet2DynamicIndexScan.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformDynamicIndexOnlyGet2DynamicIndexOnlyScan.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformDynamicIndexOnlyGet2DynamicIndexOnlyScan.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformDynamicIndexOnlyGet2DynamicIndexOnlyScan.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformDynamicIndexOnlyGet2DynamicIndexOnlyScan.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformEagerAgg.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformEagerAgg.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformEagerAgg.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformEagerAgg.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformExpandDynamicGetWithForeignPartitions.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformExpandDynamicGetWithForeignPartitions.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformExpandDynamicGetWithForeignPartitions.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformExpandDynamicGetWithForeignPartitions.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformExpandFullOuterJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformExpandFullOuterJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformExpandFullOuterJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformExpandFullOuterJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinDP.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinDP.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinDP.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinDP.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinDPv2.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinDPv2.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinDPv2.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinDPv2.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinGreedy.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinGreedy.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinGreedy.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinGreedy.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinMinCard.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinMinCard.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinMinCard.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinMinCard.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformExploration.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformExploration.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformExploration.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformExploration.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformFactory.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformFactory.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformFactory.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformFactory.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformForeignGet2ForeignScan.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformForeignGet2ForeignScan.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformForeignGet2ForeignScan.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformForeignGet2ForeignScan.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformFullJoinCommutativity.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformFullJoinCommutativity.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformFullJoinCommutativity.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformFullJoinCommutativity.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformFullOuterJoin2HashJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformFullOuterJoin2HashJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformFullOuterJoin2HashJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformFullOuterJoin2HashJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2Apply.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2Apply.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2Apply.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2Apply.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2HashAgg.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2HashAgg.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2HashAgg.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2HashAgg.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2ScalarAgg.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2ScalarAgg.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2ScalarAgg.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2ScalarAgg.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2StreamAgg.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2StreamAgg.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2StreamAgg.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2StreamAgg.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformGbAggDedup2HashAggDedup.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformGbAggDedup2HashAggDedup.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformGbAggDedup2HashAggDedup.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformGbAggDedup2HashAggDedup.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformGbAggDedup2StreamAggDedup.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformGbAggDedup2StreamAggDedup.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformGbAggDedup2StreamAggDedup.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformGbAggDedup2StreamAggDedup.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformGbAggWithMDQA2Join.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformGbAggWithMDQA2Join.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformGbAggWithMDQA2Join.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformGbAggWithMDQA2Join.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformGet2TableScan.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformGet2TableScan.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformGet2TableScan.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformGet2TableScan.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementAssert.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementAssert.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementAssert.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementAssert.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementBitmapTableGet.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementBitmapTableGet.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementBitmapTableGet.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementBitmapTableGet.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementCTEConsumer.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementCTEConsumer.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementCTEConsumer.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementCTEConsumer.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementCTEProducer.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementCTEProducer.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementCTEProducer.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementCTEProducer.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementConstTableGet.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementConstTableGet.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementConstTableGet.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementConstTableGet.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementCorrelatedApply.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementCorrelatedApply.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementCorrelatedApply.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementCorrelatedApply.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementDML.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementDML.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementDML.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementDML.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementDynamicBitmapTableGet.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementDynamicBitmapTableGet.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementDynamicBitmapTableGet.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementDynamicBitmapTableGet.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementFullOuterMergeJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementFullOuterMergeJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementFullOuterMergeJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementFullOuterMergeJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementIndexApply.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementIndexApply.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementIndexApply.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementIndexApply.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementInnerCorrelatedApply.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementInnerCorrelatedApply.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementInnerCorrelatedApply.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementInnerCorrelatedApply.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementInnerJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementInnerJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementInnerJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementInnerJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftAntiSemiCorrelatedApply.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftAntiSemiCorrelatedApply.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftAntiSemiCorrelatedApply.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftAntiSemiCorrelatedApply.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftAntiSemiCorrelatedApplyNotIn.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftAntiSemiCorrelatedApplyNotIn.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftAntiSemiCorrelatedApplyNotIn.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftAntiSemiCorrelatedApplyNotIn.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftOuterCorrelatedApply.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftOuterCorrelatedApply.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftOuterCorrelatedApply.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftOuterCorrelatedApply.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftSemiCorrelatedApply.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftSemiCorrelatedApply.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftSemiCorrelatedApply.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftSemiCorrelatedApply.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftSemiCorrelatedApplyIn.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftSemiCorrelatedApplyIn.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftSemiCorrelatedApplyIn.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftSemiCorrelatedApplyIn.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementLimit.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementLimit.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementLimit.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementLimit.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementSequence.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementSequence.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementSequence.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementSequence.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementSequenceProject.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementSequenceProject.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementSequenceProject.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementSequenceProject.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementSplit.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementSplit.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementSplit.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementSplit.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementTVF.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementTVF.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementTVF.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementTVF.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementTVFNoArgs.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementTVFNoArgs.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementTVFNoArgs.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementTVFNoArgs.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementUnionAll.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementUnionAll.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementUnionAll.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementUnionAll.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementation.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementation.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementation.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementation.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformIndexGet2IndexScan.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformIndexGet2IndexScan.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformIndexGet2IndexScan.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformIndexGet2IndexScan.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformIndexOnlyGet2IndexOnlyScan.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformIndexOnlyGet2IndexOnlyScan.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformIndexOnlyGet2IndexOnlyScan.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformIndexOnlyGet2IndexOnlyScan.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInlineCTEConsumer.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformInlineCTEConsumer.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInlineCTEConsumer.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformInlineCTEConsumer.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInlineCTEConsumerUnderSelect.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformInlineCTEConsumerUnderSelect.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInlineCTEConsumerUnderSelect.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformInlineCTEConsumerUnderSelect.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInnerApply2InnerJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformInnerApply2InnerJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInnerApply2InnerJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformInnerApply2InnerJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInnerApply2InnerJoinNoCorrelations.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformInnerApply2InnerJoinNoCorrelations.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInnerApply2InnerJoinNoCorrelations.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformInnerApply2InnerJoinNoCorrelations.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInnerApplyWithOuterKey2InnerJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformInnerApplyWithOuterKey2InnerJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInnerApplyWithOuterKey2InnerJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformInnerApplyWithOuterKey2InnerJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinAntiSemiJoinNotInSwap.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinAntiSemiJoinNotInSwap.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinAntiSemiJoinNotInSwap.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinAntiSemiJoinNotInSwap.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinAntiSemiJoinSwap.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinAntiSemiJoinSwap.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinAntiSemiJoinSwap.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinAntiSemiJoinSwap.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinCommutativity.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinCommutativity.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinCommutativity.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinCommutativity.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinSemiJoinSwap.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinSemiJoinSwap.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinSemiJoinSwap.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinSemiJoinSwap.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInsert2DML.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformInsert2DML.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInsert2DML.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformInsert2DML.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformIntersect2Join.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformIntersect2Join.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformIntersect2Join.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformIntersect2Join.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformIntersectAll2LeftSemiJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformIntersectAll2LeftSemiJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformIntersectAll2LeftSemiJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformIntersectAll2LeftSemiJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformJoin2BitmapIndexGetApply.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformJoin2BitmapIndexGetApply.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformJoin2BitmapIndexGetApply.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformJoin2BitmapIndexGetApply.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformJoin2IndexApply.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformJoin2IndexApply.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformJoin2IndexApply.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformJoin2IndexApply.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformJoin2IndexApplyGeneric.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformJoin2IndexApplyGeneric.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformJoin2IndexApplyGeneric.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformJoin2IndexApplyGeneric.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformJoin2IndexGetApply.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformJoin2IndexGetApply.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformJoin2IndexGetApply.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformJoin2IndexGetApply.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformJoinAssociativity.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformJoinAssociativity.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformJoinAssociativity.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformJoinAssociativity.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformJoinSwap.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformJoinSwap.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformJoinSwap.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformJoinSwap.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoinNoCorrelations.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoinNoCorrelations.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoinNoCorrelations.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoinNoCorrelations.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotIn.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotIn.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotIn.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotIn.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotInNoCorrelations.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotInNoCorrelations.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotInNoCorrelations.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotInNoCorrelations.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoin2CrossProduct.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoin2CrossProduct.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoin2CrossProduct.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoin2CrossProduct.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoin2HashJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoin2HashJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoin2HashJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoin2HashJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoin2NLJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoin2NLJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoin2NLJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoin2NLJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoinNotIn2CrossProduct.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoinNotIn2CrossProduct.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoinNotIn2CrossProduct.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoinNotIn2CrossProduct.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoinNotIn2HashJoinNotIn.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoinNotIn2HashJoinNotIn.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoinNotIn2HashJoinNotIn.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoinNotIn2HashJoinNotIn.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoinNotIn2NLJoinNotIn.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoinNotIn2NLJoinNotIn.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoinNotIn2NLJoinNotIn.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoinNotIn2NLJoinNotIn.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftJoin2RightJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftJoin2RightJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftJoin2RightJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftJoin2RightJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuter2InnerUnionAllLeftAntiSemiJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuter2InnerUnionAllLeftAntiSemiJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuter2InnerUnionAllLeftAntiSemiJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuter2InnerUnionAllLeftAntiSemiJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterApply2LeftOuterJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterApply2LeftOuterJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterApply2LeftOuterJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterApply2LeftOuterJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterApply2LeftOuterJoinNoCorrelations.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterApply2LeftOuterJoinNoCorrelations.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterApply2LeftOuterJoinNoCorrelations.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterApply2LeftOuterJoinNoCorrelations.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterJoin2HashJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterJoin2HashJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterJoin2HashJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterJoin2HashJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterJoin2NLJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterJoin2NLJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterJoin2NLJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterJoin2NLJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApply2LeftSemiJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApply2LeftSemiJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApply2LeftSemiJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApply2LeftSemiJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApply2LeftSemiJoinNoCorrelations.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApply2LeftSemiJoinNoCorrelations.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApply2LeftSemiJoinNoCorrelations.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApply2LeftSemiJoinNoCorrelations.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyIn2LeftSemiJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyIn2LeftSemiJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyIn2LeftSemiJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyIn2LeftSemiJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyIn2LeftSemiJoinNoCorrelations.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyIn2LeftSemiJoinNoCorrelations.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyIn2LeftSemiJoinNoCorrelations.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyIn2LeftSemiJoinNoCorrelations.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyInWithExternalCorrs2InnerJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyInWithExternalCorrs2InnerJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyInWithExternalCorrs2InnerJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyInWithExternalCorrs2InnerJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyWithExternalCorrs2InnerJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyWithExternalCorrs2InnerJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyWithExternalCorrs2InnerJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyWithExternalCorrs2InnerJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2CrossProduct.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2CrossProduct.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2CrossProduct.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2CrossProduct.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2HashJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2HashJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2HashJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2HashJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2InnerJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2InnerJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2InnerJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2InnerJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2InnerJoinUnderGb.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2InnerJoinUnderGb.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2InnerJoinUnderGb.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2InnerJoinUnderGb.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2NLJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2NLJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2NLJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2NLJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLimit2IndexGet.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLimit2IndexGet.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLimit2IndexGet.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLimit2IndexGet.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLimit2IndexOnlyGet.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLimit2IndexOnlyGet.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLimit2IndexOnlyGet.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformLimit2IndexOnlyGet.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformMaxOneRow2Assert.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformMaxOneRow2Assert.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformMaxOneRow2Assert.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformMaxOneRow2Assert.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformMinMax2IndexGet.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformMinMax2IndexGet.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformMinMax2IndexGet.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformMinMax2IndexGet.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformMinMax2IndexOnlyGet.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformMinMax2IndexOnlyGet.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformMinMax2IndexOnlyGet.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformMinMax2IndexOnlyGet.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformProject2Apply.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformProject2Apply.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformProject2Apply.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformProject2Apply.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformProject2ComputeScalar.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformProject2ComputeScalar.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformProject2ComputeScalar.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformProject2ComputeScalar.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushDownLeftOuterJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformPushDownLeftOuterJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushDownLeftOuterJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformPushDownLeftOuterJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowSetOp.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowSetOp.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowSetOp.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowSetOp.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowUnion.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowUnion.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowUnion.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowUnion.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowUnionAll.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowUnionAll.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowUnionAll.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowUnionAll.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushGbDedupBelowJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformPushGbDedupBelowJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushGbDedupBelowJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformPushGbDedupBelowJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushGbWithHavingBelowJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformPushGbWithHavingBelowJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushGbWithHavingBelowJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformPushGbWithHavingBelowJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushJoinBelowLeftUnionAll.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformPushJoinBelowLeftUnionAll.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushJoinBelowLeftUnionAll.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformPushJoinBelowLeftUnionAll.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushJoinBelowRightUnionAll.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformPushJoinBelowRightUnionAll.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushJoinBelowRightUnionAll.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformPushJoinBelowRightUnionAll.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushJoinBelowUnionAll.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformPushJoinBelowUnionAll.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushJoinBelowUnionAll.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformPushJoinBelowUnionAll.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformRemoveSubqDistinct.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformRemoveSubqDistinct.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformRemoveSubqDistinct.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformRemoveSubqDistinct.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformResult.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformResult.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformResult.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformResult.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformRightOuterJoin2HashJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformRightOuterJoin2HashJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformRightOuterJoin2HashJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformRightOuterJoin2HashJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSelect2Apply.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSelect2Apply.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSelect2Apply.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSelect2Apply.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSelect2BitmapBoolOp.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSelect2BitmapBoolOp.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSelect2BitmapBoolOp.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSelect2BitmapBoolOp.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSelect2DynamicBitmapBoolOp.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSelect2DynamicBitmapBoolOp.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSelect2DynamicBitmapBoolOp.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSelect2DynamicBitmapBoolOp.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSelect2DynamicIndexGet.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSelect2DynamicIndexGet.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSelect2DynamicIndexGet.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSelect2DynamicIndexGet.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSelect2DynamicIndexOnlyGet.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSelect2DynamicIndexOnlyGet.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSelect2DynamicIndexOnlyGet.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSelect2DynamicIndexOnlyGet.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSelect2Filter.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSelect2Filter.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSelect2Filter.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSelect2Filter.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSelect2IndexGet.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSelect2IndexGet.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSelect2IndexGet.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSelect2IndexGet.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSelect2IndexOnlyGet.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSelect2IndexOnlyGet.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSelect2IndexOnlyGet.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSelect2IndexOnlyGet.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinAntiSemiJoinNotInSwap.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinAntiSemiJoinNotInSwap.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinAntiSemiJoinNotInSwap.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinAntiSemiJoinNotInSwap.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinAntiSemiJoinSwap.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinAntiSemiJoinSwap.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinAntiSemiJoinSwap.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinAntiSemiJoinSwap.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinInnerJoinSwap.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinInnerJoinSwap.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinInnerJoinSwap.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinInnerJoinSwap.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinSemiJoinSwap.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinSemiJoinSwap.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinSemiJoinSwap.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinSemiJoinSwap.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSequenceProject2Apply.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSequenceProject2Apply.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSequenceProject2Apply.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSequenceProject2Apply.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSimplifyGbAgg.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSimplifyGbAgg.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSimplifyGbAgg.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSimplifyGbAgg.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSimplifyLeftOuterJoin.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSimplifyLeftOuterJoin.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSimplifyLeftOuterJoin.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSimplifyLeftOuterJoin.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSimplifyProjectWithSubquery.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSimplifyProjectWithSubquery.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSimplifyProjectWithSubquery.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSimplifyProjectWithSubquery.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSimplifySelectWithSubquery.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSimplifySelectWithSubquery.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSimplifySelectWithSubquery.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSimplifySelectWithSubquery.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSimplifySubquery.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSimplifySubquery.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSimplifySubquery.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSimplifySubquery.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSplitDQA.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSplitDQA.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSplitDQA.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSplitDQA.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSplitGbAgg.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSplitGbAgg.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSplitGbAgg.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSplitGbAgg.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSplitGbAggDedup.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSplitGbAggDedup.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSplitGbAggDedup.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSplitGbAggDedup.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSplitLimit.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSplitLimit.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSplitLimit.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSplitLimit.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSubqJoin2Apply.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSubqJoin2Apply.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSubqJoin2Apply.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSubqJoin2Apply.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSubqNAryJoin2Apply.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSubqNAryJoin2Apply.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSubqNAryJoin2Apply.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSubqNAryJoin2Apply.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSubqueryUnnest.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSubqueryUnnest.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSubqueryUnnest.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformSubqueryUnnest.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformUnion2UnionAll.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformUnion2UnionAll.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformUnion2UnionAll.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformUnion2UnionAll.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformUnnestTVF.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformUnnestTVF.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformUnnestTVF.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformUnnestTVF.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformUpdate2DML.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformUpdate2DML.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformUpdate2DML.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformUpdate2DML.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformUtils.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformUtils.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/CXformUtils.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/CXformUtils.h diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/xforms.h b/gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/xforms.h similarity index 100% rename from src/backend/gporca/libgpopt/include/gpopt/xforms/xforms.h rename to gpcontrib/gp_orca/gporca/libgpopt/include/gpopt/xforms/xforms.h diff --git a/src/backend/gporca/libgpopt/src/base/CAutoOptCtxt.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CAutoOptCtxt.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CAutoOptCtxt.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CAutoOptCtxt.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CCTEInfo.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CCTEInfo.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CCTEInfo.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CCTEInfo.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CCTEMap.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CCTEMap.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CCTEMap.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CCTEMap.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CCTEReq.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CCTEReq.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CCTEReq.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CCTEReq.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CCastUtils.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CCastUtils.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CCastUtils.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CCastUtils.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CColConstraintsArrayMapper.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CColConstraintsArrayMapper.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CColConstraintsArrayMapper.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CColConstraintsArrayMapper.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CColConstraintsHashMapper.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CColConstraintsHashMapper.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CColConstraintsHashMapper.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CColConstraintsHashMapper.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CColRef.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CColRef.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CColRef.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CColRef.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CColRefComputed.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CColRefComputed.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CColRefComputed.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CColRefComputed.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CColRefSet.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CColRefSet.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CColRefSet.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CColRefSet.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CColRefSetIter.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CColRefSetIter.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CColRefSetIter.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CColRefSetIter.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CColRefTable.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CColRefTable.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CColRefTable.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CColRefTable.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CColumnFactory.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CColumnFactory.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CColumnFactory.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CColumnFactory.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CConstraint.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CConstraint.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CConstraint.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CConstraint.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CConstraintConjunction.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CConstraintConjunction.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CConstraintConjunction.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CConstraintConjunction.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CConstraintDisjunction.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CConstraintDisjunction.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CConstraintDisjunction.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CConstraintDisjunction.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CConstraintInterval.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CConstraintInterval.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CConstraintInterval.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CConstraintInterval.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CConstraintNegation.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CConstraintNegation.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CConstraintNegation.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CConstraintNegation.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CCostContext.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CCostContext.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CCostContext.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CCostContext.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CDatumSortedSet.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CDatumSortedSet.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CDatumSortedSet.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CDatumSortedSet.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CDefaultComparator.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CDefaultComparator.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CDefaultComparator.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CDefaultComparator.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CDistributionSpecHashed.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CDistributionSpecHashed.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CDistributionSpecHashed.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CDistributionSpecHashed.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CDistributionSpecHashedNoOp.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CDistributionSpecHashedNoOp.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CDistributionSpecHashedNoOp.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CDistributionSpecHashedNoOp.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CDistributionSpecNonSingleton.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CDistributionSpecNonSingleton.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CDistributionSpecNonSingleton.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CDistributionSpecNonSingleton.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CDistributionSpecRandom.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CDistributionSpecRandom.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CDistributionSpecRandom.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CDistributionSpecRandom.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CDistributionSpecReplicated.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CDistributionSpecReplicated.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CDistributionSpecReplicated.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CDistributionSpecReplicated.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CDistributionSpecRouted.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CDistributionSpecRouted.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CDistributionSpecRouted.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CDistributionSpecRouted.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CDistributionSpecSingleton.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CDistributionSpecSingleton.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CDistributionSpecSingleton.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CDistributionSpecSingleton.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CDistributionSpecStrictHashed.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CDistributionSpecStrictHashed.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CDistributionSpecStrictHashed.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CDistributionSpecStrictHashed.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CDistributionSpecStrictRandom.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CDistributionSpecStrictRandom.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CDistributionSpecStrictRandom.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CDistributionSpecStrictRandom.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CDistributionSpecStrictSingleton.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CDistributionSpecStrictSingleton.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CDistributionSpecStrictSingleton.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CDistributionSpecStrictSingleton.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CDistributionSpecUniversal.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CDistributionSpecUniversal.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CDistributionSpecUniversal.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CDistributionSpecUniversal.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CDrvdProp.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CDrvdProp.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CDrvdProp.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CDrvdProp.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CDrvdPropCtxt.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CDrvdPropCtxt.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CDrvdPropCtxt.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CDrvdPropCtxt.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CDrvdPropCtxtPlan.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CDrvdPropCtxtPlan.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CDrvdPropCtxtPlan.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CDrvdPropCtxtPlan.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CDrvdPropPlan.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CDrvdPropPlan.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CDrvdPropPlan.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CDrvdPropPlan.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CDrvdPropRelational.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CDrvdPropRelational.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CDrvdPropRelational.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CDrvdPropRelational.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CDrvdPropScalar.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CDrvdPropScalar.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CDrvdPropScalar.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CDrvdPropScalar.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CEnfdDistribution.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CEnfdDistribution.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CEnfdDistribution.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CEnfdDistribution.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CEnfdOrder.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CEnfdOrder.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CEnfdOrder.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CEnfdOrder.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CEnfdPartitionPropagation.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CEnfdPartitionPropagation.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CEnfdPartitionPropagation.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CEnfdPartitionPropagation.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CEnfdProp.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CEnfdProp.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CEnfdProp.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CEnfdProp.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CEnfdRewindability.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CEnfdRewindability.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CEnfdRewindability.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CEnfdRewindability.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CFunctionProp.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CFunctionProp.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CFunctionProp.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CFunctionProp.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CFunctionalDependency.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CFunctionalDependency.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CFunctionalDependency.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CFunctionalDependency.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CIOUtils.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CIOUtils.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CIOUtils.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CIOUtils.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CKeyCollection.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CKeyCollection.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CKeyCollection.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CKeyCollection.cpp diff --git a/src/backend/gporca/libgpopt/src/base/COptCtxt.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/COptCtxt.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/COptCtxt.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/COptCtxt.cpp diff --git a/src/backend/gporca/libgpopt/src/base/COptimizationContext.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/COptimizationContext.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/COptimizationContext.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/COptimizationContext.cpp diff --git a/src/backend/gporca/libgpopt/src/base/COrderSpec.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/COrderSpec.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/COrderSpec.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/COrderSpec.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CPartInfo.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CPartInfo.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CPartInfo.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CPartInfo.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CPartKeys.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CPartKeys.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CPartKeys.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CPartKeys.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CPartitionPropagationSpec.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CPartitionPropagationSpec.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CPartitionPropagationSpec.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CPartitionPropagationSpec.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CPrintPrefix.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CPrintPrefix.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CPrintPrefix.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CPrintPrefix.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CPropConstraint.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CPropConstraint.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CPropConstraint.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CPropConstraint.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CQueryContext.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CQueryContext.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CQueryContext.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CQueryContext.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CRange.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CRange.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CRange.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CRange.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CReqdProp.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CReqdProp.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CReqdProp.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CReqdProp.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CReqdPropPlan.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CReqdPropPlan.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CReqdPropPlan.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CReqdPropPlan.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CReqdPropRelational.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CReqdPropRelational.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CReqdPropRelational.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CReqdPropRelational.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CRewindabilitySpec.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CRewindabilitySpec.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CRewindabilitySpec.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CRewindabilitySpec.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CUtils.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CUtils.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CUtils.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CUtils.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CWindowFrame.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CWindowFrame.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CWindowFrame.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CWindowFrame.cpp diff --git a/src/backend/gporca/libgpopt/src/base/CWindowOids.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/CWindowOids.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/CWindowOids.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/CWindowOids.cpp diff --git a/src/backend/gporca/libgpopt/src/base/IColConstraintsMapper.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/base/IColConstraintsMapper.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/base/IColConstraintsMapper.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/base/IColConstraintsMapper.cpp diff --git a/src/backend/gporca/libgpopt/src/engine/CEngine.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/engine/CEngine.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/engine/CEngine.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/engine/CEngine.cpp diff --git a/src/backend/gporca/libgpopt/src/engine/CEnumeratorConfig.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/engine/CEnumeratorConfig.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/engine/CEnumeratorConfig.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/engine/CEnumeratorConfig.cpp diff --git a/src/backend/gporca/libgpopt/src/engine/CPartialPlan.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/engine/CPartialPlan.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/engine/CPartialPlan.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/engine/CPartialPlan.cpp diff --git a/src/backend/gporca/libgpopt/src/engine/CStatisticsConfig.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/engine/CStatisticsConfig.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/engine/CStatisticsConfig.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/engine/CStatisticsConfig.cpp diff --git a/src/backend/gporca/libgpopt/src/eval/CConstExprEvaluatorDXL.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/eval/CConstExprEvaluatorDXL.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/eval/CConstExprEvaluatorDXL.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/eval/CConstExprEvaluatorDXL.cpp diff --git a/src/backend/gporca/libgpopt/src/eval/CConstExprEvaluatorDefault.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/eval/CConstExprEvaluatorDefault.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/eval/CConstExprEvaluatorDefault.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/eval/CConstExprEvaluatorDefault.cpp diff --git a/src/backend/gporca/libgpopt/src/exception.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/exception.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/exception.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/exception.cpp diff --git a/src/backend/gporca/libgpopt/src/hints/CHintUtils.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/hints/CHintUtils.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/hints/CHintUtils.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/hints/CHintUtils.cpp diff --git a/src/backend/gporca/libgpopt/src/hints/CJoinHint.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/hints/CJoinHint.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/hints/CJoinHint.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/hints/CJoinHint.cpp diff --git a/src/backend/gporca/libgpopt/src/hints/CPlanHint.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/hints/CPlanHint.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/hints/CPlanHint.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/hints/CPlanHint.cpp diff --git a/src/backend/gporca/libgpopt/src/hints/CRowHint.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/hints/CRowHint.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/hints/CRowHint.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/hints/CRowHint.cpp diff --git a/src/backend/gporca/libgpopt/src/hints/CScanHint.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/hints/CScanHint.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/hints/CScanHint.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/hints/CScanHint.cpp diff --git a/src/backend/gporca/libgpopt/src/hints/README b/gpcontrib/gp_orca/gporca/libgpopt/src/hints/README similarity index 100% rename from src/backend/gporca/libgpopt/src/hints/README rename to gpcontrib/gp_orca/gporca/libgpopt/src/hints/README diff --git a/src/backend/gporca/libgpopt/src/init.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/init.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/init.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/init.cpp diff --git a/src/backend/gporca/libgpopt/src/mdcache/CMDAccessor.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/mdcache/CMDAccessor.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/mdcache/CMDAccessor.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/mdcache/CMDAccessor.cpp diff --git a/src/backend/gporca/libgpopt/src/mdcache/CMDAccessorUtils.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/mdcache/CMDAccessorUtils.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/mdcache/CMDAccessorUtils.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/mdcache/CMDAccessorUtils.cpp diff --git a/src/backend/gporca/libgpopt/src/mdcache/CMDCache.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/mdcache/CMDCache.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/mdcache/CMDCache.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/mdcache/CMDCache.cpp diff --git a/src/backend/gporca/libgpopt/src/mdcache/CMDKey.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/mdcache/CMDKey.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/mdcache/CMDKey.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/mdcache/CMDKey.cpp diff --git a/src/backend/gporca/libgpopt/src/metadata/CColumnDescriptor.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/metadata/CColumnDescriptor.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/metadata/CColumnDescriptor.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/metadata/CColumnDescriptor.cpp diff --git a/src/backend/gporca/libgpopt/src/metadata/CIndexDescriptor.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/metadata/CIndexDescriptor.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/metadata/CIndexDescriptor.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/metadata/CIndexDescriptor.cpp diff --git a/src/backend/gporca/libgpopt/src/metadata/CName.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/metadata/CName.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/metadata/CName.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/metadata/CName.cpp diff --git a/src/backend/gporca/libgpopt/src/metadata/CTableDescriptor.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/metadata/CTableDescriptor.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/metadata/CTableDescriptor.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/metadata/CTableDescriptor.cpp diff --git a/src/backend/gporca/libgpopt/src/minidump/CDXLMinidump.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/minidump/CDXLMinidump.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/minidump/CDXLMinidump.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/minidump/CDXLMinidump.cpp diff --git a/src/backend/gporca/libgpopt/src/minidump/CMetadataAccessorFactory.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/minidump/CMetadataAccessorFactory.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/minidump/CMetadataAccessorFactory.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/minidump/CMetadataAccessorFactory.cpp diff --git a/src/backend/gporca/libgpopt/src/minidump/CMiniDumperDXL.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/minidump/CMiniDumperDXL.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/minidump/CMiniDumperDXL.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/minidump/CMiniDumperDXL.cpp diff --git a/src/backend/gporca/libgpopt/src/minidump/CMinidumperUtils.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/minidump/CMinidumperUtils.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/minidump/CMinidumperUtils.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/minidump/CMinidumperUtils.cpp diff --git a/src/backend/gporca/libgpopt/src/minidump/CSerializableMDAccessor.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/minidump/CSerializableMDAccessor.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/minidump/CSerializableMDAccessor.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/minidump/CSerializableMDAccessor.cpp diff --git a/src/backend/gporca/libgpopt/src/minidump/CSerializableOptimizerConfig.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/minidump/CSerializableOptimizerConfig.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/minidump/CSerializableOptimizerConfig.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/minidump/CSerializableOptimizerConfig.cpp diff --git a/src/backend/gporca/libgpopt/src/minidump/CSerializablePlan.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/minidump/CSerializablePlan.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/minidump/CSerializablePlan.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/minidump/CSerializablePlan.cpp diff --git a/src/backend/gporca/libgpopt/src/minidump/CSerializableQuery.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/minidump/CSerializableQuery.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/minidump/CSerializableQuery.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/minidump/CSerializableQuery.cpp diff --git a/src/backend/gporca/libgpopt/src/minidump/CSerializableStackTrace.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/minidump/CSerializableStackTrace.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/minidump/CSerializableStackTrace.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/minidump/CSerializableStackTrace.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CExpression.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CExpression.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CExpression.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CExpression.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CExpressionFactorizer.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CExpressionFactorizer.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CExpressionFactorizer.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CExpressionFactorizer.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CExpressionHandle.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CExpressionHandle.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CExpressionHandle.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CExpressionHandle.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CExpressionPreprocessor.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CExpressionPreprocessor.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CExpressionPreprocessor.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CExpressionPreprocessor.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CExpressionUtils.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CExpressionUtils.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CExpressionUtils.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CExpressionUtils.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CHashedDistributions.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CHashedDistributions.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CHashedDistributions.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CHashedDistributions.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CJoinOrderHintsPreprocessor.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CJoinOrderHintsPreprocessor.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CJoinOrderHintsPreprocessor.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CJoinOrderHintsPreprocessor.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLeftJoinPruningPreprocessor.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLeftJoinPruningPreprocessor.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLeftJoinPruningPreprocessor.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLeftJoinPruningPreprocessor.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogical.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogical.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogical.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogical.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalApply.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalApply.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalApply.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalApply.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalAssert.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalAssert.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalAssert.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalAssert.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalBitmapTableGet.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalBitmapTableGet.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalBitmapTableGet.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalBitmapTableGet.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalCTEAnchor.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalCTEAnchor.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalCTEAnchor.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalCTEAnchor.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalCTEConsumer.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalCTEConsumer.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalCTEConsumer.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalCTEConsumer.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalCTEProducer.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalCTEProducer.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalCTEProducer.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalCTEProducer.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalConstTableGet.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalConstTableGet.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalConstTableGet.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalConstTableGet.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalDML.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalDML.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalDML.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalDML.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalDelete.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalDelete.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalDelete.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalDelete.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalDifference.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalDifference.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalDifference.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalDifference.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalDifferenceAll.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalDifferenceAll.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalDifferenceAll.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalDifferenceAll.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalDynamicBitmapTableGet.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalDynamicBitmapTableGet.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalDynamicBitmapTableGet.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalDynamicBitmapTableGet.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalDynamicForeignGet.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalDynamicForeignGet.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalDynamicForeignGet.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalDynamicForeignGet.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalDynamicGet.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalDynamicGet.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalDynamicGet.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalDynamicGet.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalDynamicGetBase.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalDynamicGetBase.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalDynamicGetBase.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalDynamicGetBase.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalDynamicIndexGet.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalDynamicIndexGet.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalDynamicIndexGet.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalDynamicIndexGet.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalForeignGet.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalForeignGet.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalForeignGet.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalForeignGet.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalFullOuterJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalFullOuterJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalFullOuterJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalFullOuterJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalGbAgg.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalGbAgg.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalGbAgg.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalGbAgg.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalGbAggDeduplicate.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalGbAggDeduplicate.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalGbAggDeduplicate.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalGbAggDeduplicate.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalGet.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalGet.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalGet.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalGet.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalIndexApply.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalIndexApply.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalIndexApply.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalIndexApply.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalIndexGet.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalIndexGet.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalIndexGet.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalIndexGet.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalInnerApply.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalInnerApply.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalInnerApply.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalInnerApply.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalInnerCorrelatedApply.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalInnerCorrelatedApply.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalInnerCorrelatedApply.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalInnerCorrelatedApply.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalInnerJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalInnerJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalInnerJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalInnerJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalInsert.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalInsert.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalInsert.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalInsert.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalIntersect.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalIntersect.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalIntersect.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalIntersect.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalIntersectAll.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalIntersectAll.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalIntersectAll.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalIntersectAll.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiApply.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiApply.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiApply.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiApply.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiApplyNotIn.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiApplyNotIn.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiApplyNotIn.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiApplyNotIn.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiCorrelatedApply.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiCorrelatedApply.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiCorrelatedApply.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiCorrelatedApply.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiCorrelatedApplyNotIn.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiCorrelatedApplyNotIn.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiCorrelatedApplyNotIn.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiCorrelatedApplyNotIn.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiJoinNotIn.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiJoinNotIn.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiJoinNotIn.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiJoinNotIn.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftOuterApply.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftOuterApply.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftOuterApply.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftOuterApply.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftOuterCorrelatedApply.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftOuterCorrelatedApply.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftOuterCorrelatedApply.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftOuterCorrelatedApply.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftOuterJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftOuterJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftOuterJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftOuterJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftSemiApply.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftSemiApply.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftSemiApply.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftSemiApply.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftSemiApplyIn.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftSemiApplyIn.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftSemiApplyIn.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftSemiApplyIn.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftSemiCorrelatedApply.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftSemiCorrelatedApply.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftSemiCorrelatedApply.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftSemiCorrelatedApply.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftSemiCorrelatedApplyIn.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftSemiCorrelatedApplyIn.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftSemiCorrelatedApplyIn.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftSemiCorrelatedApplyIn.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftSemiJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftSemiJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftSemiJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLeftSemiJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLimit.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLimit.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalLimit.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalLimit.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalMaxOneRow.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalMaxOneRow.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalMaxOneRow.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalMaxOneRow.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalNAryJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalNAryJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalNAryJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalNAryJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalProject.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalProject.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalProject.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalProject.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalRightOuterJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalRightOuterJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalRightOuterJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalRightOuterJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalSelect.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalSelect.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalSelect.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalSelect.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalSequence.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalSequence.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalSequence.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalSequence.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalSequenceProject.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalSequenceProject.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalSequenceProject.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalSequenceProject.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalSetOp.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalSetOp.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalSetOp.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalSetOp.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalSplit.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalSplit.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalSplit.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalSplit.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalTVF.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalTVF.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalTVF.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalTVF.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalUnary.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalUnary.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalUnary.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalUnary.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalUnion.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalUnion.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalUnion.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalUnion.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalUnionAll.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalUnionAll.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalUnionAll.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalUnionAll.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalUpdate.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalUpdate.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CLogicalUpdate.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CLogicalUpdate.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CNormalizer.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CNormalizer.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CNormalizer.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CNormalizer.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/COperator.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/COperator.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/COperator.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/COperator.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/COrderedAggPreprocessor.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/COrderedAggPreprocessor.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/COrderedAggPreprocessor.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/COrderedAggPreprocessor.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPattern.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPattern.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPattern.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPattern.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysical.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysical.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysical.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysical.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalAgg.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalAgg.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalAgg.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalAgg.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalAssert.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalAssert.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalAssert.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalAssert.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalBitmapTableScan.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalBitmapTableScan.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalBitmapTableScan.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalBitmapTableScan.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalCTEConsumer.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalCTEConsumer.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalCTEConsumer.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalCTEConsumer.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalCTEProducer.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalCTEProducer.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalCTEProducer.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalCTEProducer.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalComputeScalar.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalComputeScalar.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalComputeScalar.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalComputeScalar.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalConstTableGet.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalConstTableGet.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalConstTableGet.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalConstTableGet.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalDML.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalDML.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalDML.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalDML.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicBitmapTableScan.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalDynamicBitmapTableScan.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicBitmapTableScan.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalDynamicBitmapTableScan.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicForeignScan.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalDynamicForeignScan.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicForeignScan.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalDynamicForeignScan.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicIndexOnlyScan.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalDynamicIndexOnlyScan.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicIndexOnlyScan.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalDynamicIndexOnlyScan.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicIndexScan.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalDynamicIndexScan.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicIndexScan.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalDynamicIndexScan.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicScan.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalDynamicScan.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicScan.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalDynamicScan.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicTableScan.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalDynamicTableScan.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicTableScan.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalDynamicTableScan.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalFilter.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalFilter.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalFilter.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalFilter.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalForeignScan.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalForeignScan.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalForeignScan.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalForeignScan.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalFullHashJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalFullHashJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalFullHashJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalFullHashJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalFullMergeJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalFullMergeJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalFullMergeJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalFullMergeJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalHashAgg.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalHashAgg.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalHashAgg.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalHashAgg.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalHashAggDeduplicate.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalHashAggDeduplicate.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalHashAggDeduplicate.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalHashAggDeduplicate.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalHashJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalHashJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalHashJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalHashJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalIndexOnlyScan.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalIndexOnlyScan.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalIndexOnlyScan.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalIndexOnlyScan.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalIndexScan.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalIndexScan.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalIndexScan.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalIndexScan.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalInnerHashJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalInnerHashJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalInnerHashJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalInnerHashJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalInnerIndexNLJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalInnerIndexNLJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalInnerIndexNLJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalInnerIndexNLJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalInnerNLJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalInnerNLJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalInnerNLJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalInnerNLJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiHashJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiHashJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiHashJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiHashJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiHashJoinNotIn.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiHashJoinNotIn.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiHashJoinNotIn.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiHashJoinNotIn.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiNLJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiNLJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiNLJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiNLJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalLeftOuterHashJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalLeftOuterHashJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalLeftOuterHashJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalLeftOuterHashJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalLeftOuterIndexNLJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalLeftOuterIndexNLJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalLeftOuterIndexNLJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalLeftOuterIndexNLJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalLeftOuterNLJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalLeftOuterNLJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalLeftOuterNLJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalLeftOuterNLJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalLeftSemiHashJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalLeftSemiHashJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalLeftSemiHashJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalLeftSemiHashJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalLeftSemiNLJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalLeftSemiNLJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalLeftSemiNLJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalLeftSemiNLJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalLimit.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalLimit.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalLimit.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalLimit.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalMotion.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalMotion.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalMotion.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalMotion.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalMotionBroadcast.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalMotionBroadcast.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalMotionBroadcast.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalMotionBroadcast.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalMotionGather.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalMotionGather.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalMotionGather.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalMotionGather.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalMotionHashDistribute.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalMotionHashDistribute.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalMotionHashDistribute.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalMotionHashDistribute.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalMotionRandom.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalMotionRandom.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalMotionRandom.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalMotionRandom.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalMotionRoutedDistribute.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalMotionRoutedDistribute.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalMotionRoutedDistribute.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalMotionRoutedDistribute.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalNLJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalNLJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalNLJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalNLJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalParallelUnionAll.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalParallelUnionAll.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalParallelUnionAll.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalParallelUnionAll.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalPartitionSelector.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalPartitionSelector.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalPartitionSelector.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalPartitionSelector.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalRightOuterHashJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalRightOuterHashJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalRightOuterHashJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalRightOuterHashJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalScalarAgg.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalScalarAgg.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalScalarAgg.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalScalarAgg.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalScan.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalScan.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalScan.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalScan.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalSequence.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalSequence.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalSequence.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalSequence.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalSequenceProject.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalSequenceProject.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalSequenceProject.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalSequenceProject.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalSerialUnionAll.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalSerialUnionAll.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalSerialUnionAll.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalSerialUnionAll.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalSort.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalSort.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalSort.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalSort.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalSplit.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalSplit.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalSplit.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalSplit.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalSpool.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalSpool.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalSpool.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalSpool.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalStreamAgg.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalStreamAgg.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalStreamAgg.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalStreamAgg.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalStreamAggDeduplicate.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalStreamAggDeduplicate.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalStreamAggDeduplicate.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalStreamAggDeduplicate.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalTVF.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalTVF.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalTVF.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalTVF.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalTableScan.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalTableScan.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalTableScan.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalTableScan.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalUnionAll.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalUnionAll.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalUnionAll.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalUnionAll.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalUnionAllFactory.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalUnionAllFactory.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPhysicalUnionAllFactory.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPhysicalUnionAllFactory.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CPredicateUtils.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPredicateUtils.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CPredicateUtils.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CPredicateUtils.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalar.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalar.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalar.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalar.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarAggFunc.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarAggFunc.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarAggFunc.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarAggFunc.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarArray.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarArray.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarArray.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarArray.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarArrayCmp.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarArrayCmp.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarArrayCmp.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarArrayCmp.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarArrayCoerceExpr.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarArrayCoerceExpr.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarArrayCoerceExpr.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarArrayCoerceExpr.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarArrayRef.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarArrayRef.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarArrayRef.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarArrayRef.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarArrayRefIndexList.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarArrayRefIndexList.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarArrayRefIndexList.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarArrayRefIndexList.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarAssertConstraint.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarAssertConstraint.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarAssertConstraint.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarAssertConstraint.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarAssertConstraintList.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarAssertConstraintList.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarAssertConstraintList.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarAssertConstraintList.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarBitmapBoolOp.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarBitmapBoolOp.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarBitmapBoolOp.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarBitmapBoolOp.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarBitmapIndexProbe.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarBitmapIndexProbe.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarBitmapIndexProbe.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarBitmapIndexProbe.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarBoolOp.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarBoolOp.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarBoolOp.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarBoolOp.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarBooleanTest.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarBooleanTest.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarBooleanTest.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarBooleanTest.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarCaseTest.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarCaseTest.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarCaseTest.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarCaseTest.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarCast.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarCast.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarCast.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarCast.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarCmp.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarCmp.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarCmp.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarCmp.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarCoalesce.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarCoalesce.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarCoalesce.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarCoalesce.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarCoerceBase.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarCoerceBase.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarCoerceBase.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarCoerceBase.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarCoerceToDomain.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarCoerceToDomain.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarCoerceToDomain.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarCoerceToDomain.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarCoerceViaIO.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarCoerceViaIO.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarCoerceViaIO.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarCoerceViaIO.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarConst.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarConst.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarConst.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarConst.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarDMLAction.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarDMLAction.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarDMLAction.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarDMLAction.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarFieldSelect.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarFieldSelect.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarFieldSelect.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarFieldSelect.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarFunc.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarFunc.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarFunc.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarFunc.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarIdent.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarIdent.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarIdent.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarIdent.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarIf.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarIf.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarIf.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarIf.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarIsDistinctFrom.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarIsDistinctFrom.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarIsDistinctFrom.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarIsDistinctFrom.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarMinMax.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarMinMax.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarMinMax.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarMinMax.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarNAryJoinPredList.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarNAryJoinPredList.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarNAryJoinPredList.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarNAryJoinPredList.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarNullIf.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarNullIf.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarNullIf.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarNullIf.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarNullTest.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarNullTest.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarNullTest.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarNullTest.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarOp.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarOp.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarOp.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarOp.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarParam.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarParam.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarParam.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarParam.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarProjectElement.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarProjectElement.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarProjectElement.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarProjectElement.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarProjectList.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarProjectList.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarProjectList.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarProjectList.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarSortGroupClause.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarSortGroupClause.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarSortGroupClause.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarSortGroupClause.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarSubquery.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarSubquery.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarSubquery.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarSubquery.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarSubqueryAll.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarSubqueryAll.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarSubqueryAll.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarSubqueryAll.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarSubqueryAny.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarSubqueryAny.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarSubqueryAny.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarSubqueryAny.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarSubqueryExistential.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarSubqueryExistential.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarSubqueryExistential.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarSubqueryExistential.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarSubqueryQuantified.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarSubqueryQuantified.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarSubqueryQuantified.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarSubqueryQuantified.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarSwitch.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarSwitch.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarSwitch.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarSwitch.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarSwitchCase.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarSwitchCase.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarSwitchCase.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarSwitchCase.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarValuesList.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarValuesList.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarValuesList.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarValuesList.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarWindowFunc.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarWindowFunc.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CScalarWindowFunc.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CScalarWindowFunc.cpp diff --git a/src/backend/gporca/libgpopt/src/operators/CStrictHashedDistributions.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/operators/CStrictHashedDistributions.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/operators/CStrictHashedDistributions.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/operators/CStrictHashedDistributions.cpp diff --git a/src/backend/gporca/libgpopt/src/optimizer/COptimizer.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/optimizer/COptimizer.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/optimizer/COptimizer.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/optimizer/COptimizer.cpp diff --git a/src/backend/gporca/libgpopt/src/optimizer/COptimizerConfig.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/optimizer/COptimizerConfig.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/optimizer/COptimizerConfig.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/optimizer/COptimizerConfig.cpp diff --git a/src/backend/gporca/libgpopt/src/search/CBinding.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/search/CBinding.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/search/CBinding.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/search/CBinding.cpp diff --git a/src/backend/gporca/libgpopt/src/search/CGroup.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/search/CGroup.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/search/CGroup.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/search/CGroup.cpp diff --git a/src/backend/gporca/libgpopt/src/search/CGroupExpression.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/search/CGroupExpression.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/search/CGroupExpression.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/search/CGroupExpression.cpp diff --git a/src/backend/gporca/libgpopt/src/search/CGroupProxy.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/search/CGroupProxy.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/search/CGroupProxy.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/search/CGroupProxy.cpp diff --git a/src/backend/gporca/libgpopt/src/search/CJob.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/search/CJob.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/search/CJob.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/search/CJob.cpp diff --git a/src/backend/gporca/libgpopt/src/search/CJobFactory.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/search/CJobFactory.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/search/CJobFactory.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/search/CJobFactory.cpp diff --git a/src/backend/gporca/libgpopt/src/search/CJobGroup.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/search/CJobGroup.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/search/CJobGroup.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/search/CJobGroup.cpp diff --git a/src/backend/gporca/libgpopt/src/search/CJobGroupExploration.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/search/CJobGroupExploration.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/search/CJobGroupExploration.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/search/CJobGroupExploration.cpp diff --git a/src/backend/gporca/libgpopt/src/search/CJobGroupExpression.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/search/CJobGroupExpression.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/search/CJobGroupExpression.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/search/CJobGroupExpression.cpp diff --git a/src/backend/gporca/libgpopt/src/search/CJobGroupExpressionExploration.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/search/CJobGroupExpressionExploration.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/search/CJobGroupExpressionExploration.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/search/CJobGroupExpressionExploration.cpp diff --git a/src/backend/gporca/libgpopt/src/search/CJobGroupExpressionImplementation.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/search/CJobGroupExpressionImplementation.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/search/CJobGroupExpressionImplementation.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/search/CJobGroupExpressionImplementation.cpp diff --git a/src/backend/gporca/libgpopt/src/search/CJobGroupExpressionOptimization.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/search/CJobGroupExpressionOptimization.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/search/CJobGroupExpressionOptimization.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/search/CJobGroupExpressionOptimization.cpp diff --git a/src/backend/gporca/libgpopt/src/search/CJobGroupImplementation.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/search/CJobGroupImplementation.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/search/CJobGroupImplementation.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/search/CJobGroupImplementation.cpp diff --git a/src/backend/gporca/libgpopt/src/search/CJobGroupOptimization.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/search/CJobGroupOptimization.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/search/CJobGroupOptimization.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/search/CJobGroupOptimization.cpp diff --git a/src/backend/gporca/libgpopt/src/search/CJobQueue.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/search/CJobQueue.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/search/CJobQueue.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/search/CJobQueue.cpp diff --git a/src/backend/gporca/libgpopt/src/search/CJobTest.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/search/CJobTest.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/search/CJobTest.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/search/CJobTest.cpp diff --git a/src/backend/gporca/libgpopt/src/search/CJobTransformation.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/search/CJobTransformation.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/search/CJobTransformation.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/search/CJobTransformation.cpp diff --git a/src/backend/gporca/libgpopt/src/search/CMemo.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/search/CMemo.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/search/CMemo.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/search/CMemo.cpp diff --git a/src/backend/gporca/libgpopt/src/search/CScheduler.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/search/CScheduler.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/search/CScheduler.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/search/CScheduler.cpp diff --git a/src/backend/gporca/libgpopt/src/search/CSchedulerContext.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/search/CSchedulerContext.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/search/CSchedulerContext.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/search/CSchedulerContext.cpp diff --git a/src/backend/gporca/libgpopt/src/search/CSearchStage.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/search/CSearchStage.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/search/CSearchStage.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/search/CSearchStage.cpp diff --git a/src/backend/gporca/libgpopt/src/translate/CTranslatorDXLToExpr.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/translate/CTranslatorDXLToExpr.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/translate/CTranslatorDXLToExpr.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/translate/CTranslatorDXLToExpr.cpp diff --git a/src/backend/gporca/libgpopt/src/translate/CTranslatorDXLToExprUtils.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/translate/CTranslatorDXLToExprUtils.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/translate/CTranslatorDXLToExprUtils.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/translate/CTranslatorDXLToExprUtils.cpp diff --git a/src/backend/gporca/libgpopt/src/translate/CTranslatorExprToDXL.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/translate/CTranslatorExprToDXL.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/translate/CTranslatorExprToDXL.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/translate/CTranslatorExprToDXL.cpp diff --git a/src/backend/gporca/libgpopt/src/translate/CTranslatorExprToDXLUtils.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/translate/CTranslatorExprToDXLUtils.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/translate/CTranslatorExprToDXLUtils.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/translate/CTranslatorExprToDXLUtils.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CDecorrelator.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CDecorrelator.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CDecorrelator.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CDecorrelator.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CJoinOrder.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CJoinOrder.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CJoinOrder.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CJoinOrder.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CJoinOrderDP.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CJoinOrderDP.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CJoinOrderDP.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CJoinOrderDP.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CJoinOrderDPv2.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CJoinOrderDPv2.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CJoinOrderDPv2.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CJoinOrderDPv2.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CJoinOrderGreedy.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CJoinOrderGreedy.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CJoinOrderGreedy.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CJoinOrderGreedy.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CJoinOrderMinCard.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CJoinOrderMinCard.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CJoinOrderMinCard.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CJoinOrderMinCard.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CSubqueryHandler.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CSubqueryHandler.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CSubqueryHandler.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CSubqueryHandler.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXform.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXform.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXform.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXform.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformCTEAnchor2Sequence.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformCTEAnchor2Sequence.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformCTEAnchor2Sequence.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformCTEAnchor2Sequence.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformCTEAnchor2TrivialSelect.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformCTEAnchor2TrivialSelect.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformCTEAnchor2TrivialSelect.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformCTEAnchor2TrivialSelect.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformCollapseGbAgg.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformCollapseGbAgg.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformCollapseGbAgg.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformCollapseGbAgg.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformCollapseProject.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformCollapseProject.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformCollapseProject.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformCollapseProject.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformDelete2DML.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformDelete2DML.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformDelete2DML.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformDelete2DML.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformDifference2LeftAntiSemiJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformDifference2LeftAntiSemiJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformDifference2LeftAntiSemiJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformDifference2LeftAntiSemiJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformDifferenceAll2LeftAntiSemiJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformDifferenceAll2LeftAntiSemiJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformDifferenceAll2LeftAntiSemiJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformDifferenceAll2LeftAntiSemiJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformDynamicForeignGet2DynamicForeignScan.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformDynamicForeignGet2DynamicForeignScan.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformDynamicForeignGet2DynamicForeignScan.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformDynamicForeignGet2DynamicForeignScan.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformDynamicGet2DynamicTableScan.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformDynamicGet2DynamicTableScan.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformDynamicGet2DynamicTableScan.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformDynamicGet2DynamicTableScan.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformDynamicIndexGet2DynamicIndexScan.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformDynamicIndexGet2DynamicIndexScan.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformDynamicIndexGet2DynamicIndexScan.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformDynamicIndexGet2DynamicIndexScan.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformDynamicIndexOnlyGet2DynamicIndexOnlyScan.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformDynamicIndexOnlyGet2DynamicIndexOnlyScan.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformDynamicIndexOnlyGet2DynamicIndexOnlyScan.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformDynamicIndexOnlyGet2DynamicIndexOnlyScan.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformEagerAgg.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformEagerAgg.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformEagerAgg.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformEagerAgg.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformExpandDynamicGetWithForeignPartitions.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformExpandDynamicGetWithForeignPartitions.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformExpandDynamicGetWithForeignPartitions.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformExpandDynamicGetWithForeignPartitions.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformExpandFullOuterJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformExpandFullOuterJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformExpandFullOuterJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformExpandFullOuterJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformExpandNAryJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformExpandNAryJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformExpandNAryJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformExpandNAryJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformExpandNAryJoinDP.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformExpandNAryJoinDP.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformExpandNAryJoinDP.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformExpandNAryJoinDP.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformExpandNAryJoinDPv2.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformExpandNAryJoinDPv2.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformExpandNAryJoinDPv2.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformExpandNAryJoinDPv2.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformExpandNAryJoinGreedy.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformExpandNAryJoinGreedy.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformExpandNAryJoinGreedy.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformExpandNAryJoinGreedy.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformExpandNAryJoinMinCard.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformExpandNAryJoinMinCard.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformExpandNAryJoinMinCard.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformExpandNAryJoinMinCard.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformExploration.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformExploration.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformExploration.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformExploration.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformFactory.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformFactory.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformFactory.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformFactory.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformForeignGet2ForeignScan.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformForeignGet2ForeignScan.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformForeignGet2ForeignScan.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformForeignGet2ForeignScan.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformFullJoinCommutativity.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformFullJoinCommutativity.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformFullJoinCommutativity.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformFullJoinCommutativity.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformFullOuterJoin2HashJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformFullOuterJoin2HashJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformFullOuterJoin2HashJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformFullOuterJoin2HashJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2Apply.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformGbAgg2Apply.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2Apply.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformGbAgg2Apply.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2HashAgg.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformGbAgg2HashAgg.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2HashAgg.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformGbAgg2HashAgg.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2ScalarAgg.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformGbAgg2ScalarAgg.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2ScalarAgg.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformGbAgg2ScalarAgg.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2StreamAgg.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformGbAgg2StreamAgg.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2StreamAgg.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformGbAgg2StreamAgg.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformGbAggDedup2HashAggDedup.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformGbAggDedup2HashAggDedup.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformGbAggDedup2HashAggDedup.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformGbAggDedup2HashAggDedup.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformGbAggDedup2StreamAggDedup.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformGbAggDedup2StreamAggDedup.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformGbAggDedup2StreamAggDedup.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformGbAggDedup2StreamAggDedup.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformGbAggWithMDQA2Join.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformGbAggWithMDQA2Join.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformGbAggWithMDQA2Join.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformGbAggWithMDQA2Join.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformGet2TableScan.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformGet2TableScan.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformGet2TableScan.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformGet2TableScan.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementAssert.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementAssert.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementAssert.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementAssert.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementBitmapTableGet.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementBitmapTableGet.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementBitmapTableGet.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementBitmapTableGet.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementCTEConsumer.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementCTEConsumer.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementCTEConsumer.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementCTEConsumer.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementCTEProducer.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementCTEProducer.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementCTEProducer.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementCTEProducer.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementConstTableGet.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementConstTableGet.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementConstTableGet.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementConstTableGet.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementDML.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementDML.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementDML.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementDML.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementDynamicBitmapTableGet.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementDynamicBitmapTableGet.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementDynamicBitmapTableGet.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementDynamicBitmapTableGet.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementFullOuterMergeJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementFullOuterMergeJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementFullOuterMergeJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementFullOuterMergeJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementInnerJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementInnerJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementInnerJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementInnerJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementLimit.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementLimit.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementLimit.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementLimit.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementSequence.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementSequence.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementSequence.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementSequence.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementSequenceProject.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementSequenceProject.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementSequenceProject.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementSequenceProject.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementSplit.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementSplit.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementSplit.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementSplit.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementTVF.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementTVF.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementTVF.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementTVF.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementTVFNoArgs.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementTVFNoArgs.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementTVFNoArgs.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementTVFNoArgs.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementUnionAll.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementUnionAll.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementUnionAll.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementUnionAll.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementation.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementation.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementation.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformImplementation.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformIndexGet2IndexScan.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformIndexGet2IndexScan.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformIndexGet2IndexScan.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformIndexGet2IndexScan.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformIndexOnlyGet2IndexOnlyScan.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformIndexOnlyGet2IndexOnlyScan.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformIndexOnlyGet2IndexOnlyScan.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformIndexOnlyGet2IndexOnlyScan.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformInlineCTEConsumer.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformInlineCTEConsumer.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformInlineCTEConsumer.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformInlineCTEConsumer.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformInlineCTEConsumerUnderSelect.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformInlineCTEConsumerUnderSelect.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformInlineCTEConsumerUnderSelect.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformInlineCTEConsumerUnderSelect.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformInnerApply2InnerJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformInnerApply2InnerJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformInnerApply2InnerJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformInnerApply2InnerJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformInnerApply2InnerJoinNoCorrelations.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformInnerApply2InnerJoinNoCorrelations.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformInnerApply2InnerJoinNoCorrelations.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformInnerApply2InnerJoinNoCorrelations.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformInnerApplyWithOuterKey2InnerJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformInnerApplyWithOuterKey2InnerJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformInnerApplyWithOuterKey2InnerJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformInnerApplyWithOuterKey2InnerJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformInnerJoinCommutativity.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformInnerJoinCommutativity.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformInnerJoinCommutativity.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformInnerJoinCommutativity.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformInsert2DML.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformInsert2DML.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformInsert2DML.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformInsert2DML.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformIntersect2Join.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformIntersect2Join.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformIntersect2Join.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformIntersect2Join.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformIntersectAll2LeftSemiJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformIntersectAll2LeftSemiJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformIntersectAll2LeftSemiJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformIntersectAll2LeftSemiJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformJoin2IndexApply.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformJoin2IndexApply.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformJoin2IndexApply.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformJoin2IndexApply.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformJoin2IndexApplyGeneric.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformJoin2IndexApplyGeneric.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformJoin2IndexApplyGeneric.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformJoin2IndexApplyGeneric.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformJoinAssociativity.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformJoinAssociativity.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformJoinAssociativity.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformJoinAssociativity.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoinNoCorrelations.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoinNoCorrelations.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoinNoCorrelations.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoinNoCorrelations.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotIn.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotIn.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotIn.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotIn.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotInNoCorrelations.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotInNoCorrelations.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotInNoCorrelations.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotInNoCorrelations.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2CrossProduct.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2CrossProduct.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2CrossProduct.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2CrossProduct.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2HashJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2HashJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2HashJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2HashJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2NLJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2NLJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2NLJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2NLJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoinNotIn2HashJoinNotIn.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoinNotIn2HashJoinNotIn.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoinNotIn2HashJoinNotIn.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoinNotIn2HashJoinNotIn.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoinNotIn2NLJoinNotIn.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoinNotIn2NLJoinNotIn.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoinNotIn2NLJoinNotIn.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoinNotIn2NLJoinNotIn.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftJoin2RightJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftJoin2RightJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftJoin2RightJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftJoin2RightJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftOuter2InnerUnionAllLeftAntiSemiJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftOuter2InnerUnionAllLeftAntiSemiJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftOuter2InnerUnionAllLeftAntiSemiJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftOuter2InnerUnionAllLeftAntiSemiJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftOuterApply2LeftOuterJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftOuterApply2LeftOuterJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftOuterApply2LeftOuterJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftOuterApply2LeftOuterJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftOuterApply2LeftOuterJoinNoCorrelations.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftOuterApply2LeftOuterJoinNoCorrelations.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftOuterApply2LeftOuterJoinNoCorrelations.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftOuterApply2LeftOuterJoinNoCorrelations.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftOuterJoin2HashJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftOuterJoin2HashJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftOuterJoin2HashJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftOuterJoin2HashJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftOuterJoin2NLJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftOuterJoin2NLJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftOuterJoin2NLJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftOuterJoin2NLJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiApply2LeftSemiJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftSemiApply2LeftSemiJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiApply2LeftSemiJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftSemiApply2LeftSemiJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiApply2LeftSemiJoinNoCorrelations.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftSemiApply2LeftSemiJoinNoCorrelations.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiApply2LeftSemiJoinNoCorrelations.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftSemiApply2LeftSemiJoinNoCorrelations.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiApplyWithExternalCorrs2InnerJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftSemiApplyWithExternalCorrs2InnerJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiApplyWithExternalCorrs2InnerJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftSemiApplyWithExternalCorrs2InnerJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2CrossProduct.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2CrossProduct.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2CrossProduct.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2CrossProduct.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2HashJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2HashJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2HashJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2HashJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2InnerJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2InnerJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2InnerJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2InnerJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2InnerJoinUnderGb.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2InnerJoinUnderGb.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2InnerJoinUnderGb.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2InnerJoinUnderGb.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2NLJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2NLJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2NLJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2NLJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLimit2IndexGet.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLimit2IndexGet.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformLimit2IndexGet.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformLimit2IndexGet.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformMaxOneRow2Assert.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformMaxOneRow2Assert.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformMaxOneRow2Assert.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformMaxOneRow2Assert.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformMinMax2IndexGet.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformMinMax2IndexGet.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformMinMax2IndexGet.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformMinMax2IndexGet.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformProject2Apply.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformProject2Apply.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformProject2Apply.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformProject2Apply.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformProject2ComputeScalar.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformProject2ComputeScalar.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformProject2ComputeScalar.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformProject2ComputeScalar.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformPushDownLeftOuterJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformPushDownLeftOuterJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformPushDownLeftOuterJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformPushDownLeftOuterJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformPushGbBelowJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformPushGbBelowJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformPushGbBelowJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformPushGbBelowJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformPushGbDedupBelowJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformPushGbDedupBelowJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformPushGbDedupBelowJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformPushGbDedupBelowJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformPushGbWithHavingBelowJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformPushGbWithHavingBelowJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformPushGbWithHavingBelowJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformPushGbWithHavingBelowJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformPushJoinBelowUnionAll.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformPushJoinBelowUnionAll.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformPushJoinBelowUnionAll.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformPushJoinBelowUnionAll.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformRemoveSubqDistinct.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformRemoveSubqDistinct.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformRemoveSubqDistinct.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformRemoveSubqDistinct.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformResult.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformResult.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformResult.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformResult.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformRightOuterJoin2HashJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformRightOuterJoin2HashJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformRightOuterJoin2HashJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformRightOuterJoin2HashJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSelect2Apply.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSelect2Apply.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformSelect2Apply.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSelect2Apply.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSelect2BitmapBoolOp.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSelect2BitmapBoolOp.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformSelect2BitmapBoolOp.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSelect2BitmapBoolOp.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSelect2DynamicIndexGet.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSelect2DynamicIndexGet.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformSelect2DynamicIndexGet.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSelect2DynamicIndexGet.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSelect2DynamicIndexOnlyGet.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSelect2DynamicIndexOnlyGet.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformSelect2DynamicIndexOnlyGet.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSelect2DynamicIndexOnlyGet.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSelect2Filter.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSelect2Filter.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformSelect2Filter.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSelect2Filter.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSelect2IndexGet.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSelect2IndexGet.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformSelect2IndexGet.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSelect2IndexGet.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSelect2IndexOnlyGet.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSelect2IndexOnlyGet.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformSelect2IndexOnlyGet.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSelect2IndexOnlyGet.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSequenceProject2Apply.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSequenceProject2Apply.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformSequenceProject2Apply.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSequenceProject2Apply.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSimplifyGbAgg.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSimplifyGbAgg.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformSimplifyGbAgg.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSimplifyGbAgg.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSimplifyLeftOuterJoin.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSimplifyLeftOuterJoin.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformSimplifyLeftOuterJoin.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSimplifyLeftOuterJoin.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSimplifySubquery.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSimplifySubquery.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformSimplifySubquery.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSimplifySubquery.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSplitDQA.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSplitDQA.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformSplitDQA.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSplitDQA.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSplitGbAgg.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSplitGbAgg.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformSplitGbAgg.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSplitGbAgg.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSplitGbAggDedup.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSplitGbAggDedup.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformSplitGbAggDedup.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSplitGbAggDedup.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSplitLimit.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSplitLimit.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformSplitLimit.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSplitLimit.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSubqJoin2Apply.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSubqJoin2Apply.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformSubqJoin2Apply.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSubqJoin2Apply.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSubqueryUnnest.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSubqueryUnnest.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformSubqueryUnnest.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformSubqueryUnnest.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformUnion2UnionAll.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformUnion2UnionAll.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformUnion2UnionAll.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformUnion2UnionAll.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformUnnestTVF.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformUnnestTVF.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformUnnestTVF.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformUnnestTVF.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformUpdate2DML.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformUpdate2DML.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformUpdate2DML.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformUpdate2DML.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformUtils.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformUtils.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CXformUtils.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CXformUtils.cpp diff --git a/src/backend/gporca/libgpopt/src/xforms/CxformSelect2DynamicBitmapBoolOp.cpp b/gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CxformSelect2DynamicBitmapBoolOp.cpp similarity index 100% rename from src/backend/gporca/libgpopt/src/xforms/CxformSelect2DynamicBitmapBoolOp.cpp rename to gpcontrib/gp_orca/gporca/libgpopt/src/xforms/CxformSelect2DynamicBitmapBoolOp.cpp diff --git a/src/backend/gporca/libgpos/CMakeLists.txt b/gpcontrib/gp_orca/gporca/libgpos/CMakeLists.txt similarity index 100% rename from src/backend/gporca/libgpos/CMakeLists.txt rename to gpcontrib/gp_orca/gporca/libgpos/CMakeLists.txt diff --git a/src/backend/gporca/libgpos/include/gpos/_api.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/_api.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/_api.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/_api.h diff --git a/src/backend/gporca/libgpos/include/gpos/assert.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/assert.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/assert.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/assert.h diff --git a/src/backend/gporca/libgpos/include/gpos/attributes.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/attributes.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/attributes.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/attributes.h diff --git a/src/backend/gporca/libgpos/include/gpos/base.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/base.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/base.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/base.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CAutoP.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CAutoP.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CAutoP.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CAutoP.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CAutoRef.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CAutoRef.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CAutoRef.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CAutoRef.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CAutoRg.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CAutoRg.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CAutoRg.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CAutoRg.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CAutoTimer.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CAutoTimer.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CAutoTimer.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CAutoTimer.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CBitSet.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CBitSet.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CBitSet.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CBitSet.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CBitSetIter.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CBitSetIter.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CBitSetIter.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CBitSetIter.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CBitVector.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CBitVector.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CBitVector.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CBitVector.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CDebugCounter.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CDebugCounter.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CDebugCounter.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CDebugCounter.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CDouble.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CDouble.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CDouble.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CDouble.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CDynamicPtrArray.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CDynamicPtrArray.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CDynamicPtrArray.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CDynamicPtrArray.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CEnumSet.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CEnumSet.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CEnumSet.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CEnumSet.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CEnumSetIter.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CEnumSetIter.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CEnumSetIter.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CEnumSetIter.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CHashMap.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CHashMap.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CHashMap.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CHashMap.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CHashMapIter.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CHashMapIter.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CHashMapIter.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CHashMapIter.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CHashSet.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CHashSet.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CHashSet.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CHashSet.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CHashSetIter.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CHashSetIter.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CHashSetIter.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CHashSetIter.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CHeapObject.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CHeapObject.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CHeapObject.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CHeapObject.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CLink.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CLink.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CLink.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CLink.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CList.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CList.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CList.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CList.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CMainArgs.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CMainArgs.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CMainArgs.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CMainArgs.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CPrintablePointer.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CPrintablePointer.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CPrintablePointer.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CPrintablePointer.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CRandom.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CRandom.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CRandom.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CRandom.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CRefCount.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CRefCount.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CRefCount.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CRefCount.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CStack.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CStack.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CStack.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CStack.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CStackDescriptor.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CStackDescriptor.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CStackDescriptor.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CStackDescriptor.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CStackObject.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CStackObject.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CStackObject.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CStackObject.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CSyncHashtable.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CSyncHashtable.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CSyncHashtable.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CSyncHashtable.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CSyncHashtableAccessByIter.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CSyncHashtableAccessByIter.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CSyncHashtableAccessByIter.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CSyncHashtableAccessByIter.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CSyncHashtableAccessByKey.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CSyncHashtableAccessByKey.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CSyncHashtableAccessByKey.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CSyncHashtableAccessByKey.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CSyncHashtableAccessorBase.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CSyncHashtableAccessorBase.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CSyncHashtableAccessorBase.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CSyncHashtableAccessorBase.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CSyncHashtableIter.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CSyncHashtableIter.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CSyncHashtableIter.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CSyncHashtableIter.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CSyncList.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CSyncList.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CSyncList.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CSyncList.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CSyncPool.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CSyncPool.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CSyncPool.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CSyncPool.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CTimerUser.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CTimerUser.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CTimerUser.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CTimerUser.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/CWallClock.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CWallClock.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/CWallClock.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/CWallClock.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/DbgPrintMixin.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/DbgPrintMixin.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/DbgPrintMixin.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/DbgPrintMixin.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/ITimer.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/ITimer.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/ITimer.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/ITimer.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/clibtypes.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/clibtypes.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/clibtypes.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/clibtypes.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/clibwrapper.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/clibwrapper.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/clibwrapper.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/clibwrapper.h diff --git a/src/backend/gporca/libgpos/include/gpos/common/syslibwrapper.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/syslibwrapper.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/common/syslibwrapper.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/common/syslibwrapper.h diff --git a/src/backend/gporca/libgpos/include/gpos/error/CAutoExceptionStack.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CAutoExceptionStack.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/error/CAutoExceptionStack.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CAutoExceptionStack.h diff --git a/src/backend/gporca/libgpos/include/gpos/error/CAutoTrace.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CAutoTrace.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/error/CAutoTrace.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CAutoTrace.h diff --git a/src/backend/gporca/libgpos/include/gpos/error/CErrorContext.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CErrorContext.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/error/CErrorContext.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CErrorContext.h diff --git a/src/backend/gporca/libgpos/include/gpos/error/CErrorHandler.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CErrorHandler.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/error/CErrorHandler.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CErrorHandler.h diff --git a/src/backend/gporca/libgpos/include/gpos/error/CErrorHandlerStandard.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CErrorHandlerStandard.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/error/CErrorHandlerStandard.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CErrorHandlerStandard.h diff --git a/src/backend/gporca/libgpos/include/gpos/error/CException.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CException.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/error/CException.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CException.h diff --git a/src/backend/gporca/libgpos/include/gpos/error/CLogger.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CLogger.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/error/CLogger.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CLogger.h diff --git a/src/backend/gporca/libgpos/include/gpos/error/CLoggerStream.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CLoggerStream.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/error/CLoggerStream.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CLoggerStream.h diff --git a/src/backend/gporca/libgpos/include/gpos/error/CLoggerSyslog.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CLoggerSyslog.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/error/CLoggerSyslog.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CLoggerSyslog.h diff --git a/src/backend/gporca/libgpos/include/gpos/error/CMessage.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CMessage.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/error/CMessage.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CMessage.h diff --git a/src/backend/gporca/libgpos/include/gpos/error/CMessageRepository.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CMessageRepository.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/error/CMessageRepository.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CMessageRepository.h diff --git a/src/backend/gporca/libgpos/include/gpos/error/CMessageTable.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CMessageTable.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/error/CMessageTable.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CMessageTable.h diff --git a/src/backend/gporca/libgpos/include/gpos/error/CMiniDumper.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CMiniDumper.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/error/CMiniDumper.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CMiniDumper.h diff --git a/src/backend/gporca/libgpos/include/gpos/error/CSerializable.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CSerializable.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/error/CSerializable.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/CSerializable.h diff --git a/src/backend/gporca/libgpos/include/gpos/error/IErrorContext.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/IErrorContext.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/error/IErrorContext.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/IErrorContext.h diff --git a/src/backend/gporca/libgpos/include/gpos/error/ILogger.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/ILogger.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/error/ILogger.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/error/ILogger.h diff --git a/src/backend/gporca/libgpos/include/gpos/io/CFileDescriptor.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/io/CFileDescriptor.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/io/CFileDescriptor.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/io/CFileDescriptor.h diff --git a/src/backend/gporca/libgpos/include/gpos/io/CFileReader.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/io/CFileReader.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/io/CFileReader.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/io/CFileReader.h diff --git a/src/backend/gporca/libgpos/include/gpos/io/CFileWriter.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/io/CFileWriter.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/io/CFileWriter.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/io/CFileWriter.h diff --git a/src/backend/gporca/libgpos/include/gpos/io/COstream.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/io/COstream.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/io/COstream.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/io/COstream.h diff --git a/src/backend/gporca/libgpos/include/gpos/io/COstreamBasic.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/io/COstreamBasic.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/io/COstreamBasic.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/io/COstreamBasic.h diff --git a/src/backend/gporca/libgpos/include/gpos/io/COstreamStdString.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/io/COstreamStdString.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/io/COstreamStdString.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/io/COstreamStdString.h diff --git a/src/backend/gporca/libgpos/include/gpos/io/COstreamString.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/io/COstreamString.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/io/COstreamString.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/io/COstreamString.h diff --git a/src/backend/gporca/libgpos/include/gpos/io/IOstream.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/io/IOstream.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/io/IOstream.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/io/IOstream.h diff --git a/src/backend/gporca/libgpos/include/gpos/io/iotypes.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/io/iotypes.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/io/iotypes.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/io/iotypes.h diff --git a/src/backend/gporca/libgpos/include/gpos/io/ioutils.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/io/ioutils.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/io/ioutils.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/io/ioutils.h diff --git a/src/backend/gporca/libgpos/include/gpos/memory/CAutoMemoryPool.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/CAutoMemoryPool.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/memory/CAutoMemoryPool.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/CAutoMemoryPool.h diff --git a/src/backend/gporca/libgpos/include/gpos/memory/CCache.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/CCache.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/memory/CCache.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/CCache.h diff --git a/src/backend/gporca/libgpos/include/gpos/memory/CCacheAccessor.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/CCacheAccessor.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/memory/CCacheAccessor.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/CCacheAccessor.h diff --git a/src/backend/gporca/libgpos/include/gpos/memory/CCacheEntry.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/CCacheEntry.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/memory/CCacheEntry.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/CCacheEntry.h diff --git a/src/backend/gporca/libgpos/include/gpos/memory/CCacheFactory.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/CCacheFactory.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/memory/CCacheFactory.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/CCacheFactory.h diff --git a/src/backend/gporca/libgpos/include/gpos/memory/CMemoryPool.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/CMemoryPool.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/memory/CMemoryPool.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/CMemoryPool.h diff --git a/src/backend/gporca/libgpos/include/gpos/memory/CMemoryPoolManager.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/CMemoryPoolManager.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/memory/CMemoryPoolManager.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/CMemoryPoolManager.h diff --git a/src/backend/gporca/libgpos/include/gpos/memory/CMemoryPoolStatistics.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/CMemoryPoolStatistics.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/memory/CMemoryPoolStatistics.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/CMemoryPoolStatistics.h diff --git a/src/backend/gporca/libgpos/include/gpos/memory/CMemoryPoolTracker.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/CMemoryPoolTracker.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/memory/CMemoryPoolTracker.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/CMemoryPoolTracker.h diff --git a/src/backend/gporca/libgpos/include/gpos/memory/CMemoryVisitorPrint.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/CMemoryVisitorPrint.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/memory/CMemoryVisitorPrint.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/CMemoryVisitorPrint.h diff --git a/src/backend/gporca/libgpos/include/gpos/memory/IMemoryVisitor.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/IMemoryVisitor.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/memory/IMemoryVisitor.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/IMemoryVisitor.h diff --git a/src/backend/gporca/libgpos/include/gpos/memory/MemoryPoolAllocator.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/MemoryPoolAllocator.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/memory/MemoryPoolAllocator.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/MemoryPoolAllocator.h diff --git a/src/backend/gporca/libgpos/include/gpos/memory/README.md b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/README.md similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/memory/README.md rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/README.md diff --git a/src/backend/gporca/libgpos/include/gpos/memory/deque.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/deque.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/memory/deque.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/deque.h diff --git a/src/backend/gporca/libgpos/include/gpos/memory/queue.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/queue.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/memory/queue.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/queue.h diff --git a/src/backend/gporca/libgpos/include/gpos/memory/stack.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/stack.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/memory/stack.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/memory/stack.h diff --git a/src/backend/gporca/libgpos/include/gpos/string/CStringStatic.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/string/CStringStatic.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/string/CStringStatic.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/string/CStringStatic.h diff --git a/src/backend/gporca/libgpos/include/gpos/string/CWString.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/string/CWString.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/string/CWString.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/string/CWString.h diff --git a/src/backend/gporca/libgpos/include/gpos/string/CWStringBase.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/string/CWStringBase.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/string/CWStringBase.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/string/CWStringBase.h diff --git a/src/backend/gporca/libgpos/include/gpos/string/CWStringConst.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/string/CWStringConst.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/string/CWStringConst.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/string/CWStringConst.h diff --git a/src/backend/gporca/libgpos/include/gpos/string/CWStringDynamic.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/string/CWStringDynamic.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/string/CWStringDynamic.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/string/CWStringDynamic.h diff --git a/src/backend/gporca/libgpos/include/gpos/string/CWStringStatic.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/string/CWStringStatic.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/string/CWStringStatic.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/string/CWStringStatic.h diff --git a/src/backend/gporca/libgpos/include/gpos/task/CAutoSuspendAbort.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/CAutoSuspendAbort.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/task/CAutoSuspendAbort.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/CAutoSuspendAbort.h diff --git a/src/backend/gporca/libgpos/include/gpos/task/CAutoTaskProxy.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/CAutoTaskProxy.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/task/CAutoTaskProxy.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/CAutoTaskProxy.h diff --git a/src/backend/gporca/libgpos/include/gpos/task/CAutoTraceFlag.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/CAutoTraceFlag.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/task/CAutoTraceFlag.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/CAutoTraceFlag.h diff --git a/src/backend/gporca/libgpos/include/gpos/task/CTask.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/CTask.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/task/CTask.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/CTask.h diff --git a/src/backend/gporca/libgpos/include/gpos/task/CTaskContext.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/CTaskContext.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/task/CTaskContext.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/CTaskContext.h diff --git a/src/backend/gporca/libgpos/include/gpos/task/CTaskId.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/CTaskId.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/task/CTaskId.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/CTaskId.h diff --git a/src/backend/gporca/libgpos/include/gpos/task/CTaskLocalStorage.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/CTaskLocalStorage.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/task/CTaskLocalStorage.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/CTaskLocalStorage.h diff --git a/src/backend/gporca/libgpos/include/gpos/task/CTaskLocalStorageObject.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/CTaskLocalStorageObject.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/task/CTaskLocalStorageObject.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/CTaskLocalStorageObject.h diff --git a/src/backend/gporca/libgpos/include/gpos/task/CTaskSchedulerFifo.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/CTaskSchedulerFifo.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/task/CTaskSchedulerFifo.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/CTaskSchedulerFifo.h diff --git a/src/backend/gporca/libgpos/include/gpos/task/CTraceFlagIter.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/CTraceFlagIter.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/task/CTraceFlagIter.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/CTraceFlagIter.h diff --git a/src/backend/gporca/libgpos/include/gpos/task/CWorker.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/CWorker.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/task/CWorker.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/CWorker.h diff --git a/src/backend/gporca/libgpos/include/gpos/task/CWorkerPoolManager.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/CWorkerPoolManager.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/task/CWorkerPoolManager.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/CWorkerPoolManager.h diff --git a/src/backend/gporca/libgpos/include/gpos/task/ITask.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/ITask.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/task/ITask.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/ITask.h diff --git a/src/backend/gporca/libgpos/include/gpos/task/ITaskScheduler.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/ITaskScheduler.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/task/ITaskScheduler.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/ITaskScheduler.h diff --git a/src/backend/gporca/libgpos/include/gpos/task/IWorker.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/IWorker.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/task/IWorker.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/IWorker.h diff --git a/src/backend/gporca/libgpos/include/gpos/task/traceflags.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/traceflags.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/task/traceflags.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/task/traceflags.h diff --git a/src/backend/gporca/libgpos/include/gpos/test/CUnittest.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/test/CUnittest.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/test/CUnittest.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/test/CUnittest.h diff --git a/src/backend/gporca/libgpos/include/gpos/types.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/types.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/types.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/types.h diff --git a/src/backend/gporca/libgpos/include/gpos/utils.h b/gpcontrib/gp_orca/gporca/libgpos/include/gpos/utils.h similarity index 100% rename from src/backend/gporca/libgpos/include/gpos/utils.h rename to gpcontrib/gp_orca/gporca/libgpos/include/gpos/utils.h diff --git a/src/backend/gporca/libgpos/server/CMakeLists.txt b/gpcontrib/gp_orca/gporca/libgpos/server/CMakeLists.txt similarity index 100% rename from src/backend/gporca/libgpos/server/CMakeLists.txt rename to gpcontrib/gp_orca/gporca/libgpos/server/CMakeLists.txt diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/common/CAutoPTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CAutoPTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/common/CAutoPTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CAutoPTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/common/CAutoRefTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CAutoRefTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/common/CAutoRefTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CAutoRefTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/common/CAutoRgTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CAutoRgTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/common/CAutoRgTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CAutoRgTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/common/CBitSetIterTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CBitSetIterTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/common/CBitSetIterTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CBitSetIterTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/common/CBitSetTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CBitSetTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/common/CBitSetTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CBitSetTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/common/CBitVectorTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CBitVectorTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/common/CBitVectorTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CBitVectorTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/common/CDoubleTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CDoubleTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/common/CDoubleTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CDoubleTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/common/CDynamicPtrArrayTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CDynamicPtrArrayTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/common/CDynamicPtrArrayTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CDynamicPtrArrayTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/common/CEnumSetTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CEnumSetTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/common/CEnumSetTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CEnumSetTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/common/CHashMapIterTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CHashMapIterTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/common/CHashMapIterTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CHashMapIterTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/common/CHashMapTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CHashMapTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/common/CHashMapTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CHashMapTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/common/CHashSetIterTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CHashSetIterTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/common/CHashSetIterTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CHashSetIterTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/common/CHashSetTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CHashSetTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/common/CHashSetTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CHashSetTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/common/CListTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CListTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/common/CListTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CListTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/common/CRefCountTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CRefCountTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/common/CRefCountTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CRefCountTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/common/CStackTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CStackTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/common/CStackTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CStackTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/common/CSyncHashtableTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CSyncHashtableTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/common/CSyncHashtableTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CSyncHashtableTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/common/CSyncListTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CSyncListTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/common/CSyncListTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/common/CSyncListTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/error/CErrorHandlerTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/error/CErrorHandlerTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/error/CErrorHandlerTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/error/CErrorHandlerTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/error/CExceptionTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/error/CExceptionTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/error/CExceptionTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/error/CExceptionTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/error/CLoggerTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/error/CLoggerTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/error/CLoggerTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/error/CLoggerTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/error/CMessageRepositoryTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/error/CMessageRepositoryTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/error/CMessageRepositoryTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/error/CMessageRepositoryTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/error/CMessageTableTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/error/CMessageTableTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/error/CMessageTableTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/error/CMessageTableTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/error/CMessageTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/error/CMessageTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/error/CMessageTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/error/CMessageTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/error/CMiniDumperTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/error/CMiniDumperTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/error/CMiniDumperTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/error/CMiniDumperTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/io/CFileTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/io/CFileTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/io/CFileTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/io/CFileTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/io/COstreamBasicTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/io/COstreamBasicTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/io/COstreamBasicTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/io/COstreamBasicTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/io/COstreamStringTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/io/COstreamStringTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/io/COstreamStringTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/io/COstreamStringTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/memory/CCacheTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/memory/CCacheTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/memory/CCacheTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/memory/CCacheTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/memory/CMemoryPoolBasicTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/memory/CMemoryPoolBasicTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/memory/CMemoryPoolBasicTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/memory/CMemoryPoolBasicTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/string/CStringTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/string/CStringTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/string/CStringTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/string/CStringTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/string/CWStringTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/string/CWStringTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/string/CWStringTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/string/CWStringTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/task/CTaskLocalStorageTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/task/CTaskLocalStorageTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/task/CTaskLocalStorageTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/task/CTaskLocalStorageTest.h diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/test/CUnittestTest.h b/gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/test/CUnittestTest.h similarity index 100% rename from src/backend/gporca/libgpos/server/include/unittest/gpos/test/CUnittestTest.h rename to gpcontrib/gp_orca/gporca/libgpos/server/include/unittest/gpos/test/CUnittestTest.h diff --git a/src/backend/gporca/libgpos/server/src/startup/main.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/startup/main.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/startup/main.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/startup/main.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/common/CAutoPTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CAutoPTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/common/CAutoPTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CAutoPTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/common/CAutoRefTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CAutoRefTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/common/CAutoRefTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CAutoRefTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/common/CAutoRgTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CAutoRgTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/common/CAutoRgTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CAutoRgTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/common/CBitSetIterTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CBitSetIterTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/common/CBitSetIterTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CBitSetIterTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/common/CBitSetTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CBitSetTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/common/CBitSetTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CBitSetTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/common/CBitVectorTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CBitVectorTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/common/CBitVectorTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CBitVectorTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/common/CDoubleTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CDoubleTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/common/CDoubleTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CDoubleTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/common/CDynamicPtrArrayTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CDynamicPtrArrayTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/common/CDynamicPtrArrayTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CDynamicPtrArrayTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/common/CEnumSetTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CEnumSetTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/common/CEnumSetTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CEnumSetTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/common/CHashMapIterTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CHashMapIterTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/common/CHashMapIterTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CHashMapIterTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/common/CHashMapTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CHashMapTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/common/CHashMapTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CHashMapTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/common/CHashSetIterTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CHashSetIterTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/common/CHashSetIterTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CHashSetIterTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/common/CHashSetTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CHashSetTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/common/CHashSetTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CHashSetTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/common/CListTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CListTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/common/CListTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CListTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/common/CRefCountTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CRefCountTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/common/CRefCountTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CRefCountTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/common/CStackTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CStackTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/common/CStackTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CStackTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/common/CSyncHashtableTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CSyncHashtableTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/common/CSyncHashtableTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CSyncHashtableTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/common/CSyncListTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CSyncListTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/common/CSyncListTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/common/CSyncListTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/error/CErrorHandlerTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/error/CErrorHandlerTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/error/CErrorHandlerTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/error/CErrorHandlerTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/error/CExceptionTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/error/CExceptionTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/error/CExceptionTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/error/CExceptionTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/error/CLoggerTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/error/CLoggerTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/error/CLoggerTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/error/CLoggerTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/error/CMessageRepositoryTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/error/CMessageRepositoryTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/error/CMessageRepositoryTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/error/CMessageRepositoryTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/error/CMessageTableTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/error/CMessageTableTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/error/CMessageTableTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/error/CMessageTableTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/error/CMessageTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/error/CMessageTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/error/CMessageTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/error/CMessageTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/error/CMiniDumperTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/error/CMiniDumperTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/error/CMiniDumperTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/error/CMiniDumperTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/io/CFileTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/io/CFileTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/io/CFileTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/io/CFileTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/io/COstreamBasicTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/io/COstreamBasicTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/io/COstreamBasicTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/io/COstreamBasicTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/io/COstreamStringTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/io/COstreamStringTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/io/COstreamStringTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/io/COstreamStringTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/memory/CCacheTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/memory/CCacheTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/memory/CCacheTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/memory/CCacheTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/memory/CMemoryPoolBasicTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/memory/CMemoryPoolBasicTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/memory/CMemoryPoolBasicTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/memory/CMemoryPoolBasicTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/string/CStringTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/string/CStringTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/string/CStringTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/string/CStringTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/string/CWStringTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/string/CWStringTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/string/CWStringTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/string/CWStringTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/task/CTaskLocalStorageTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/task/CTaskLocalStorageTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/task/CTaskLocalStorageTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/task/CTaskLocalStorageTest.cpp diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/test/CUnittestTest.cpp b/gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/test/CUnittestTest.cpp similarity index 100% rename from src/backend/gporca/libgpos/server/src/unittest/gpos/test/CUnittestTest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/server/src/unittest/gpos/test/CUnittestTest.cpp diff --git a/src/backend/gporca/libgpos/src/_api.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/_api.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/_api.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/_api.cpp diff --git a/src/backend/gporca/libgpos/src/common/CAutoTimer.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/common/CAutoTimer.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/common/CAutoTimer.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/common/CAutoTimer.cpp diff --git a/src/backend/gporca/libgpos/src/common/CBitSet.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/common/CBitSet.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/common/CBitSet.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/common/CBitSet.cpp diff --git a/src/backend/gporca/libgpos/src/common/CBitSetIter.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/common/CBitSetIter.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/common/CBitSetIter.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/common/CBitSetIter.cpp diff --git a/src/backend/gporca/libgpos/src/common/CBitVector.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/common/CBitVector.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/common/CBitVector.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/common/CBitVector.cpp diff --git a/src/backend/gporca/libgpos/src/common/CDebugCounter.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/common/CDebugCounter.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/common/CDebugCounter.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/common/CDebugCounter.cpp diff --git a/src/backend/gporca/libgpos/src/common/CHeapObject.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/common/CHeapObject.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/common/CHeapObject.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/common/CHeapObject.cpp diff --git a/src/backend/gporca/libgpos/src/common/CMainArgs.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/common/CMainArgs.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/common/CMainArgs.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/common/CMainArgs.cpp diff --git a/src/backend/gporca/libgpos/src/common/CRandom.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/common/CRandom.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/common/CRandom.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/common/CRandom.cpp diff --git a/src/backend/gporca/libgpos/src/common/CRefCount.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/common/CRefCount.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/common/CRefCount.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/common/CRefCount.cpp diff --git a/src/backend/gporca/libgpos/src/common/CStackDescriptor.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/common/CStackDescriptor.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/common/CStackDescriptor.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/common/CStackDescriptor.cpp diff --git a/src/backend/gporca/libgpos/src/common/CStackObject.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/common/CStackObject.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/common/CStackObject.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/common/CStackObject.cpp diff --git a/src/backend/gporca/libgpos/src/common/CTimerUser.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/common/CTimerUser.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/common/CTimerUser.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/common/CTimerUser.cpp diff --git a/src/backend/gporca/libgpos/src/common/CWallClock.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/common/CWallClock.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/common/CWallClock.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/common/CWallClock.cpp diff --git a/src/backend/gporca/libgpos/src/common/clibwrapper.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/common/clibwrapper.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/common/clibwrapper.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/common/clibwrapper.cpp diff --git a/src/backend/gporca/libgpos/src/common/syslibwrapper.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/common/syslibwrapper.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/common/syslibwrapper.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/common/syslibwrapper.cpp diff --git a/src/backend/gporca/libgpos/src/error/CAutoExceptionStack.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/error/CAutoExceptionStack.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/error/CAutoExceptionStack.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/error/CAutoExceptionStack.cpp diff --git a/src/backend/gporca/libgpos/src/error/CAutoTrace.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/error/CAutoTrace.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/error/CAutoTrace.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/error/CAutoTrace.cpp diff --git a/src/backend/gporca/libgpos/src/error/CErrorContext.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/error/CErrorContext.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/error/CErrorContext.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/error/CErrorContext.cpp diff --git a/src/backend/gporca/libgpos/src/error/CErrorHandlerStandard.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/error/CErrorHandlerStandard.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/error/CErrorHandlerStandard.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/error/CErrorHandlerStandard.cpp diff --git a/src/backend/gporca/libgpos/src/error/CException.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/error/CException.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/error/CException.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/error/CException.cpp diff --git a/src/backend/gporca/libgpos/src/error/CLogger.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/error/CLogger.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/error/CLogger.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/error/CLogger.cpp diff --git a/src/backend/gporca/libgpos/src/error/CLoggerStream.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/error/CLoggerStream.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/error/CLoggerStream.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/error/CLoggerStream.cpp diff --git a/src/backend/gporca/libgpos/src/error/CLoggerSyslog.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/error/CLoggerSyslog.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/error/CLoggerSyslog.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/error/CLoggerSyslog.cpp diff --git a/src/backend/gporca/libgpos/src/error/CMessage.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/error/CMessage.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/error/CMessage.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/error/CMessage.cpp diff --git a/src/backend/gporca/libgpos/src/error/CMessageRepository.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/error/CMessageRepository.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/error/CMessageRepository.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/error/CMessageRepository.cpp diff --git a/src/backend/gporca/libgpos/src/error/CMessageTable.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/error/CMessageTable.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/error/CMessageTable.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/error/CMessageTable.cpp diff --git a/src/backend/gporca/libgpos/src/error/CMiniDumper.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/error/CMiniDumper.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/error/CMiniDumper.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/error/CMiniDumper.cpp diff --git a/src/backend/gporca/libgpos/src/error/CSerializable.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/error/CSerializable.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/error/CSerializable.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/error/CSerializable.cpp diff --git a/src/backend/gporca/libgpos/src/error/ILogger.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/error/ILogger.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/error/ILogger.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/error/ILogger.cpp diff --git a/src/backend/gporca/libgpos/src/io/CFileDescriptor.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/io/CFileDescriptor.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/io/CFileDescriptor.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/io/CFileDescriptor.cpp diff --git a/src/backend/gporca/libgpos/src/io/CFileReader.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/io/CFileReader.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/io/CFileReader.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/io/CFileReader.cpp diff --git a/src/backend/gporca/libgpos/src/io/CFileWriter.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/io/CFileWriter.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/io/CFileWriter.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/io/CFileWriter.cpp diff --git a/src/backend/gporca/libgpos/src/io/COstream.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/io/COstream.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/io/COstream.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/io/COstream.cpp diff --git a/src/backend/gporca/libgpos/src/io/COstreamBasic.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/io/COstreamBasic.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/io/COstreamBasic.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/io/COstreamBasic.cpp diff --git a/src/backend/gporca/libgpos/src/io/COstreamStdString.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/io/COstreamStdString.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/io/COstreamStdString.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/io/COstreamStdString.cpp diff --git a/src/backend/gporca/libgpos/src/io/COstreamString.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/io/COstreamString.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/io/COstreamString.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/io/COstreamString.cpp diff --git a/src/backend/gporca/libgpos/src/io/ioutils.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/io/ioutils.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/io/ioutils.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/io/ioutils.cpp diff --git a/src/backend/gporca/libgpos/src/memory/CAutoMemoryPool.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/memory/CAutoMemoryPool.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/memory/CAutoMemoryPool.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/memory/CAutoMemoryPool.cpp diff --git a/src/backend/gporca/libgpos/src/memory/CCacheFactory.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/memory/CCacheFactory.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/memory/CCacheFactory.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/memory/CCacheFactory.cpp diff --git a/src/backend/gporca/libgpos/src/memory/CMemoryPool.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/memory/CMemoryPool.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/memory/CMemoryPool.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/memory/CMemoryPool.cpp diff --git a/src/backend/gporca/libgpos/src/memory/CMemoryPoolManager.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/memory/CMemoryPoolManager.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/memory/CMemoryPoolManager.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/memory/CMemoryPoolManager.cpp diff --git a/src/backend/gporca/libgpos/src/memory/CMemoryPoolTracker.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/memory/CMemoryPoolTracker.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/memory/CMemoryPoolTracker.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/memory/CMemoryPoolTracker.cpp diff --git a/src/backend/gporca/libgpos/src/memory/CMemoryVisitorPrint.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/memory/CMemoryVisitorPrint.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/memory/CMemoryVisitorPrint.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/memory/CMemoryVisitorPrint.cpp diff --git a/src/backend/gporca/libgpos/src/string/CStringStatic.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/string/CStringStatic.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/string/CStringStatic.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/string/CStringStatic.cpp diff --git a/src/backend/gporca/libgpos/src/string/CWString.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/string/CWString.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/string/CWString.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/string/CWString.cpp diff --git a/src/backend/gporca/libgpos/src/string/CWStringBase.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/string/CWStringBase.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/string/CWStringBase.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/string/CWStringBase.cpp diff --git a/src/backend/gporca/libgpos/src/string/CWStringConst.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/string/CWStringConst.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/string/CWStringConst.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/string/CWStringConst.cpp diff --git a/src/backend/gporca/libgpos/src/string/CWStringDynamic.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/string/CWStringDynamic.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/string/CWStringDynamic.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/string/CWStringDynamic.cpp diff --git a/src/backend/gporca/libgpos/src/string/CWStringStatic.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/string/CWStringStatic.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/string/CWStringStatic.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/string/CWStringStatic.cpp diff --git a/src/backend/gporca/libgpos/src/task/CAutoSuspendAbort.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/task/CAutoSuspendAbort.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/task/CAutoSuspendAbort.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/task/CAutoSuspendAbort.cpp diff --git a/src/backend/gporca/libgpos/src/task/CAutoTaskProxy.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/task/CAutoTaskProxy.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/task/CAutoTaskProxy.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/task/CAutoTaskProxy.cpp diff --git a/src/backend/gporca/libgpos/src/task/CAutoTraceFlag.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/task/CAutoTraceFlag.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/task/CAutoTraceFlag.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/task/CAutoTraceFlag.cpp diff --git a/src/backend/gporca/libgpos/src/task/CTask.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/task/CTask.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/task/CTask.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/task/CTask.cpp diff --git a/src/backend/gporca/libgpos/src/task/CTaskContext.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/task/CTaskContext.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/task/CTaskContext.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/task/CTaskContext.cpp diff --git a/src/backend/gporca/libgpos/src/task/CTaskLocalStorage.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/task/CTaskLocalStorage.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/task/CTaskLocalStorage.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/task/CTaskLocalStorage.cpp diff --git a/src/backend/gporca/libgpos/src/task/CTaskSchedulerFifo.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/task/CTaskSchedulerFifo.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/task/CTaskSchedulerFifo.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/task/CTaskSchedulerFifo.cpp diff --git a/src/backend/gporca/libgpos/src/task/CWorker.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/task/CWorker.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/task/CWorker.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/task/CWorker.cpp diff --git a/src/backend/gporca/libgpos/src/task/CWorkerPoolManager.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/task/CWorkerPoolManager.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/task/CWorkerPoolManager.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/task/CWorkerPoolManager.cpp diff --git a/src/backend/gporca/libgpos/src/task/ITask.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/task/ITask.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/task/ITask.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/task/ITask.cpp diff --git a/src/backend/gporca/libgpos/src/task/IWorker.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/task/IWorker.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/task/IWorker.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/task/IWorker.cpp diff --git a/src/backend/gporca/libgpos/src/test/CUnittest.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/test/CUnittest.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/test/CUnittest.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/test/CUnittest.cpp diff --git a/src/backend/gporca/libgpos/src/utils.cpp b/gpcontrib/gp_orca/gporca/libgpos/src/utils.cpp similarity index 100% rename from src/backend/gporca/libgpos/src/utils.cpp rename to gpcontrib/gp_orca/gporca/libgpos/src/utils.cpp diff --git a/src/backend/gporca/libnaucrates/CMakeLists.txt b/gpcontrib/gp_orca/gporca/libnaucrates/CMakeLists.txt similarity index 100% rename from src/backend/gporca/libnaucrates/CMakeLists.txt rename to gpcontrib/gp_orca/gporca/libnaucrates/CMakeLists.txt diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/CDatumBoolGPDB.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/CDatumBoolGPDB.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/base/CDatumBoolGPDB.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/CDatumBoolGPDB.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/CDatumGenericGPDB.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/CDatumGenericGPDB.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/base/CDatumGenericGPDB.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/CDatumGenericGPDB.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/CDatumInt2GPDB.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/CDatumInt2GPDB.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/base/CDatumInt2GPDB.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/CDatumInt2GPDB.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/CDatumInt4GPDB.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/CDatumInt4GPDB.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/base/CDatumInt4GPDB.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/CDatumInt4GPDB.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/CDatumInt8GPDB.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/CDatumInt8GPDB.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/base/CDatumInt8GPDB.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/CDatumInt8GPDB.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/CDatumOidGPDB.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/CDatumOidGPDB.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/base/CDatumOidGPDB.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/CDatumOidGPDB.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/CQueryToDXLResult.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/CQueryToDXLResult.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/base/CQueryToDXLResult.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/CQueryToDXLResult.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/IDatum.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/IDatum.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/base/IDatum.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/IDatum.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/IDatumBool.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/IDatumBool.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/base/IDatumBool.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/IDatumBool.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/IDatumGeneric.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/IDatumGeneric.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/base/IDatumGeneric.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/IDatumGeneric.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/IDatumInt2.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/IDatumInt2.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/base/IDatumInt2.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/IDatumInt2.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/IDatumInt4.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/IDatumInt4.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/base/IDatumInt4.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/IDatumInt4.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/IDatumInt8.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/IDatumInt8.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/base/IDatumInt8.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/IDatumInt8.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/IDatumOid.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/IDatumOid.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/base/IDatumOid.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/base/IDatumOid.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/CCostModelConfigSerializer.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/CCostModelConfigSerializer.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/CCostModelConfigSerializer.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/CCostModelConfigSerializer.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/CDXLUtils.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/CDXLUtils.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/CDXLUtils.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/CDXLUtils.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/CIdGenerator.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/CIdGenerator.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/CIdGenerator.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/CIdGenerator.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/errorcodes.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/errorcodes.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/errorcodes.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/errorcodes.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/gpdb_types.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/gpdb_types.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/gpdb_types.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/gpdb_types.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLColDescr.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLColDescr.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLColDescr.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLColDescr.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLColRef.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLColRef.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLColRef.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLColRef.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLCtasStorageOptions.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLCtasStorageOptions.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLCtasStorageOptions.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLCtasStorageOptions.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatum.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatum.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatum.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatum.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumBool.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumBool.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumBool.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumBool.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumGeneric.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumGeneric.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumGeneric.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumGeneric.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumInt2.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumInt2.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumInt2.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumInt2.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumInt4.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumInt4.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumInt4.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumInt4.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumInt8.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumInt8.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumInt8.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumInt8.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumOid.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumOid.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumOid.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumOid.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumStatsDoubleMappable.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumStatsDoubleMappable.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumStatsDoubleMappable.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumStatsDoubleMappable.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumStatsLintMappable.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumStatsLintMappable.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumStatsLintMappable.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumStatsLintMappable.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDirectDispatchInfo.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDirectDispatchInfo.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDirectDispatchInfo.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDirectDispatchInfo.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLIndexDescr.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLIndexDescr.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLIndexDescr.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLIndexDescr.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogical.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogical.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogical.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogical.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTAS.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTAS.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTAS.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTAS.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTEAnchor.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTEAnchor.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTEAnchor.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTEAnchor.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTEConsumer.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTEConsumer.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTEConsumer.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTEConsumer.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTEProducer.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTEProducer.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTEProducer.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTEProducer.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalConstTable.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalConstTable.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalConstTable.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalConstTable.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalDelete.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalDelete.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalDelete.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalDelete.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalForeignGet.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalForeignGet.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalForeignGet.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalForeignGet.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalGet.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalGet.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalGet.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalGet.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalGroupBy.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalGroupBy.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalGroupBy.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalGroupBy.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalInsert.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalInsert.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalInsert.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalInsert.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalJoin.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalJoin.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalJoin.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalJoin.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalLimit.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalLimit.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalLimit.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalLimit.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalProject.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalProject.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalProject.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalProject.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalSelect.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalSelect.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalSelect.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalSelect.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalSetOp.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalSetOp.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalSetOp.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalSetOp.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalTVF.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalTVF.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalTVF.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalTVF.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalUpdate.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalUpdate.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalUpdate.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalUpdate.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalWindow.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalWindow.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalWindow.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalWindow.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLNode.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLNode.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLNode.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLNode.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLOperator.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLOperator.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLOperator.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLOperator.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLOperatorCost.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLOperatorCost.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLOperatorCost.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLOperatorCost.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLOperatorFactory.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLOperatorFactory.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLOperatorFactory.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLOperatorFactory.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysical.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysical.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysical.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysical.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAbstractBitmapScan.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAbstractBitmapScan.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAbstractBitmapScan.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAbstractBitmapScan.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAgg.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAgg.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAgg.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAgg.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAppend.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAppend.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAppend.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAppend.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAssert.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAssert.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAssert.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAssert.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalBitmapTableScan.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalBitmapTableScan.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalBitmapTableScan.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalBitmapTableScan.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalBroadcastMotion.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalBroadcastMotion.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalBroadcastMotion.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalBroadcastMotion.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTAS.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTAS.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTAS.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTAS.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTEConsumer.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTEConsumer.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTEConsumer.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTEConsumer.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTEProducer.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTEProducer.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTEProducer.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTEProducer.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDML.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDML.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDML.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDML.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicBitmapTableScan.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicBitmapTableScan.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicBitmapTableScan.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicBitmapTableScan.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicForeignScan.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicForeignScan.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicForeignScan.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicForeignScan.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicIndexOnlyScan.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicIndexOnlyScan.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicIndexOnlyScan.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicIndexOnlyScan.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicIndexScan.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicIndexScan.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicIndexScan.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicIndexScan.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicTableScan.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicTableScan.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicTableScan.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicTableScan.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalForeignScan.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalForeignScan.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalForeignScan.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalForeignScan.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalGatherMotion.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalGatherMotion.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalGatherMotion.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalGatherMotion.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalHashJoin.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalHashJoin.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalHashJoin.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalHashJoin.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalIndexOnlyScan.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalIndexOnlyScan.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalIndexOnlyScan.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalIndexOnlyScan.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalIndexScan.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalIndexScan.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalIndexScan.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalIndexScan.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalJoin.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalJoin.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalJoin.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalJoin.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalLimit.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalLimit.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalLimit.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalLimit.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalMaterialize.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalMaterialize.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalMaterialize.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalMaterialize.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalMergeJoin.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalMergeJoin.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalMergeJoin.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalMergeJoin.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalMotion.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalMotion.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalMotion.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalMotion.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalNLJoin.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalNLJoin.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalNLJoin.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalNLJoin.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalPartitionSelector.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalPartitionSelector.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalPartitionSelector.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalPartitionSelector.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalProperties.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalProperties.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalProperties.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalProperties.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalRandomMotion.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalRandomMotion.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalRandomMotion.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalRandomMotion.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalRedistributeMotion.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalRedistributeMotion.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalRedistributeMotion.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalRedistributeMotion.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalResult.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalResult.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalResult.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalResult.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalRoutedDistributeMotion.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalRoutedDistributeMotion.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalRoutedDistributeMotion.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalRoutedDistributeMotion.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalSequence.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalSequence.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalSequence.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalSequence.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalSort.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalSort.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalSort.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalSort.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalSplit.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalSplit.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalSplit.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalSplit.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalTVF.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalTVF.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalTVF.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalTVF.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalTableScan.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalTableScan.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalTableScan.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalTableScan.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalValuesScan.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalValuesScan.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalValuesScan.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalValuesScan.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalWindow.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalWindow.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalWindow.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalWindow.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLProperties.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLProperties.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLProperties.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLProperties.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalar.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalar.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalar.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalar.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarAggref.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarAggref.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarAggref.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarAggref.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArray.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArray.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArray.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArray.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayCoerceExpr.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayCoerceExpr.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayCoerceExpr.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayCoerceExpr.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayComp.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayComp.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayComp.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayComp.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayRef.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayRef.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayRef.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayRef.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayRefIndexList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayRefIndexList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayRefIndexList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayRefIndexList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarAssertConstraint.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarAssertConstraint.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarAssertConstraint.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarAssertConstraint.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarAssertConstraintList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarAssertConstraintList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarAssertConstraintList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarAssertConstraintList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBitmapBoolOp.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBitmapBoolOp.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBitmapBoolOp.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBitmapBoolOp.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBitmapIndexProbe.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBitmapIndexProbe.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBitmapIndexProbe.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBitmapIndexProbe.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBoolExpr.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBoolExpr.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBoolExpr.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBoolExpr.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBooleanTest.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBooleanTest.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBooleanTest.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBooleanTest.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCaseTest.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCaseTest.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCaseTest.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCaseTest.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCast.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCast.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCast.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCast.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoalesce.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoalesce.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoalesce.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoalesce.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoerceBase.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoerceBase.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoerceBase.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoerceBase.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoerceToDomain.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoerceToDomain.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoerceToDomain.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoerceToDomain.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoerceViaIO.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoerceViaIO.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoerceViaIO.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoerceViaIO.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarComp.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarComp.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarComp.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarComp.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarConstValue.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarConstValue.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarConstValue.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarConstValue.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarDMLAction.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarDMLAction.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarDMLAction.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarDMLAction.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarDistinctComp.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarDistinctComp.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarDistinctComp.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarDistinctComp.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarFieldSelect.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarFieldSelect.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarFieldSelect.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarFieldSelect.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarFilter.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarFilter.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarFilter.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarFilter.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarFuncExpr.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarFuncExpr.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarFuncExpr.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarFuncExpr.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarHashCondList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarHashCondList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarHashCondList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarHashCondList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarHashExpr.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarHashExpr.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarHashExpr.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarHashExpr.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarHashExprList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarHashExprList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarHashExprList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarHashExprList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarIdent.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarIdent.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarIdent.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarIdent.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarIfStmt.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarIfStmt.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarIfStmt.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarIfStmt.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarIndexCondList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarIndexCondList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarIndexCondList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarIndexCondList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarJoinFilter.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarJoinFilter.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarJoinFilter.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarJoinFilter.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarLimitCount.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarLimitCount.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarLimitCount.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarLimitCount.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarLimitOffset.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarLimitOffset.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarLimitOffset.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarLimitOffset.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarMergeCondList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarMergeCondList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarMergeCondList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarMergeCondList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarMinMax.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarMinMax.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarMinMax.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarMinMax.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarNullIf.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarNullIf.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarNullIf.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarNullIf.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarNullTest.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarNullTest.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarNullTest.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarNullTest.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarOneTimeFilter.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarOneTimeFilter.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarOneTimeFilter.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarOneTimeFilter.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarOpExpr.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarOpExpr.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarOpExpr.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarOpExpr.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarOpList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarOpList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarOpList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarOpList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarParam.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarParam.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarParam.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarParam.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarProjElem.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarProjElem.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarProjElem.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarProjElem.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarProjList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarProjList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarProjList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarProjList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarRecheckCondFilter.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarRecheckCondFilter.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarRecheckCondFilter.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarRecheckCondFilter.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSortCol.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSortCol.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSortCol.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSortCol.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSortColList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSortColList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSortColList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSortColList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSortGroupClause.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSortGroupClause.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSortGroupClause.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSortGroupClause.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubPlan.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubPlan.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubPlan.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubPlan.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubquery.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubquery.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubquery.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubquery.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryAll.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryAll.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryAll.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryAll.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryAny.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryAny.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryAny.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryAny.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryExists.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryExists.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryExists.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryExists.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryNotExists.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryNotExists.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryNotExists.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryNotExists.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryQuantified.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryQuantified.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryQuantified.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryQuantified.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSwitch.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSwitch.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSwitch.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSwitch.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSwitchCase.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSwitchCase.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSwitchCase.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSwitchCase.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarValuesList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarValuesList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarValuesList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarValuesList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarWindowFrameEdge.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarWindowFrameEdge.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarWindowFrameEdge.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarWindowFrameEdge.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarWindowRef.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarWindowRef.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarWindowRef.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarWindowRef.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLSpoolInfo.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLSpoolInfo.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLSpoolInfo.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLSpoolInfo.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLTableDescr.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLTableDescr.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLTableDescr.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLTableDescr.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLWindowFrame.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLWindowFrame.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLWindowFrame.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLWindowFrame.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLWindowKey.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLWindowKey.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLWindowKey.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLWindowKey.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLWindowSpec.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLWindowSpec.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLWindowSpec.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLWindowSpec.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerAgg.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerAgg.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerAgg.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerAgg.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerAppend.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerAppend.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerAppend.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerAppend.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerArray.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerArray.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerArray.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerArray.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerAssert.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerAssert.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerAssert.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerAssert.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerBase.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerBase.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerBase.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerBase.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerBroadcastMotion.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerBroadcastMotion.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerBroadcastMotion.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerBroadcastMotion.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCTEConfig.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCTEConfig.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCTEConfig.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCTEConfig.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCTEList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCTEList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCTEList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCTEList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerColDescr.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerColDescr.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerColDescr.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerColDescr.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerColStats.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerColStats.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerColStats.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerColStats.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerColStatsBucket.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerColStatsBucket.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerColStatsBucket.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerColStatsBucket.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCondList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCondList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCondList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCondList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCost.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCost.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCost.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCost.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCostModel.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCostModel.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCostModel.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCostModel.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCostParam.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCostParam.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCostParam.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCostParam.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCostParams.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCostParams.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCostParams.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCostParams.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCtasStorageOptions.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCtasStorageOptions.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCtasStorageOptions.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCtasStorageOptions.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDXL.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDXL.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDXL.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDXL.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDirectDispatchInfo.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDirectDispatchInfo.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDirectDispatchInfo.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDirectDispatchInfo.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDistinctComp.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDistinctComp.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDistinctComp.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDistinctComp.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDummy.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDummy.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDummy.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDummy.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicForeignScan.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicForeignScan.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicForeignScan.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicForeignScan.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicIndexOnlyScan.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicIndexOnlyScan.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicIndexOnlyScan.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicIndexOnlyScan.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicIndexScan.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicIndexScan.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicIndexScan.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicIndexScan.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicTableScan.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicTableScan.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicTableScan.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicTableScan.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerEnumeratorConfig.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerEnumeratorConfig.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerEnumeratorConfig.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerEnumeratorConfig.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStats.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStats.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStats.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStats.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsDependencies.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsDependencies.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsDependencies.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsDependencies.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsDependency.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsDependency.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsDependency.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsDependency.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsInfo.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsInfo.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsInfo.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsInfo.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsNDistinct.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsNDistinct.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsNDistinct.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsNDistinct.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsNDistinctList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsNDistinctList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsNDistinctList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsNDistinctList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerFactory.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerFactory.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerFactory.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerFactory.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerFilter.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerFilter.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerFilter.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerFilter.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerForeignScan.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerForeignScan.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerForeignScan.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerForeignScan.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerGatherMotion.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerGatherMotion.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerGatherMotion.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerGatherMotion.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerGroupingColList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerGroupingColList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerGroupingColList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerGroupingColList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHashExpr.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHashExpr.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHashExpr.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHashExpr.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHashExprList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHashExprList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHashExprList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHashExprList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHashJoin.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHashJoin.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHashJoin.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHashJoin.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHint.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHint.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHint.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHint.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexCondList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexCondList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexCondList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexCondList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexDescr.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexDescr.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexDescr.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexDescr.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexOnlyScan.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexOnlyScan.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexOnlyScan.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexOnlyScan.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexScan.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexScan.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexScan.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexScan.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLimit.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLimit.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLimit.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLimit.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTAS.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTAS.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTAS.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTAS.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTEAnchor.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTEAnchor.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTEAnchor.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTEAnchor.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTEConsumer.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTEConsumer.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTEConsumer.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTEConsumer.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTEProducer.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTEProducer.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTEProducer.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTEProducer.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalConstTable.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalConstTable.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalConstTable.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalConstTable.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalDelete.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalDelete.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalDelete.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalDelete.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalForeignGet.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalForeignGet.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalForeignGet.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalForeignGet.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalGet.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalGet.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalGet.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalGet.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalGroupBy.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalGroupBy.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalGroupBy.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalGroupBy.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalInsert.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalInsert.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalInsert.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalInsert.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalJoin.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalJoin.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalJoin.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalJoin.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalLimit.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalLimit.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalLimit.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalLimit.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalOp.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalOp.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalOp.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalOp.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalProject.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalProject.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalProject.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalProject.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalSelect.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalSelect.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalSelect.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalSelect.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalSetOp.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalSetOp.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalSetOp.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalSetOp.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalTVF.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalTVF.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalTVF.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalTVF.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalUpdate.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalUpdate.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalUpdate.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalUpdate.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalWindow.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalWindow.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalWindow.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalWindow.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDArrayCoerceCast.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDArrayCoerceCast.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDArrayCoerceCast.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDArrayCoerceCast.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDCast.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDCast.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDCast.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDCast.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBAgg.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBAgg.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBAgg.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBAgg.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBCheckConstraint.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBCheckConstraint.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBCheckConstraint.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBCheckConstraint.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBFunc.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBFunc.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBFunc.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBFunc.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBScalarOp.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBScalarOp.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBScalarOp.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBScalarOp.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDIndex.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDIndex.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDIndex.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDIndex.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDIndexInfoList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDIndexInfoList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDIndexInfoList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDIndexInfoList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDRelation.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDRelation.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDRelation.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDRelation.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDRelationCtas.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDRelationCtas.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDRelationCtas.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDRelationCtas.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDRequest.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDRequest.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDRequest.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDRequest.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDScCmp.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDScCmp.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDScCmp.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDScCmp.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDType.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDType.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDType.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDType.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerManager.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerManager.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerManager.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerManager.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMaterialize.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMaterialize.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMaterialize.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMaterialize.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMergeJoin.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMergeJoin.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMergeJoin.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMergeJoin.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadata.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadata.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadata.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadata.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataColumn.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataColumn.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataColumn.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataColumn.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataColumns.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataColumns.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataColumns.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataColumns.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataIdList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataIdList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataIdList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataIdList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataObject.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataObject.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataObject.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataObject.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerNLJIndexParam.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerNLJIndexParam.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerNLJIndexParam.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerNLJIndexParam.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerNLJIndexParamList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerNLJIndexParamList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerNLJIndexParamList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerNLJIndexParamList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerNLJoin.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerNLJoin.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerNLJoin.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerNLJoin.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerOp.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerOp.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerOp.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerOp.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerOptimizerConfig.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerOptimizerConfig.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerOptimizerConfig.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerOptimizerConfig.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPartitionSelector.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPartitionSelector.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPartitionSelector.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPartitionSelector.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalAbstractBitmapScan.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalAbstractBitmapScan.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalAbstractBitmapScan.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalAbstractBitmapScan.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalBitmapTableScan.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalBitmapTableScan.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalBitmapTableScan.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalBitmapTableScan.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalCTAS.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalCTAS.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalCTAS.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalCTAS.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalCTEConsumer.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalCTEConsumer.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalCTEConsumer.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalCTEConsumer.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalCTEProducer.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalCTEProducer.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalCTEProducer.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalCTEProducer.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalDML.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalDML.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalDML.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalDML.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalDynamicBitmapTableScan.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalDynamicBitmapTableScan.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalDynamicBitmapTableScan.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalDynamicBitmapTableScan.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalOp.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalOp.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalOp.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalOp.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalSplit.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalSplit.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalSplit.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalSplit.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalTVF.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalTVF.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalTVF.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalTVF.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalWindow.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalWindow.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalWindow.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalWindow.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPlan.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPlan.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPlan.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPlan.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPlanHint.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPlanHint.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPlanHint.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPlanHint.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerProjElem.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerProjElem.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerProjElem.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerProjElem.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerProjList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerProjList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerProjList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerProjList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerProperties.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerProperties.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerProperties.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerProperties.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerQuery.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerQuery.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerQuery.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerQuery.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerQueryOutput.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerQueryOutput.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerQueryOutput.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerQueryOutput.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRandomMotion.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRandomMotion.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRandomMotion.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRandomMotion.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRedistributeMotion.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRedistributeMotion.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRedistributeMotion.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRedistributeMotion.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRelStats.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRelStats.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRelStats.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRelStats.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRelationExtendedStats.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRelationExtendedStats.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRelationExtendedStats.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRelationExtendedStats.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerResult.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerResult.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerResult.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerResult.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRoutedMotion.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRoutedMotion.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRoutedMotion.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRoutedMotion.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarAggref.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarAggref.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarAggref.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarAggref.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayCoerceExpr.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayCoerceExpr.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayCoerceExpr.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayCoerceExpr.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayComp.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayComp.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayComp.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayComp.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayRef.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayRef.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayRef.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayRef.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayRefIndexList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayRefIndexList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayRefIndexList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayRefIndexList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarAssertConstraintList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarAssertConstraintList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarAssertConstraintList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarAssertConstraintList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBitmapBoolOp.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBitmapBoolOp.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBitmapBoolOp.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBitmapBoolOp.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBitmapIndexProbe.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBitmapIndexProbe.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBitmapIndexProbe.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBitmapIndexProbe.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBoolExpr.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBoolExpr.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBoolExpr.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBoolExpr.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBooleanTest.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBooleanTest.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBooleanTest.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBooleanTest.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCaseTest.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCaseTest.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCaseTest.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCaseTest.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCast.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCast.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCast.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCast.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCoalesce.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCoalesce.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCoalesce.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCoalesce.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCoerceToDomain.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCoerceToDomain.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCoerceToDomain.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCoerceToDomain.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCoerceViaIO.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCoerceViaIO.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCoerceViaIO.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCoerceViaIO.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarComp.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarComp.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarComp.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarComp.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarConstValue.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarConstValue.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarConstValue.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarConstValue.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarDMLAction.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarDMLAction.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarDMLAction.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarDMLAction.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarExpr.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarExpr.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarExpr.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarExpr.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarFieldSelect.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarFieldSelect.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarFieldSelect.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarFieldSelect.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarFuncExpr.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarFuncExpr.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarFuncExpr.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarFuncExpr.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarIdent.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarIdent.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarIdent.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarIdent.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarIfStmt.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarIfStmt.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarIfStmt.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarIfStmt.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarLimitCount.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarLimitCount.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarLimitCount.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarLimitCount.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarLimitOffset.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarLimitOffset.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarLimitOffset.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarLimitOffset.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarMinMax.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarMinMax.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarMinMax.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarMinMax.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarNullIf.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarNullIf.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarNullIf.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarNullIf.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarNullTest.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarNullTest.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarNullTest.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarNullTest.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarOp.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarOp.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarOp.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarOp.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarOpExpr.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarOpExpr.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarOpExpr.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarOpExpr.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarOpList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarOpList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarOpList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarOpList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarParam.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarParam.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarParam.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarParam.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarPartListNullTest.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarPartListNullTest.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarPartListNullTest.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarPartListNullTest.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarPartListValues.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarPartListValues.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarPartListValues.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarPartListValues.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSortGroupClause.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSortGroupClause.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSortGroupClause.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSortGroupClause.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlan.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlan.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlan.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlan.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlanParam.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlanParam.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlanParam.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlanParam.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlanParamList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlanParamList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlanParamList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlanParamList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlanTestExpr.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlanTestExpr.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlanTestExpr.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlanTestExpr.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubquery.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubquery.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubquery.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubquery.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubqueryExists.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubqueryExists.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubqueryExists.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubqueryExists.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubqueryQuantified.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubqueryQuantified.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubqueryQuantified.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubqueryQuantified.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSwitch.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSwitch.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSwitch.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSwitch.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSwitchCase.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSwitchCase.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSwitchCase.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSwitchCase.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarValuesList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarValuesList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarValuesList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarValuesList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarWindowFrameEdge.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarWindowFrameEdge.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarWindowFrameEdge.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarWindowFrameEdge.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarWindowRef.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarWindowRef.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarWindowRef.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarWindowRef.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSearchStage.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSearchStage.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSearchStage.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSearchStage.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSearchStrategy.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSearchStrategy.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSearchStrategy.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSearchStrategy.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSequence.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSequence.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSequence.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSequence.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSort.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSort.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSort.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSort.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSortCol.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSortCol.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSortCol.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSortCol.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSortColList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSortColList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSortColList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSortColList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStacktrace.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStacktrace.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStacktrace.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStacktrace.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatistics.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatistics.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatistics.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatistics.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatisticsConfig.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatisticsConfig.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatisticsConfig.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatisticsConfig.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatsBound.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatsBound.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatsBound.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatsBound.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatsDerivedColumn.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatsDerivedColumn.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatsDerivedColumn.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatsDerivedColumn.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatsDerivedRelation.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatsDerivedRelation.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatsDerivedRelation.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatsDerivedRelation.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerTableDescr.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerTableDescr.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerTableDescr.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerTableDescr.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerTableScan.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerTableScan.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerTableScan.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerTableScan.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerTraceFlags.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerTraceFlags.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerTraceFlags.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerTraceFlags.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerUtils.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerUtils.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerUtils.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerUtils.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerValuesScan.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerValuesScan.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerValuesScan.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerValuesScan.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowFrame.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowFrame.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowFrame.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowFrame.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowKey.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowKey.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowKey.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowKey.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowKeyList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowKeyList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowKeyList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowKeyList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowOids.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowOids.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowOids.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowOids.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowSpec.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowSpec.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowSpec.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowSpec.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowSpecList.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowSpecList.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowSpecList.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowSpecList.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerXform.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerXform.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerXform.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerXform.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/parsehandlers.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/parsehandlers.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/parsehandlers.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/parser/parsehandlers.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/xml/CDXLMemoryManager.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/xml/CDXLMemoryManager.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/xml/CDXLMemoryManager.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/xml/CDXLMemoryManager.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/xml/CDXLSections.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/xml/CDXLSections.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/xml/CDXLSections.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/xml/CDXLSections.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/xml/CXMLSerializer.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/xml/CXMLSerializer.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/xml/CXMLSerializer.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/xml/CXMLSerializer.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/xml/dxltokens.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/xml/dxltokens.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/dxl/xml/dxltokens.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/dxl/xml/dxltokens.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/exception.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/exception.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/exception.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/exception.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/init.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/init.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/init.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/init.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CDXLBucket.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CDXLBucket.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CDXLBucket.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CDXLBucket.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CDXLColStats.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CDXLColStats.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CDXLColStats.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CDXLColStats.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CDXLExtStats.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CDXLExtStats.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CDXLExtStats.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CDXLExtStats.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CDXLExtStatsInfo.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CDXLExtStatsInfo.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CDXLExtStatsInfo.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CDXLExtStatsInfo.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CDXLRelStats.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CDXLRelStats.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CDXLRelStats.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CDXLRelStats.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CDXLStatsDerivedColumn.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CDXLStatsDerivedColumn.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CDXLStatsDerivedColumn.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CDXLStatsDerivedColumn.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CDXLStatsDerivedRelation.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CDXLStatsDerivedRelation.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CDXLStatsDerivedRelation.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CDXLStatsDerivedRelation.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CGPDBTypeHelper.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CGPDBTypeHelper.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CGPDBTypeHelper.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CGPDBTypeHelper.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDAggregateGPDB.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDAggregateGPDB.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDAggregateGPDB.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDAggregateGPDB.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDArrayCoerceCastGPDB.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDArrayCoerceCastGPDB.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDArrayCoerceCastGPDB.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDArrayCoerceCastGPDB.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDCastGPDB.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDCastGPDB.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDCastGPDB.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDCastGPDB.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDCheckConstraintGPDB.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDCheckConstraintGPDB.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDCheckConstraintGPDB.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDCheckConstraintGPDB.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDColumn.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDColumn.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDColumn.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDColumn.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDDependency.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDDependency.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDDependency.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDDependency.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDExtStatsInfo.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDExtStatsInfo.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDExtStatsInfo.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDExtStatsInfo.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDFunctionGPDB.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDFunctionGPDB.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDFunctionGPDB.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDFunctionGPDB.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDIdCast.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDIdCast.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDIdCast.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDIdCast.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDIdColStats.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDIdColStats.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDIdColStats.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDIdColStats.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDIdGPDB.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDIdGPDB.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDIdGPDB.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDIdGPDB.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDIdGPDBCtas.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDIdGPDBCtas.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDIdGPDBCtas.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDIdGPDBCtas.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDIdRelStats.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDIdRelStats.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDIdRelStats.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDIdRelStats.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDIdScCmp.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDIdScCmp.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDIdScCmp.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDIdScCmp.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDIndexGPDB.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDIndexGPDB.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDIndexGPDB.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDIndexGPDB.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDIndexInfo.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDIndexInfo.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDIndexInfo.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDIndexInfo.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDNDistinct.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDNDistinct.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDNDistinct.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDNDistinct.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDName.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDName.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDName.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDName.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDProviderGeneric.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDProviderGeneric.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDProviderGeneric.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDProviderGeneric.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDProviderMemory.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDProviderMemory.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDProviderMemory.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDProviderMemory.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDRelationCtasGPDB.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDRelationCtasGPDB.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDRelationCtasGPDB.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDRelationCtasGPDB.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDRelationGPDB.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDRelationGPDB.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDRelationGPDB.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDRelationGPDB.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDRequest.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDRequest.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDRequest.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDRequest.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDScCmpGPDB.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDScCmpGPDB.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDScCmpGPDB.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDScCmpGPDB.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDScalarOpGPDB.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDScalarOpGPDB.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDScalarOpGPDB.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDScalarOpGPDB.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDTypeBoolGPDB.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDTypeBoolGPDB.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDTypeBoolGPDB.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDTypeBoolGPDB.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDTypeGenericGPDB.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDTypeGenericGPDB.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDTypeGenericGPDB.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDTypeGenericGPDB.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDTypeInt2GPDB.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDTypeInt2GPDB.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDTypeInt2GPDB.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDTypeInt2GPDB.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDTypeInt4GPDB.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDTypeInt4GPDB.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDTypeInt4GPDB.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDTypeInt4GPDB.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDTypeInt8GPDB.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDTypeInt8GPDB.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDTypeInt8GPDB.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDTypeInt8GPDB.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDTypeOidGPDB.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDTypeOidGPDB.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CMDTypeOidGPDB.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CMDTypeOidGPDB.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CSystemId.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CSystemId.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/CSystemId.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/CSystemId.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDAggregate.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDAggregate.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/IMDAggregate.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDAggregate.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDCacheObject.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDCacheObject.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/IMDCacheObject.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDCacheObject.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDCast.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDCast.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/IMDCast.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDCast.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDCheckConstraint.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDCheckConstraint.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/IMDCheckConstraint.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDCheckConstraint.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDColStats.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDColStats.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/IMDColStats.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDColStats.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDColumn.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDColumn.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/IMDColumn.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDColumn.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDExtStats.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDExtStats.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/IMDExtStats.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDExtStats.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDExtStatsInfo.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDExtStatsInfo.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/IMDExtStatsInfo.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDExtStatsInfo.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDFunction.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDFunction.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/IMDFunction.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDFunction.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDId.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDId.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/IMDId.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDId.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDIndex.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDIndex.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/IMDIndex.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDIndex.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDInterface.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDInterface.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/IMDInterface.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDInterface.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDPartConstraint.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDPartConstraint.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/IMDPartConstraint.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDPartConstraint.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDProvider.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDProvider.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/IMDProvider.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDProvider.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDRelStats.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDRelStats.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/IMDRelStats.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDRelStats.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDRelation.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDRelation.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/IMDRelation.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDRelation.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDRelationCtas.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDRelationCtas.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/IMDRelationCtas.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDRelationCtas.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDScCmp.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDScCmp.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/IMDScCmp.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDScCmp.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDScalarOp.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDScalarOp.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/IMDScalarOp.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDScalarOp.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDType.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDType.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/IMDType.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDType.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDTypeBool.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDTypeBool.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/IMDTypeBool.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDTypeBool.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDTypeGeneric.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDTypeGeneric.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/IMDTypeGeneric.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDTypeGeneric.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDTypeInt2.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDTypeInt2.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/IMDTypeInt2.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDTypeInt2.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDTypeInt4.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDTypeInt4.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/IMDTypeInt4.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDTypeInt4.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDTypeInt8.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDTypeInt8.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/IMDTypeInt8.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDTypeInt8.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDTypeOid.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDTypeOid.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/md/IMDTypeOid.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/md/IMDTypeOid.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CBucket.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CBucket.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/CBucket.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CBucket.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CExtendedStatsProcessor.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CExtendedStatsProcessor.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/CExtendedStatsProcessor.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CExtendedStatsProcessor.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CFilterStatsProcessor.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CFilterStatsProcessor.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/CFilterStatsProcessor.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CFilterStatsProcessor.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CGroupByStatsProcessor.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CGroupByStatsProcessor.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/CGroupByStatsProcessor.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CGroupByStatsProcessor.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CHistogram.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CHistogram.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/CHistogram.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CHistogram.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CInnerJoinStatsProcessor.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CInnerJoinStatsProcessor.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/CInnerJoinStatsProcessor.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CInnerJoinStatsProcessor.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CJoinStatsProcessor.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CJoinStatsProcessor.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/CJoinStatsProcessor.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CJoinStatsProcessor.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CLeftAntiSemiJoinStatsProcessor.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CLeftAntiSemiJoinStatsProcessor.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/CLeftAntiSemiJoinStatsProcessor.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CLeftAntiSemiJoinStatsProcessor.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CLeftOuterJoinStatsProcessor.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CLeftOuterJoinStatsProcessor.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/CLeftOuterJoinStatsProcessor.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CLeftOuterJoinStatsProcessor.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CLeftSemiJoinStatsProcessor.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CLeftSemiJoinStatsProcessor.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/CLeftSemiJoinStatsProcessor.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CLeftSemiJoinStatsProcessor.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CLimitStatsProcessor.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CLimitStatsProcessor.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/CLimitStatsProcessor.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CLimitStatsProcessor.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CPoint.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CPoint.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/CPoint.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CPoint.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CProjectStatsProcessor.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CProjectStatsProcessor.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/CProjectStatsProcessor.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CProjectStatsProcessor.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CScaleFactorUtils.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CScaleFactorUtils.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/CScaleFactorUtils.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CScaleFactorUtils.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatistics.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CStatistics.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatistics.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CStatistics.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatisticsUtils.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CStatisticsUtils.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatisticsUtils.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CStatisticsUtils.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatsPred.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CStatsPred.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatsPred.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CStatsPred.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatsPredArrayCmp.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CStatsPredArrayCmp.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatsPredArrayCmp.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CStatsPredArrayCmp.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatsPredConj.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CStatsPredConj.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatsPredConj.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CStatsPredConj.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatsPredDisj.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CStatsPredDisj.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatsPredDisj.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CStatsPredDisj.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatsPredJoin.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CStatsPredJoin.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatsPredJoin.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CStatsPredJoin.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatsPredLike.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CStatsPredLike.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatsPredLike.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CStatsPredLike.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatsPredPoint.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CStatsPredPoint.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatsPredPoint.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CStatsPredPoint.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatsPredUnsupported.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CStatsPredUnsupported.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatsPredUnsupported.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CStatsPredUnsupported.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatsPredUtils.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CStatsPredUtils.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatsPredUtils.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CStatsPredUtils.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CUnionAllStatsProcessor.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CUnionAllStatsProcessor.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/CUnionAllStatsProcessor.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CUnionAllStatsProcessor.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CUpperBoundNDVs.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CUpperBoundNDVs.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/CUpperBoundNDVs.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/CUpperBoundNDVs.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/IBucket.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/IBucket.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/IBucket.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/IBucket.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/IStatistics.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/IStatistics.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/statistics/IStatistics.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/statistics/IStatistics.h diff --git a/src/backend/gporca/libnaucrates/include/naucrates/traceflags/traceflags.h b/gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/traceflags/traceflags.h similarity index 100% rename from src/backend/gporca/libnaucrates/include/naucrates/traceflags/traceflags.h rename to gpcontrib/gp_orca/gporca/libnaucrates/include/naucrates/traceflags/traceflags.h diff --git a/src/backend/gporca/libnaucrates/src/CCostModelConfigSerializer.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/CCostModelConfigSerializer.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/CCostModelConfigSerializer.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/CCostModelConfigSerializer.cpp diff --git a/src/backend/gporca/libnaucrates/src/CDXLUtils.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/CDXLUtils.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/CDXLUtils.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/CDXLUtils.cpp diff --git a/src/backend/gporca/libnaucrates/src/CIdGenerator.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/CIdGenerator.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/CIdGenerator.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/CIdGenerator.cpp diff --git a/src/backend/gporca/libnaucrates/src/base/CDatumBoolGPDB.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/base/CDatumBoolGPDB.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/base/CDatumBoolGPDB.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/base/CDatumBoolGPDB.cpp diff --git a/src/backend/gporca/libnaucrates/src/base/CDatumGenericGPDB.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/base/CDatumGenericGPDB.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/base/CDatumGenericGPDB.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/base/CDatumGenericGPDB.cpp diff --git a/src/backend/gporca/libnaucrates/src/base/CDatumInt2GPDB.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/base/CDatumInt2GPDB.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/base/CDatumInt2GPDB.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/base/CDatumInt2GPDB.cpp diff --git a/src/backend/gporca/libnaucrates/src/base/CDatumInt4GPDB.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/base/CDatumInt4GPDB.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/base/CDatumInt4GPDB.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/base/CDatumInt4GPDB.cpp diff --git a/src/backend/gporca/libnaucrates/src/base/CDatumInt8GPDB.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/base/CDatumInt8GPDB.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/base/CDatumInt8GPDB.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/base/CDatumInt8GPDB.cpp diff --git a/src/backend/gporca/libnaucrates/src/base/CDatumOidGPDB.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/base/CDatumOidGPDB.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/base/CDatumOidGPDB.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/base/CDatumOidGPDB.cpp diff --git a/src/backend/gporca/libnaucrates/src/base/CQueryToDXLResult.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/base/CQueryToDXLResult.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/base/CQueryToDXLResult.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/base/CQueryToDXLResult.cpp diff --git a/src/backend/gporca/libnaucrates/src/base/IDatum.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/base/IDatum.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/base/IDatum.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/base/IDatum.cpp diff --git a/src/backend/gporca/libnaucrates/src/exception.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/exception.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/exception.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/exception.cpp diff --git a/src/backend/gporca/libnaucrates/src/init.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/init.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/init.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/init.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CDXLBucket.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CDXLBucket.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CDXLBucket.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CDXLBucket.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CDXLColStats.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CDXLColStats.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CDXLColStats.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CDXLColStats.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CDXLExtStats.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CDXLExtStats.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CDXLExtStats.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CDXLExtStats.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CDXLExtStatsInfo.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CDXLExtStatsInfo.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CDXLExtStatsInfo.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CDXLExtStatsInfo.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CDXLRelStats.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CDXLRelStats.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CDXLRelStats.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CDXLRelStats.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CDXLStatsDerivedColumn.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CDXLStatsDerivedColumn.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CDXLStatsDerivedColumn.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CDXLStatsDerivedColumn.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CDXLStatsDerivedRelation.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CDXLStatsDerivedRelation.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CDXLStatsDerivedRelation.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CDXLStatsDerivedRelation.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDAggregateGPDB.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDAggregateGPDB.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDAggregateGPDB.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDAggregateGPDB.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDArrayCoerceCastGPDB.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDArrayCoerceCastGPDB.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDArrayCoerceCastGPDB.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDArrayCoerceCastGPDB.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDCastGPDB.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDCastGPDB.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDCastGPDB.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDCastGPDB.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDCheckConstraintGPDB.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDCheckConstraintGPDB.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDCheckConstraintGPDB.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDCheckConstraintGPDB.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDColumn.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDColumn.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDColumn.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDColumn.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDExtStatsInfo.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDExtStatsInfo.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDExtStatsInfo.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDExtStatsInfo.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDFunctionGPDB.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDFunctionGPDB.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDFunctionGPDB.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDFunctionGPDB.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDIdCast.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDIdCast.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDIdCast.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDIdCast.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDIdColStats.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDIdColStats.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDIdColStats.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDIdColStats.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDIdGPDB.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDIdGPDB.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDIdGPDB.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDIdGPDB.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDIdGPDBCtas.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDIdGPDBCtas.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDIdGPDBCtas.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDIdGPDBCtas.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDIdRelStats.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDIdRelStats.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDIdRelStats.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDIdRelStats.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDIdScCmp.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDIdScCmp.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDIdScCmp.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDIdScCmp.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDIndexGPDB.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDIndexGPDB.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDIndexGPDB.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDIndexGPDB.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDIndexInfo.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDIndexInfo.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDIndexInfo.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDIndexInfo.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDName.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDName.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDName.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDName.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDProviderGeneric.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDProviderGeneric.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDProviderGeneric.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDProviderGeneric.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDProviderMemory.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDProviderMemory.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDProviderMemory.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDProviderMemory.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDRelationCtasGPDB.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDRelationCtasGPDB.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDRelationCtasGPDB.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDRelationCtasGPDB.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDRelationGPDB.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDRelationGPDB.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDRelationGPDB.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDRelationGPDB.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDRequest.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDRequest.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDRequest.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDRequest.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDScCmpGPDB.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDScCmpGPDB.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDScCmpGPDB.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDScCmpGPDB.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDScalarOpGPDB.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDScalarOpGPDB.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDScalarOpGPDB.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDScalarOpGPDB.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDTypeBoolGPDB.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDTypeBoolGPDB.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDTypeBoolGPDB.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDTypeBoolGPDB.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDTypeGenericGPDB.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDTypeGenericGPDB.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDTypeGenericGPDB.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDTypeGenericGPDB.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDTypeInt2GPDB.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDTypeInt2GPDB.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDTypeInt2GPDB.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDTypeInt2GPDB.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDTypeInt4GPDB.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDTypeInt4GPDB.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDTypeInt4GPDB.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDTypeInt4GPDB.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDTypeInt8GPDB.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDTypeInt8GPDB.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDTypeInt8GPDB.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDTypeInt8GPDB.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CMDTypeOidGPDB.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDTypeOidGPDB.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CMDTypeOidGPDB.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CMDTypeOidGPDB.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/CSystemId.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/CSystemId.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/CSystemId.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/CSystemId.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/IMDCacheObject.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/IMDCacheObject.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/IMDCacheObject.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/IMDCacheObject.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/IMDIndex.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/IMDIndex.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/IMDIndex.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/IMDIndex.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/IMDProvider.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/IMDProvider.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/IMDProvider.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/IMDProvider.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/IMDRelation.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/IMDRelation.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/IMDRelation.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/IMDRelation.cpp diff --git a/src/backend/gporca/libnaucrates/src/md/IMDType.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/md/IMDType.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/md/IMDType.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/md/IMDType.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLColDescr.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLColDescr.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLColDescr.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLColDescr.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLColRef.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLColRef.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLColRef.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLColRef.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLCtasStorageOptions.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLCtasStorageOptions.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLCtasStorageOptions.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLCtasStorageOptions.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLDatum.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLDatum.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLDatum.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLDatum.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLDatumBool.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLDatumBool.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLDatumBool.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLDatumBool.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLDatumGeneric.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLDatumGeneric.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLDatumGeneric.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLDatumGeneric.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLDatumInt2.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLDatumInt2.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLDatumInt2.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLDatumInt2.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLDatumInt4.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLDatumInt4.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLDatumInt4.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLDatumInt4.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLDatumInt8.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLDatumInt8.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLDatumInt8.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLDatumInt8.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLDatumOid.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLDatumOid.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLDatumOid.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLDatumOid.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLDatumStatsDoubleMappable.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLDatumStatsDoubleMappable.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLDatumStatsDoubleMappable.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLDatumStatsDoubleMappable.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLDatumStatsLintMappable.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLDatumStatsLintMappable.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLDatumStatsLintMappable.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLDatumStatsLintMappable.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLDirectDispatchInfo.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLDirectDispatchInfo.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLDirectDispatchInfo.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLDirectDispatchInfo.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLIndexDescr.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLIndexDescr.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLIndexDescr.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLIndexDescr.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogical.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogical.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogical.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogical.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalCTAS.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalCTAS.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalCTAS.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalCTAS.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalCTEAnchor.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalCTEAnchor.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalCTEAnchor.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalCTEAnchor.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalCTEConsumer.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalCTEConsumer.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalCTEConsumer.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalCTEConsumer.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalCTEProducer.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalCTEProducer.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalCTEProducer.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalCTEProducer.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalConstTable.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalConstTable.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalConstTable.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalConstTable.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalDelete.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalDelete.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalDelete.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalDelete.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalForeignGet.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalForeignGet.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalForeignGet.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalForeignGet.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalGet.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalGet.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalGet.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalGet.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalGroupBy.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalGroupBy.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalGroupBy.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalGroupBy.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalInsert.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalInsert.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalInsert.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalInsert.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalJoin.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalJoin.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalJoin.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalJoin.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalLimit.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalLimit.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalLimit.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalLimit.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalProject.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalProject.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalProject.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalProject.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalSelect.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalSelect.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalSelect.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalSelect.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalSetOp.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalSetOp.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalSetOp.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalSetOp.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalTVF.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalTVF.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalTVF.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalTVF.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalUpdate.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalUpdate.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalUpdate.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalUpdate.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalWindow.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalWindow.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalWindow.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLLogicalWindow.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLNode.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLNode.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLNode.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLNode.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLOperator.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLOperator.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLOperator.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLOperator.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLOperatorCost.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLOperatorCost.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLOperatorCost.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLOperatorCost.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLOperatorFactory.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLOperatorFactory.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLOperatorFactory.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLOperatorFactory.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysical.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysical.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysical.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysical.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalAbstractBitmapScan.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalAbstractBitmapScan.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalAbstractBitmapScan.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalAbstractBitmapScan.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalAgg.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalAgg.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalAgg.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalAgg.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalAppend.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalAppend.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalAppend.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalAppend.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalAssert.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalAssert.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalAssert.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalAssert.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalBitmapTableScan.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalBitmapTableScan.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalBitmapTableScan.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalBitmapTableScan.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalBroadcastMotion.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalBroadcastMotion.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalBroadcastMotion.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalBroadcastMotion.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalCTAS.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalCTAS.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalCTAS.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalCTAS.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalCTEConsumer.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalCTEConsumer.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalCTEConsumer.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalCTEConsumer.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalCTEProducer.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalCTEProducer.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalCTEProducer.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalCTEProducer.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalDML.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalDML.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalDML.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalDML.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicBitmapTableScan.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicBitmapTableScan.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicBitmapTableScan.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicBitmapTableScan.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicForeignScan.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicForeignScan.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicForeignScan.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicForeignScan.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicIndexOnlyScan.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicIndexOnlyScan.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicIndexOnlyScan.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicIndexOnlyScan.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicIndexScan.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicIndexScan.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicIndexScan.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicIndexScan.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicTableScan.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicTableScan.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicTableScan.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicTableScan.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalForeignScan.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalForeignScan.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalForeignScan.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalForeignScan.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalGatherMotion.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalGatherMotion.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalGatherMotion.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalGatherMotion.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalHashJoin.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalHashJoin.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalHashJoin.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalHashJoin.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalIndexOnlyScan.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalIndexOnlyScan.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalIndexOnlyScan.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalIndexOnlyScan.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalIndexScan.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalIndexScan.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalIndexScan.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalIndexScan.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalJoin.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalJoin.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalJoin.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalJoin.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalLimit.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalLimit.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalLimit.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalLimit.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalMaterialize.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalMaterialize.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalMaterialize.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalMaterialize.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalMergeJoin.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalMergeJoin.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalMergeJoin.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalMergeJoin.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalMotion.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalMotion.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalMotion.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalMotion.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalNLJoin.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalNLJoin.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalNLJoin.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalNLJoin.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalPartitionSelector.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalPartitionSelector.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalPartitionSelector.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalPartitionSelector.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalProperties.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalProperties.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalProperties.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalProperties.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalRandomMotion.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalRandomMotion.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalRandomMotion.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalRandomMotion.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalRedistributeMotion.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalRedistributeMotion.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalRedistributeMotion.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalRedistributeMotion.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalResult.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalResult.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalResult.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalResult.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalRoutedDistributeMotion.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalRoutedDistributeMotion.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalRoutedDistributeMotion.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalRoutedDistributeMotion.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalSequence.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalSequence.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalSequence.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalSequence.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalSort.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalSort.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalSort.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalSort.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalSplit.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalSplit.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalSplit.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalSplit.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalTVF.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalTVF.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalTVF.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalTVF.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalTableScan.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalTableScan.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalTableScan.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalTableScan.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalValuesScan.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalValuesScan.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalValuesScan.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalValuesScan.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalWindow.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalWindow.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalWindow.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLPhysicalWindow.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLProperties.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLProperties.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLProperties.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLProperties.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalar.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalar.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalar.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalar.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarAggref.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarAggref.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarAggref.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarAggref.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarArray.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarArray.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarArray.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarArray.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarArrayCoerceExpr.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarArrayCoerceExpr.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarArrayCoerceExpr.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarArrayCoerceExpr.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarArrayComp.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarArrayComp.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarArrayComp.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarArrayComp.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarArrayRef.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarArrayRef.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarArrayRef.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarArrayRef.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarArrayRefIndexList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarArrayRefIndexList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarArrayRefIndexList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarArrayRefIndexList.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarAssertConstraint.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarAssertConstraint.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarAssertConstraint.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarAssertConstraint.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarAssertConstraintList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarAssertConstraintList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarAssertConstraintList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarAssertConstraintList.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarBitmapBoolOp.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarBitmapBoolOp.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarBitmapBoolOp.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarBitmapBoolOp.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarBitmapIndexProbe.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarBitmapIndexProbe.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarBitmapIndexProbe.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarBitmapIndexProbe.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarBoolExpr.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarBoolExpr.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarBoolExpr.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarBoolExpr.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarBooleanTest.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarBooleanTest.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarBooleanTest.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarBooleanTest.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarCaseTest.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarCaseTest.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarCaseTest.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarCaseTest.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarCast.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarCast.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarCast.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarCast.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarCoalesce.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarCoalesce.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarCoalesce.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarCoalesce.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarCoerceBase.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarCoerceBase.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarCoerceBase.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarCoerceBase.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarCoerceToDomain.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarCoerceToDomain.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarCoerceToDomain.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarCoerceToDomain.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarCoerceViaIO.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarCoerceViaIO.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarCoerceViaIO.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarCoerceViaIO.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarComp.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarComp.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarComp.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarComp.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarConstValue.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarConstValue.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarConstValue.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarConstValue.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarDMLAction.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarDMLAction.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarDMLAction.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarDMLAction.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarDistinctComp.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarDistinctComp.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarDistinctComp.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarDistinctComp.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarFieldSelect.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarFieldSelect.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarFieldSelect.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarFieldSelect.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarFilter.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarFilter.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarFilter.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarFilter.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarFuncExpr.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarFuncExpr.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarFuncExpr.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarFuncExpr.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarHashCondList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarHashCondList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarHashCondList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarHashCondList.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarHashExpr.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarHashExpr.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarHashExpr.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarHashExpr.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarHashExprList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarHashExprList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarHashExprList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarHashExprList.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarIdent.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarIdent.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarIdent.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarIdent.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarIfStmt.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarIfStmt.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarIfStmt.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarIfStmt.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarIndexCondList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarIndexCondList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarIndexCondList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarIndexCondList.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarJoinFilter.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarJoinFilter.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarJoinFilter.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarJoinFilter.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarLimitCount.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarLimitCount.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarLimitCount.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarLimitCount.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarLimitOffset.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarLimitOffset.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarLimitOffset.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarLimitOffset.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarMergeCondList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarMergeCondList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarMergeCondList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarMergeCondList.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarMinMax.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarMinMax.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarMinMax.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarMinMax.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarNullIf.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarNullIf.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarNullIf.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarNullIf.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarNullTest.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarNullTest.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarNullTest.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarNullTest.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarOneTimeFilter.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarOneTimeFilter.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarOneTimeFilter.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarOneTimeFilter.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarOpExpr.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarOpExpr.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarOpExpr.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarOpExpr.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarOpList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarOpList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarOpList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarOpList.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarParam.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarParam.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarParam.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarParam.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarProjElem.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarProjElem.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarProjElem.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarProjElem.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarProjList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarProjList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarProjList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarProjList.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarRecheckCondFilter.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarRecheckCondFilter.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarRecheckCondFilter.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarRecheckCondFilter.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarSortCol.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarSortCol.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarSortCol.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarSortCol.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarSortColList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarSortColList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarSortColList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarSortColList.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubPlan.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarSubPlan.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubPlan.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarSubPlan.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubquery.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarSubquery.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubquery.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarSubquery.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubqueryAll.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarSubqueryAll.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubqueryAll.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarSubqueryAll.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubqueryAny.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarSubqueryAny.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubqueryAny.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarSubqueryAny.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubqueryExists.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarSubqueryExists.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubqueryExists.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarSubqueryExists.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubqueryNotExists.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarSubqueryNotExists.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubqueryNotExists.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarSubqueryNotExists.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubqueryQuantified.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarSubqueryQuantified.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubqueryQuantified.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarSubqueryQuantified.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarSwitch.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarSwitch.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarSwitch.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarSwitch.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarSwitchCase.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarSwitchCase.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarSwitchCase.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarSwitchCase.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarValuesList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarValuesList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarValuesList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarValuesList.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarWindowFrameEdge.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarWindowFrameEdge.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarWindowFrameEdge.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarWindowFrameEdge.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarWindowRef.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarWindowRef.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarWindowRef.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLScalarWindowRef.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLSpoolInfo.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLSpoolInfo.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLSpoolInfo.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLSpoolInfo.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLTableDescr.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLTableDescr.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLTableDescr.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLTableDescr.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLWindowFrame.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLWindowFrame.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLWindowFrame.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLWindowFrame.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLWindowKey.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLWindowKey.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLWindowKey.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLWindowKey.cpp diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLWindowSpec.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLWindowSpec.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/operators/CDXLWindowSpec.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/operators/CDXLWindowSpec.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerAgg.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerAgg.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerAgg.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerAgg.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerAppend.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerAppend.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerAppend.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerAppend.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerArray.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerArray.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerArray.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerArray.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerAssert.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerAssert.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerAssert.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerAssert.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerBase.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerBase.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerBase.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerBase.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerBroadcastMotion.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerBroadcastMotion.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerBroadcastMotion.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerBroadcastMotion.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerCTEConfig.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerCTEConfig.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerCTEConfig.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerCTEConfig.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerCTEList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerCTEList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerCTEList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerCTEList.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerColDescr.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerColDescr.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerColDescr.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerColDescr.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerColStats.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerColStats.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerColStats.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerColStats.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerColStatsBucket.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerColStatsBucket.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerColStatsBucket.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerColStatsBucket.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerCondList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerCondList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerCondList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerCondList.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerCost.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerCost.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerCost.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerCost.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerCostModel.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerCostModel.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerCostModel.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerCostModel.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerCostParam.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerCostParam.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerCostParam.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerCostParam.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerCostParams.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerCostParams.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerCostParams.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerCostParams.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerCtasStorageOptions.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerCtasStorageOptions.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerCtasStorageOptions.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerCtasStorageOptions.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerDXL.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerDXL.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerDXL.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerDXL.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerDirectDispatchInfo.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerDirectDispatchInfo.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerDirectDispatchInfo.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerDirectDispatchInfo.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerDistinctComp.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerDistinctComp.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerDistinctComp.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerDistinctComp.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerDummy.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerDummy.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerDummy.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerDummy.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerDynamicForeignScan.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerDynamicForeignScan.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerDynamicForeignScan.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerDynamicForeignScan.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerDynamicIndexOnlyScan.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerDynamicIndexOnlyScan.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerDynamicIndexOnlyScan.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerDynamicIndexOnlyScan.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerDynamicIndexScan.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerDynamicIndexScan.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerDynamicIndexScan.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerDynamicIndexScan.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerDynamicTableScan.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerDynamicTableScan.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerDynamicTableScan.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerDynamicTableScan.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerEnumeratorConfig.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerEnumeratorConfig.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerEnumeratorConfig.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerEnumeratorConfig.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerExtStats.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerExtStats.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerExtStats.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerExtStats.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerExtStatsDependencies.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerExtStatsDependencies.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerExtStatsDependencies.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerExtStatsDependencies.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerExtStatsDependency.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerExtStatsDependency.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerExtStatsDependency.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerExtStatsDependency.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerExtStatsInfo.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerExtStatsInfo.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerExtStatsInfo.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerExtStatsInfo.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerExtStatsNDistinct.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerExtStatsNDistinct.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerExtStatsNDistinct.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerExtStatsNDistinct.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerExtStatsNDistinctList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerExtStatsNDistinctList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerExtStatsNDistinctList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerExtStatsNDistinctList.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerFactory.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerFactory.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerFactory.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerFactory.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerFilter.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerFilter.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerFilter.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerFilter.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerForeignScan.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerForeignScan.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerForeignScan.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerForeignScan.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerGatherMotion.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerGatherMotion.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerGatherMotion.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerGatherMotion.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerGroupingColList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerGroupingColList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerGroupingColList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerGroupingColList.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerHashExpr.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerHashExpr.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerHashExpr.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerHashExpr.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerHashExprList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerHashExprList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerHashExprList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerHashExprList.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerHashJoin.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerHashJoin.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerHashJoin.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerHashJoin.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerHint.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerHint.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerHint.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerHint.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerIndexCondList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerIndexCondList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerIndexCondList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerIndexCondList.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerIndexDescr.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerIndexDescr.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerIndexDescr.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerIndexDescr.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerIndexOnlyScan.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerIndexOnlyScan.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerIndexOnlyScan.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerIndexOnlyScan.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerIndexScan.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerIndexScan.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerIndexScan.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerIndexScan.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLimit.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLimit.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLimit.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLimit.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTAS.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTAS.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTAS.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTAS.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEAnchor.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEAnchor.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEAnchor.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEAnchor.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEConsumer.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEConsumer.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEConsumer.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEConsumer.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEProducer.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEProducer.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEProducer.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEProducer.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalConstTable.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalConstTable.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalConstTable.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalConstTable.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalDelete.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalDelete.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalDelete.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalDelete.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalForeignGet.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalForeignGet.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalForeignGet.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalForeignGet.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalGet.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalGet.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalGet.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalGet.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalGroupBy.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalGroupBy.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalGroupBy.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalGroupBy.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalInsert.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalInsert.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalInsert.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalInsert.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalJoin.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalJoin.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalJoin.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalJoin.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalLimit.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalLimit.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalLimit.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalLimit.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalOp.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalOp.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalOp.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalOp.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalProject.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalProject.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalProject.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalProject.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalSelect.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalSelect.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalSelect.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalSelect.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalSetOp.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalSetOp.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalSetOp.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalSetOp.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalTVF.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalTVF.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalTVF.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalTVF.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalUpdate.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalUpdate.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalUpdate.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalUpdate.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalWindow.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalWindow.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalWindow.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalWindow.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDArrayCoerceCast.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMDArrayCoerceCast.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDArrayCoerceCast.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMDArrayCoerceCast.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDCast.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMDCast.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDCast.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMDCast.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBAgg.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBAgg.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBAgg.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBAgg.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBCheckConstraint.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBCheckConstraint.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBCheckConstraint.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBCheckConstraint.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBFunc.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBFunc.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBFunc.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBFunc.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBScalarOp.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBScalarOp.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBScalarOp.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBScalarOp.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDIndex.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMDIndex.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDIndex.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMDIndex.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDIndexInfoList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMDIndexInfoList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDIndexInfoList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMDIndexInfoList.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDRelation.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMDRelation.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDRelation.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMDRelation.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDRelationCtas.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMDRelationCtas.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDRelationCtas.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMDRelationCtas.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDRequest.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMDRequest.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDRequest.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMDRequest.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDScCmp.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMDScCmp.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDScCmp.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMDScCmp.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDType.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMDType.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDType.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMDType.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerManager.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerManager.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerManager.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerManager.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMaterialize.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMaterialize.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMaterialize.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMaterialize.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMergeJoin.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMergeJoin.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMergeJoin.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMergeJoin.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMetadata.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMetadata.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMetadata.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMetadata.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMetadataColumn.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMetadataColumn.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMetadataColumn.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMetadataColumn.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMetadataColumns.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMetadataColumns.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMetadataColumns.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMetadataColumns.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMetadataIdList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMetadataIdList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMetadataIdList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMetadataIdList.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMetadataObject.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMetadataObject.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMetadataObject.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerMetadataObject.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerNLJIndexParam.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerNLJIndexParam.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerNLJIndexParam.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerNLJIndexParam.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerNLJIndexParamList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerNLJIndexParamList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerNLJIndexParamList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerNLJIndexParamList.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerNLJoin.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerNLJoin.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerNLJoin.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerNLJoin.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerOp.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerOp.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerOp.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerOp.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerOptimizerConfig.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerOptimizerConfig.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerOptimizerConfig.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerOptimizerConfig.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPartitionSelector.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPartitionSelector.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPartitionSelector.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPartitionSelector.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalAbstractBitmapScan.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalAbstractBitmapScan.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalAbstractBitmapScan.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalAbstractBitmapScan.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalBitmapTableScan.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalBitmapTableScan.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalBitmapTableScan.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalBitmapTableScan.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTAS.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTAS.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTAS.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTAS.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEConsumer.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEConsumer.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEConsumer.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEConsumer.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEProducer.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEProducer.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEProducer.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEProducer.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalDML.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalDML.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalDML.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalDML.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalDynamicBitmapTableScan.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalDynamicBitmapTableScan.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalDynamicBitmapTableScan.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalDynamicBitmapTableScan.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalOp.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalOp.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalOp.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalOp.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalSplit.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalSplit.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalSplit.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalSplit.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalTVF.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalTVF.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalTVF.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalTVF.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalWindow.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalWindow.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalWindow.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalWindow.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPlan.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPlan.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPlan.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPlan.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPlanHint.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPlanHint.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPlanHint.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerPlanHint.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerProjElem.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerProjElem.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerProjElem.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerProjElem.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerProjList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerProjList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerProjList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerProjList.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerProperties.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerProperties.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerProperties.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerProperties.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerQuery.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerQuery.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerQuery.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerQuery.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerQueryOutput.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerQueryOutput.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerQueryOutput.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerQueryOutput.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerRandomMotion.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerRandomMotion.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerRandomMotion.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerRandomMotion.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerRedistributeMotion.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerRedistributeMotion.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerRedistributeMotion.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerRedistributeMotion.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerRelStats.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerRelStats.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerRelStats.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerRelStats.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerRelationExtendedStats.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerRelationExtendedStats.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerRelationExtendedStats.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerRelationExtendedStats.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerResult.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerResult.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerResult.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerResult.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerRoutedMotion.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerRoutedMotion.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerRoutedMotion.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerRoutedMotion.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarAggref.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarAggref.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarAggref.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarAggref.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayCoerceExpr.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayCoerceExpr.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayCoerceExpr.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayCoerceExpr.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayComp.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayComp.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayComp.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayComp.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayRef.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayRef.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayRef.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayRef.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayRefIndexList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayRefIndexList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayRefIndexList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayRefIndexList.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarAssertConstraintList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarAssertConstraintList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarAssertConstraintList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarAssertConstraintList.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarBitmapBoolOp.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarBitmapBoolOp.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarBitmapBoolOp.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarBitmapBoolOp.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarBitmapIndexProbe.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarBitmapIndexProbe.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarBitmapIndexProbe.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarBitmapIndexProbe.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarBoolExpr.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarBoolExpr.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarBoolExpr.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarBoolExpr.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarBooleanTest.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarBooleanTest.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarBooleanTest.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarBooleanTest.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarCaseTest.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarCaseTest.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarCaseTest.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarCaseTest.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarCast.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarCast.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarCast.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarCast.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarCoalesce.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarCoalesce.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarCoalesce.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarCoalesce.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarCoerceToDomain.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarCoerceToDomain.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarCoerceToDomain.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarCoerceToDomain.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarCoerceViaIO.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarCoerceViaIO.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarCoerceViaIO.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarCoerceViaIO.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarComp.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarComp.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarComp.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarComp.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarConstValue.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarConstValue.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarConstValue.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarConstValue.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarDMLAction.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarDMLAction.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarDMLAction.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarDMLAction.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarExpr.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarExpr.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarExpr.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarExpr.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarFieldSelect.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarFieldSelect.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarFieldSelect.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarFieldSelect.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarFuncExpr.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarFuncExpr.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarFuncExpr.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarFuncExpr.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarIdent.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarIdent.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarIdent.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarIdent.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarIfStmt.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarIfStmt.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarIfStmt.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarIfStmt.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarLimitCount.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarLimitCount.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarLimitCount.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarLimitCount.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarLimitOffset.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarLimitOffset.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarLimitOffset.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarLimitOffset.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarMinMax.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarMinMax.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarMinMax.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarMinMax.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarNullIf.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarNullIf.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarNullIf.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarNullIf.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarNullTest.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarNullTest.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarNullTest.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarNullTest.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarOp.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarOp.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarOp.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarOp.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarOpExpr.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarOpExpr.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarOpExpr.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarOpExpr.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarOpList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarOpList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarOpList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarOpList.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarParam.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarParam.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarParam.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarParam.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSortGroupClause.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSortGroupClause.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSortGroupClause.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSortGroupClause.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlan.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlan.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlan.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlan.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanParam.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanParam.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanParam.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanParam.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanParamList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanParamList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanParamList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanParamList.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanTestExpr.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanTestExpr.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanTestExpr.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanTestExpr.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubquery.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubquery.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubquery.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubquery.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubqueryExists.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubqueryExists.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubqueryExists.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubqueryExists.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubqueryQuantified.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubqueryQuantified.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubqueryQuantified.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubqueryQuantified.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSwitch.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSwitch.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSwitch.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSwitch.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSwitchCase.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSwitchCase.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSwitchCase.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSwitchCase.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarValuesList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarValuesList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarValuesList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarValuesList.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarWindowFrameEdge.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarWindowFrameEdge.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarWindowFrameEdge.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarWindowFrameEdge.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarWindowRef.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarWindowRef.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarWindowRef.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerScalarWindowRef.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerSearchStage.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerSearchStage.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerSearchStage.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerSearchStage.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerSearchStrategy.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerSearchStrategy.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerSearchStrategy.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerSearchStrategy.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerSequence.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerSequence.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerSequence.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerSequence.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerSort.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerSort.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerSort.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerSort.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerSortCol.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerSortCol.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerSortCol.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerSortCol.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerSortColList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerSortColList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerSortColList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerSortColList.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerStackTrace.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerStackTrace.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerStackTrace.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerStackTrace.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatistics.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerStatistics.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatistics.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerStatistics.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatisticsConfig.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerStatisticsConfig.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatisticsConfig.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerStatisticsConfig.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatsBound.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerStatsBound.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatsBound.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerStatsBound.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedColumn.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedColumn.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedColumn.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedColumn.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedRelation.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedRelation.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedRelation.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedRelation.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerTableDescr.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerTableDescr.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerTableDescr.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerTableDescr.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerTableScan.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerTableScan.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerTableScan.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerTableScan.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerTraceFlags.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerTraceFlags.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerTraceFlags.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerTraceFlags.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerUtils.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerUtils.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerUtils.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerUtils.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerValuesScan.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerValuesScan.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerValuesScan.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerValuesScan.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerWindowFrame.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerWindowFrame.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerWindowFrame.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerWindowFrame.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerWindowKey.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerWindowKey.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerWindowKey.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerWindowKey.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerWindowKeyList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerWindowKeyList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerWindowKeyList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerWindowKeyList.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerWindowOids.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerWindowOids.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerWindowOids.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerWindowOids.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerWindowSpec.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerWindowSpec.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerWindowSpec.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerWindowSpec.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerWindowSpecList.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerWindowSpecList.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerWindowSpecList.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerWindowSpecList.cpp diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerXform.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerXform.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerXform.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/parser/CParseHandlerXform.cpp diff --git a/src/backend/gporca/libnaucrates/src/statistics/CBucket.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CBucket.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/statistics/CBucket.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CBucket.cpp diff --git a/src/backend/gporca/libnaucrates/src/statistics/CExtendedStatsProcessor.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CExtendedStatsProcessor.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/statistics/CExtendedStatsProcessor.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CExtendedStatsProcessor.cpp diff --git a/src/backend/gporca/libnaucrates/src/statistics/CFilterStatsProcessor.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CFilterStatsProcessor.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/statistics/CFilterStatsProcessor.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CFilterStatsProcessor.cpp diff --git a/src/backend/gporca/libnaucrates/src/statistics/CGroupByStatsProcessor.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CGroupByStatsProcessor.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/statistics/CGroupByStatsProcessor.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CGroupByStatsProcessor.cpp diff --git a/src/backend/gporca/libnaucrates/src/statistics/CHistogram.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CHistogram.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/statistics/CHistogram.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CHistogram.cpp diff --git a/src/backend/gporca/libnaucrates/src/statistics/CInnerJoinStatsProcessor.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CInnerJoinStatsProcessor.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/statistics/CInnerJoinStatsProcessor.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CInnerJoinStatsProcessor.cpp diff --git a/src/backend/gporca/libnaucrates/src/statistics/CJoinStatsProcessor.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CJoinStatsProcessor.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/statistics/CJoinStatsProcessor.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CJoinStatsProcessor.cpp diff --git a/src/backend/gporca/libnaucrates/src/statistics/CLeftAntiSemiJoinStatsProcessor.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CLeftAntiSemiJoinStatsProcessor.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/statistics/CLeftAntiSemiJoinStatsProcessor.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CLeftAntiSemiJoinStatsProcessor.cpp diff --git a/src/backend/gporca/libnaucrates/src/statistics/CLeftOuterJoinStatsProcessor.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CLeftOuterJoinStatsProcessor.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/statistics/CLeftOuterJoinStatsProcessor.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CLeftOuterJoinStatsProcessor.cpp diff --git a/src/backend/gporca/libnaucrates/src/statistics/CLeftSemiJoinStatsProcessor.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CLeftSemiJoinStatsProcessor.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/statistics/CLeftSemiJoinStatsProcessor.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CLeftSemiJoinStatsProcessor.cpp diff --git a/src/backend/gporca/libnaucrates/src/statistics/CLimitStatsProcessor.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CLimitStatsProcessor.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/statistics/CLimitStatsProcessor.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CLimitStatsProcessor.cpp diff --git a/src/backend/gporca/libnaucrates/src/statistics/CPoint.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CPoint.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/statistics/CPoint.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CPoint.cpp diff --git a/src/backend/gporca/libnaucrates/src/statistics/CProjectStatsProcessor.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CProjectStatsProcessor.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/statistics/CProjectStatsProcessor.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CProjectStatsProcessor.cpp diff --git a/src/backend/gporca/libnaucrates/src/statistics/CScaleFactorUtils.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CScaleFactorUtils.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/statistics/CScaleFactorUtils.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CScaleFactorUtils.cpp diff --git a/src/backend/gporca/libnaucrates/src/statistics/CStatistics.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CStatistics.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/statistics/CStatistics.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CStatistics.cpp diff --git a/src/backend/gporca/libnaucrates/src/statistics/CStatisticsUtils.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CStatisticsUtils.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/statistics/CStatisticsUtils.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CStatisticsUtils.cpp diff --git a/src/backend/gporca/libnaucrates/src/statistics/CStatsPredArrayCmp.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CStatsPredArrayCmp.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/statistics/CStatsPredArrayCmp.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CStatsPredArrayCmp.cpp diff --git a/src/backend/gporca/libnaucrates/src/statistics/CStatsPredConj.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CStatsPredConj.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/statistics/CStatsPredConj.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CStatsPredConj.cpp diff --git a/src/backend/gporca/libnaucrates/src/statistics/CStatsPredDisj.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CStatsPredDisj.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/statistics/CStatsPredDisj.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CStatsPredDisj.cpp diff --git a/src/backend/gporca/libnaucrates/src/statistics/CStatsPredLike.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CStatsPredLike.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/statistics/CStatsPredLike.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CStatsPredLike.cpp diff --git a/src/backend/gporca/libnaucrates/src/statistics/CStatsPredPoint.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CStatsPredPoint.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/statistics/CStatsPredPoint.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CStatsPredPoint.cpp diff --git a/src/backend/gporca/libnaucrates/src/statistics/CStatsPredUnsupported.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CStatsPredUnsupported.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/statistics/CStatsPredUnsupported.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CStatsPredUnsupported.cpp diff --git a/src/backend/gporca/libnaucrates/src/statistics/CStatsPredUtils.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CStatsPredUtils.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/statistics/CStatsPredUtils.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CStatsPredUtils.cpp diff --git a/src/backend/gporca/libnaucrates/src/statistics/CUnionAllStatsProcessor.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CUnionAllStatsProcessor.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/statistics/CUnionAllStatsProcessor.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CUnionAllStatsProcessor.cpp diff --git a/src/backend/gporca/libnaucrates/src/statistics/CUpperBoundNDVs.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CUpperBoundNDVs.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/statistics/CUpperBoundNDVs.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/statistics/CUpperBoundNDVs.cpp diff --git a/src/backend/gporca/libnaucrates/src/traceflags.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/traceflags.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/traceflags.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/traceflags.cpp diff --git a/src/backend/gporca/libnaucrates/src/xml/CDXLMemoryManager.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/xml/CDXLMemoryManager.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/xml/CDXLMemoryManager.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/xml/CDXLMemoryManager.cpp diff --git a/src/backend/gporca/libnaucrates/src/xml/CDXLSections.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/xml/CDXLSections.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/xml/CDXLSections.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/xml/CDXLSections.cpp diff --git a/src/backend/gporca/libnaucrates/src/xml/CXMLSerializer.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/xml/CXMLSerializer.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/xml/CXMLSerializer.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/xml/CXMLSerializer.cpp diff --git a/src/backend/gporca/libnaucrates/src/xml/dxltokens.cpp b/gpcontrib/gp_orca/gporca/libnaucrates/src/xml/dxltokens.cpp similarity index 100% rename from src/backend/gporca/libnaucrates/src/xml/dxltokens.cpp rename to gpcontrib/gp_orca/gporca/libnaucrates/src/xml/dxltokens.cpp diff --git a/src/backend/gporca/scripts/cal_bitmap_test.py b/gpcontrib/gp_orca/gporca/scripts/cal_bitmap_test.py similarity index 100% rename from src/backend/gporca/scripts/cal_bitmap_test.py rename to gpcontrib/gp_orca/gporca/scripts/cal_bitmap_test.py diff --git a/src/backend/gporca/scripts/convert_minirepro_5_to_6.py b/gpcontrib/gp_orca/gporca/scripts/convert_minirepro_5_to_6.py similarity index 100% rename from src/backend/gporca/scripts/convert_minirepro_5_to_6.py rename to gpcontrib/gp_orca/gporca/scripts/convert_minirepro_5_to_6.py diff --git a/src/backend/gporca/scripts/convert_minirepro_6_to_7.py b/gpcontrib/gp_orca/gporca/scripts/convert_minirepro_6_to_7.py similarity index 100% rename from src/backend/gporca/scripts/convert_minirepro_6_to_7.py rename to gpcontrib/gp_orca/gporca/scripts/convert_minirepro_6_to_7.py diff --git a/src/backend/gporca/scripts/dxl_modify_partitioned_index.py b/gpcontrib/gp_orca/gporca/scripts/dxl_modify_partitioned_index.py similarity index 100% rename from src/backend/gporca/scripts/dxl_modify_partitioned_index.py rename to gpcontrib/gp_orca/gporca/scripts/dxl_modify_partitioned_index.py diff --git a/src/backend/gporca/scripts/fix_lookup_failure.py b/gpcontrib/gp_orca/gporca/scripts/fix_lookup_failure.py similarity index 100% rename from src/backend/gporca/scripts/fix_lookup_failure.py rename to gpcontrib/gp_orca/gporca/scripts/fix_lookup_failure.py diff --git a/src/backend/gporca/scripts/fix_mdps.py b/gpcontrib/gp_orca/gporca/scripts/fix_mdps.py similarity index 100% rename from src/backend/gporca/scripts/fix_mdps.py rename to gpcontrib/gp_orca/gporca/scripts/fix_mdps.py diff --git a/src/backend/gporca/scripts/get_debug_event_counters.py b/gpcontrib/gp_orca/gporca/scripts/get_debug_event_counters.py similarity index 100% rename from src/backend/gporca/scripts/get_debug_event_counters.py rename to gpcontrib/gp_orca/gporca/scripts/get_debug_event_counters.py diff --git a/src/backend/gporca/scripts/tests/test_cal_bitmap_test.py b/gpcontrib/gp_orca/gporca/scripts/tests/test_cal_bitmap_test.py similarity index 100% rename from src/backend/gporca/scripts/tests/test_cal_bitmap_test.py rename to gpcontrib/gp_orca/gporca/scripts/tests/test_cal_bitmap_test.py diff --git a/src/backend/gporca/server/CMakeLists.txt b/gpcontrib/gp_orca/gporca/server/CMakeLists.txt similarity index 100% rename from src/backend/gporca/server/CMakeLists.txt rename to gpcontrib/gp_orca/gporca/server/CMakeLists.txt diff --git a/src/backend/gporca/server/dxl.xsd b/gpcontrib/gp_orca/gporca/server/dxl.xsd similarity index 100% rename from src/backend/gporca/server/dxl.xsd rename to gpcontrib/gp_orca/gporca/server/dxl.xsd diff --git a/src/backend/gporca/server/fixdxl.sh b/gpcontrib/gp_orca/gporca/server/fixdxl.sh similarity index 100% rename from src/backend/gporca/server/fixdxl.sh rename to gpcontrib/gp_orca/gporca/server/fixdxl.sh diff --git a/src/backend/gporca/server/include/unittest/base.h b/gpcontrib/gp_orca/gporca/server/include/unittest/base.h similarity index 100% rename from src/backend/gporca/server/include/unittest/base.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/base.h diff --git a/src/backend/gporca/server/include/unittest/dxl/CDXLMemoryManagerTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/dxl/CDXLMemoryManagerTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/dxl/CDXLMemoryManagerTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/dxl/CDXLMemoryManagerTest.h diff --git a/src/backend/gporca/server/include/unittest/dxl/CDXLUtilsTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/dxl/CDXLUtilsTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/dxl/CDXLUtilsTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/dxl/CDXLUtilsTest.h diff --git a/src/backend/gporca/server/include/unittest/dxl/CParseHandlerCostModelTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/dxl/CParseHandlerCostModelTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/dxl/CParseHandlerCostModelTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/dxl/CParseHandlerCostModelTest.h diff --git a/src/backend/gporca/server/include/unittest/dxl/CParseHandlerManagerTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/dxl/CParseHandlerManagerTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/dxl/CParseHandlerManagerTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/dxl/CParseHandlerManagerTest.h diff --git a/src/backend/gporca/server/include/unittest/dxl/CParseHandlerOptimizerConfigSerializeTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/dxl/CParseHandlerOptimizerConfigSerializeTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/dxl/CParseHandlerOptimizerConfigSerializeTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/dxl/CParseHandlerOptimizerConfigSerializeTest.h diff --git a/src/backend/gporca/server/include/unittest/dxl/CParseHandlerTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/dxl/CParseHandlerTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/dxl/CParseHandlerTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/dxl/CParseHandlerTest.h diff --git a/src/backend/gporca/server/include/unittest/dxl/CXMLSerializerTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/dxl/CXMLSerializerTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/dxl/CXMLSerializerTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/dxl/CXMLSerializerTest.h diff --git a/src/backend/gporca/server/include/unittest/dxl/base/CDatumTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/dxl/base/CDatumTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/dxl/base/CDatumTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/dxl/base/CDatumTest.h diff --git a/src/backend/gporca/server/include/unittest/dxl/statistics/CBucketTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/dxl/statistics/CBucketTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/dxl/statistics/CBucketTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/dxl/statistics/CBucketTest.h diff --git a/src/backend/gporca/server/include/unittest/dxl/statistics/CCardinalityTestUtils.h b/gpcontrib/gp_orca/gporca/server/include/unittest/dxl/statistics/CCardinalityTestUtils.h similarity index 100% rename from src/backend/gporca/server/include/unittest/dxl/statistics/CCardinalityTestUtils.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/dxl/statistics/CCardinalityTestUtils.h diff --git a/src/backend/gporca/server/include/unittest/dxl/statistics/CFilterCardinalityTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/dxl/statistics/CFilterCardinalityTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/dxl/statistics/CFilterCardinalityTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/dxl/statistics/CFilterCardinalityTest.h diff --git a/src/backend/gporca/server/include/unittest/dxl/statistics/CHistogramTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/dxl/statistics/CHistogramTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/dxl/statistics/CHistogramTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/dxl/statistics/CHistogramTest.h diff --git a/src/backend/gporca/server/include/unittest/dxl/statistics/CJoinCardinalityTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/dxl/statistics/CJoinCardinalityTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/dxl/statistics/CJoinCardinalityTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/dxl/statistics/CJoinCardinalityTest.h diff --git a/src/backend/gporca/server/include/unittest/dxl/statistics/CMCVTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/dxl/statistics/CMCVTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/dxl/statistics/CMCVTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/dxl/statistics/CMCVTest.h diff --git a/src/backend/gporca/server/include/unittest/dxl/statistics/CPointTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/dxl/statistics/CPointTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/dxl/statistics/CPointTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/dxl/statistics/CPointTest.h diff --git a/src/backend/gporca/server/include/unittest/dxl/statistics/CStatisticsTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/dxl/statistics/CStatisticsTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/dxl/statistics/CStatisticsTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/dxl/statistics/CStatisticsTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/CConstExprEvaluatorForDates.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/CConstExprEvaluatorForDates.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/CConstExprEvaluatorForDates.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/CConstExprEvaluatorForDates.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/CSubqueryTestUtils.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/CSubqueryTestUtils.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/CSubqueryTestUtils.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/CSubqueryTestUtils.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/CTestUtils.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/CTestUtils.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/CTestUtils.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/CTestUtils.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/base/CColRefSetIterTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/base/CColRefSetIterTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/base/CColRefSetIterTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/base/CColRefSetIterTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/base/CColRefSetTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/base/CColRefSetTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/base/CColRefSetTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/base/CColRefSetTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/base/CColumnFactoryTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/base/CColumnFactoryTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/base/CColumnFactoryTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/base/CColumnFactoryTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/base/CConstraintTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/base/CConstraintTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/base/CConstraintTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/base/CConstraintTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/base/CDistributionSpecTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/base/CDistributionSpecTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/base/CDistributionSpecTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/base/CDistributionSpecTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/base/CEquivalenceClassesTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/base/CEquivalenceClassesTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/base/CEquivalenceClassesTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/base/CEquivalenceClassesTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/base/CFunctionalDependencyTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/base/CFunctionalDependencyTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/base/CFunctionalDependencyTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/base/CFunctionalDependencyTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/base/CGroupTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/base/CGroupTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/base/CGroupTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/base/CGroupTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/base/CKeyCollectionTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/base/CKeyCollectionTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/base/CKeyCollectionTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/base/CKeyCollectionTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/base/CMaxCardTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/base/CMaxCardTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/base/CMaxCardTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/base/CMaxCardTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/base/COrderSpecTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/base/COrderSpecTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/base/COrderSpecTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/base/COrderSpecTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/base/CRangeTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/base/CRangeTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/base/CRangeTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/base/CRangeTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/base/CStateMachineTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/base/CStateMachineTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/base/CStateMachineTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/base/CStateMachineTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/cost/CCostTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/cost/CCostTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/cost/CCostTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/cost/CCostTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/csq/CCorrelatedExecutionTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/csq/CCorrelatedExecutionTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/csq/CCorrelatedExecutionTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/csq/CCorrelatedExecutionTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/engine/CBindingTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/engine/CBindingTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/engine/CBindingTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/engine/CBindingTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/engine/CEngineTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/engine/CEngineTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/engine/CEngineTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/engine/CEngineTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/engine/CEnumeratorTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/engine/CEnumeratorTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/engine/CEnumeratorTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/engine/CEnumeratorTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/eval/CConstExprEvaluatorDXLTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/eval/CConstExprEvaluatorDXLTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/eval/CConstExprEvaluatorDXLTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/eval/CConstExprEvaluatorDXLTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/eval/CConstExprEvaluatorDefaultTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/eval/CConstExprEvaluatorDefaultTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/eval/CConstExprEvaluatorDefaultTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/eval/CConstExprEvaluatorDefaultTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/mdcache/CMDAccessorTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/mdcache/CMDAccessorTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/mdcache/CMDAccessorTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/mdcache/CMDAccessorTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/mdcache/CMDProviderTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/mdcache/CMDProviderTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/mdcache/CMDProviderTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/mdcache/CMDProviderTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/metadata/CColumnDescriptorTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/metadata/CColumnDescriptorTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/metadata/CColumnDescriptorTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/metadata/CColumnDescriptorTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/metadata/CIndexDescriptorTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/metadata/CIndexDescriptorTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/metadata/CIndexDescriptorTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/metadata/CIndexDescriptorTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/metadata/CNameTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/metadata/CNameTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/metadata/CNameTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/metadata/CNameTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/metadata/CTableDescriptorTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/metadata/CTableDescriptorTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/metadata/CTableDescriptorTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/metadata/CTableDescriptorTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CAggTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CAggTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/minidump/CAggTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CAggTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CArrayExpansionTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CArrayExpansionTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/minidump/CArrayExpansionTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CArrayExpansionTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CBitmapTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CBitmapTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/minidump/CBitmapTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CBitmapTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CCTETest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CCTETest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/minidump/CCTETest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CCTETest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CCastTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CCastTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/minidump/CCastTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CCastTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CCollapseProjectTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CCollapseProjectTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/minidump/CCollapseProjectTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CCollapseProjectTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CConstTblGetTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CConstTblGetTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/minidump/CConstTblGetTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CConstTblGetTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CDMLTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CDMLTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/minidump/CDMLTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CDMLTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CDirectDispatchTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CDirectDispatchTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/minidump/CDirectDispatchTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CDirectDispatchTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CEscapeMechanismTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CEscapeMechanismTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/minidump/CEscapeMechanismTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CEscapeMechanismTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CExternalTableTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CExternalTableTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/minidump/CExternalTableTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CExternalTableTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CICGTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CICGTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/minidump/CICGTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CICGTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CJoinOrderDPTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CJoinOrderDPTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/minidump/CJoinOrderDPTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CJoinOrderDPTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CMiniDumperDXLTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CMiniDumperDXLTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/minidump/CMiniDumperDXLTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CMiniDumperDXLTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CMinidumpWithConstExprEvaluatorTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CMinidumpWithConstExprEvaluatorTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/minidump/CMinidumpWithConstExprEvaluatorTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CMinidumpWithConstExprEvaluatorTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CMissingStatsTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CMissingStatsTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/minidump/CMissingStatsTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CMissingStatsTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CMultilevelPartitionTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CMultilevelPartitionTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/minidump/CMultilevelPartitionTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CMultilevelPartitionTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CPhysicalParallelUnionAllTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CPhysicalParallelUnionAllTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/minidump/CPhysicalParallelUnionAllTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CPhysicalParallelUnionAllTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CPruneColumnsTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CPruneColumnsTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/minidump/CPruneColumnsTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CPruneColumnsTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CPullUpProjectElementTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CPullUpProjectElementTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/minidump/CPullUpProjectElementTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CPullUpProjectElementTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CSubqueryTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CSubqueryTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/minidump/CSubqueryTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CSubqueryTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CTVFTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CTVFTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/minidump/CTVFTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CTVFTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CWindowTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CWindowTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/minidump/CWindowTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/CWindowTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/MinidumpTest.h.in b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/MinidumpTest.h.in similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/minidump/MinidumpTest.h.in rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/minidump/MinidumpTest.h.in diff --git a/src/backend/gporca/server/include/unittest/gpopt/operators/CContradictionTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/operators/CContradictionTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/operators/CContradictionTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/operators/CContradictionTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/operators/CExpressionPreprocessorTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/operators/CExpressionPreprocessorTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/operators/CExpressionPreprocessorTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/operators/CExpressionPreprocessorTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/operators/CExpressionTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/operators/CExpressionTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/operators/CExpressionTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/operators/CExpressionTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/operators/CLogicalGbAggTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/operators/CLogicalGbAggTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/operators/CLogicalGbAggTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/operators/CLogicalGbAggTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/operators/CPredicateUtilsTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/operators/CPredicateUtilsTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/operators/CPredicateUtilsTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/operators/CPredicateUtilsTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/operators/CScalarIsDistinctFromTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/operators/CScalarIsDistinctFromTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/operators/CScalarIsDistinctFromTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/operators/CScalarIsDistinctFromTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/search/COptimizationJobsTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/search/COptimizationJobsTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/search/COptimizationJobsTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/search/COptimizationJobsTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/search/CSearchStrategyTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/search/CSearchStrategyTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/search/CSearchStrategyTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/search/CSearchStrategyTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/search/CTreeMapTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/search/CTreeMapTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/search/CTreeMapTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/search/CTreeMapTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/translate/CTranslatorDXLToExprTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/translate/CTranslatorDXLToExprTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/translate/CTranslatorDXLToExprTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/translate/CTranslatorDXLToExprTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/translate/CTranslatorExprToDXLTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/translate/CTranslatorExprToDXLTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/translate/CTranslatorExprToDXLTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/translate/CTranslatorExprToDXLTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/xforms/CDecorrelatorTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/xforms/CDecorrelatorTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/xforms/CDecorrelatorTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/xforms/CDecorrelatorTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/xforms/CJoinOrderTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/xforms/CJoinOrderTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/xforms/CJoinOrderTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/xforms/CJoinOrderTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/xforms/CSubqueryHandlerTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/xforms/CSubqueryHandlerTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/xforms/CSubqueryHandlerTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/xforms/CSubqueryHandlerTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/xforms/CXformFactoryTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/xforms/CXformFactoryTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/xforms/CXformFactoryTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/xforms/CXformFactoryTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/xforms/CXformRightOuterJoin2HashJoinTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/xforms/CXformRightOuterJoin2HashJoinTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/xforms/CXformRightOuterJoin2HashJoinTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/xforms/CXformRightOuterJoin2HashJoinTest.h diff --git a/src/backend/gporca/server/include/unittest/gpopt/xforms/CXformTest.h b/gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/xforms/CXformTest.h similarity index 100% rename from src/backend/gporca/server/include/unittest/gpopt/xforms/CXformTest.h rename to gpcontrib/gp_orca/gporca/server/include/unittest/gpopt/xforms/CXformTest.h diff --git a/src/backend/gporca/server/src/startup/main.cpp b/gpcontrib/gp_orca/gporca/server/src/startup/main.cpp similarity index 100% rename from src/backend/gporca/server/src/startup/main.cpp rename to gpcontrib/gp_orca/gporca/server/src/startup/main.cpp diff --git a/src/backend/gporca/server/src/unittest/CConstExprEvaluatorForDates.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/CConstExprEvaluatorForDates.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/CConstExprEvaluatorForDates.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/CConstExprEvaluatorForDates.cpp diff --git a/src/backend/gporca/server/src/unittest/CSubqueryTestUtils.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/CSubqueryTestUtils.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/CSubqueryTestUtils.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/CSubqueryTestUtils.cpp diff --git a/src/backend/gporca/server/src/unittest/CTestUtils.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/CTestUtils.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/CTestUtils.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/CTestUtils.cpp diff --git a/src/backend/gporca/server/src/unittest/dxl/CDXLMemoryManagerTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/dxl/CDXLMemoryManagerTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/dxl/CDXLMemoryManagerTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/dxl/CDXLMemoryManagerTest.cpp diff --git a/src/backend/gporca/server/src/unittest/dxl/CDXLUtilsTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/dxl/CDXLUtilsTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/dxl/CDXLUtilsTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/dxl/CDXLUtilsTest.cpp diff --git a/src/backend/gporca/server/src/unittest/dxl/CMDProviderTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/dxl/CMDProviderTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/dxl/CMDProviderTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/dxl/CMDProviderTest.cpp diff --git a/src/backend/gporca/server/src/unittest/dxl/CParseHandlerCostModelTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/dxl/CParseHandlerCostModelTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/dxl/CParseHandlerCostModelTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/dxl/CParseHandlerCostModelTest.cpp diff --git a/src/backend/gporca/server/src/unittest/dxl/CParseHandlerManagerTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/dxl/CParseHandlerManagerTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/dxl/CParseHandlerManagerTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/dxl/CParseHandlerManagerTest.cpp diff --git a/src/backend/gporca/server/src/unittest/dxl/CParseHandlerOptimizerConfigSerializeTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/dxl/CParseHandlerOptimizerConfigSerializeTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/dxl/CParseHandlerOptimizerConfigSerializeTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/dxl/CParseHandlerOptimizerConfigSerializeTest.cpp diff --git a/src/backend/gporca/server/src/unittest/dxl/CParseHandlerTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/dxl/CParseHandlerTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/dxl/CParseHandlerTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/dxl/CParseHandlerTest.cpp diff --git a/src/backend/gporca/server/src/unittest/dxl/CXMLSerializerTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/dxl/CXMLSerializerTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/dxl/CXMLSerializerTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/dxl/CXMLSerializerTest.cpp diff --git a/src/backend/gporca/server/src/unittest/dxl/base/CDatumTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/dxl/base/CDatumTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/dxl/base/CDatumTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/dxl/base/CDatumTest.cpp diff --git a/src/backend/gporca/server/src/unittest/dxl/statistics/CBucketTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/dxl/statistics/CBucketTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/dxl/statistics/CBucketTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/dxl/statistics/CBucketTest.cpp diff --git a/src/backend/gporca/server/src/unittest/dxl/statistics/CCardinalityTestUtils.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/dxl/statistics/CCardinalityTestUtils.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/dxl/statistics/CCardinalityTestUtils.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/dxl/statistics/CCardinalityTestUtils.cpp diff --git a/src/backend/gporca/server/src/unittest/dxl/statistics/CFilterCardinalityTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/dxl/statistics/CFilterCardinalityTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/dxl/statistics/CFilterCardinalityTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/dxl/statistics/CFilterCardinalityTest.cpp diff --git a/src/backend/gporca/server/src/unittest/dxl/statistics/CHistogramTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/dxl/statistics/CHistogramTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/dxl/statistics/CHistogramTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/dxl/statistics/CHistogramTest.cpp diff --git a/src/backend/gporca/server/src/unittest/dxl/statistics/CJoinCardinalityTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/dxl/statistics/CJoinCardinalityTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/dxl/statistics/CJoinCardinalityTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/dxl/statistics/CJoinCardinalityTest.cpp diff --git a/src/backend/gporca/server/src/unittest/dxl/statistics/CMCVTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/dxl/statistics/CMCVTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/dxl/statistics/CMCVTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/dxl/statistics/CMCVTest.cpp diff --git a/src/backend/gporca/server/src/unittest/dxl/statistics/CPointTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/dxl/statistics/CPointTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/dxl/statistics/CPointTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/dxl/statistics/CPointTest.cpp diff --git a/src/backend/gporca/server/src/unittest/dxl/statistics/CStatisticsTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/dxl/statistics/CStatisticsTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/dxl/statistics/CStatisticsTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/dxl/statistics/CStatisticsTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CColRefSetIterTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/base/CColRefSetIterTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/base/CColRefSetIterTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/base/CColRefSetIterTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CColRefSetTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/base/CColRefSetTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/base/CColRefSetTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/base/CColRefSetTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CColumnFactoryTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/base/CColumnFactoryTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/base/CColumnFactoryTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/base/CColumnFactoryTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CConstraintTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/base/CConstraintTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/base/CConstraintTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/base/CConstraintTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CDistributionSpecTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/base/CDistributionSpecTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/base/CDistributionSpecTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/base/CDistributionSpecTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CEquivalenceClassesTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/base/CEquivalenceClassesTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/base/CEquivalenceClassesTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/base/CEquivalenceClassesTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CFunctionalDependencyTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/base/CFunctionalDependencyTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/base/CFunctionalDependencyTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/base/CFunctionalDependencyTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CGroupTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/base/CGroupTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/base/CGroupTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/base/CGroupTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CKeyCollectionTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/base/CKeyCollectionTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/base/CKeyCollectionTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/base/CKeyCollectionTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CMaxCardTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/base/CMaxCardTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/base/CMaxCardTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/base/CMaxCardTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/COrderSpecTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/base/COrderSpecTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/base/COrderSpecTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/base/COrderSpecTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CRangeTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/base/CRangeTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/base/CRangeTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/base/CRangeTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CStateMachineTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/base/CStateMachineTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/base/CStateMachineTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/base/CStateMachineTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/cost/CCostTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/cost/CCostTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/cost/CCostTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/cost/CCostTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/csq/CCorrelatedExecutionTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/csq/CCorrelatedExecutionTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/csq/CCorrelatedExecutionTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/csq/CCorrelatedExecutionTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/engine/CBindingTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/engine/CBindingTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/engine/CBindingTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/engine/CBindingTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/engine/CEngineTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/engine/CEngineTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/engine/CEngineTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/engine/CEngineTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/engine/CEnumeratorTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/engine/CEnumeratorTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/engine/CEnumeratorTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/engine/CEnumeratorTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/eval/CConstExprEvaluatorDXLTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/eval/CConstExprEvaluatorDXLTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/eval/CConstExprEvaluatorDXLTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/eval/CConstExprEvaluatorDXLTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/eval/CConstExprEvaluatorDefaultTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/eval/CConstExprEvaluatorDefaultTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/eval/CConstExprEvaluatorDefaultTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/eval/CConstExprEvaluatorDefaultTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/mdcache/CMDAccessorTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/mdcache/CMDAccessorTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/mdcache/CMDAccessorTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/mdcache/CMDAccessorTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/metadata/CColumnDescriptorTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/metadata/CColumnDescriptorTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/metadata/CColumnDescriptorTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/metadata/CColumnDescriptorTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/metadata/CIndexDescriptorTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/metadata/CIndexDescriptorTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/metadata/CIndexDescriptorTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/metadata/CIndexDescriptorTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/metadata/CNameTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/metadata/CNameTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/metadata/CNameTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/metadata/CNameTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/metadata/CTableDescriptorTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/metadata/CTableDescriptorTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/metadata/CTableDescriptorTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/metadata/CTableDescriptorTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CAggTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CAggTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/minidump/CAggTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CAggTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CArrayExpansionTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CArrayExpansionTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/minidump/CArrayExpansionTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CArrayExpansionTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CBitmapTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CBitmapTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/minidump/CBitmapTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CBitmapTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CCTETest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CCTETest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/minidump/CCTETest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CCTETest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CCastTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CCastTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/minidump/CCastTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CCastTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CCollapseProjectTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CCollapseProjectTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/minidump/CCollapseProjectTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CCollapseProjectTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CConstTblGetTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CConstTblGetTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/minidump/CConstTblGetTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CConstTblGetTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CDMLTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CDMLTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/minidump/CDMLTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CDMLTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CDirectDispatchTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CDirectDispatchTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/minidump/CDirectDispatchTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CDirectDispatchTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CEscapeMechanismTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CEscapeMechanismTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/minidump/CEscapeMechanismTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CEscapeMechanismTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CExternalTableTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CExternalTableTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/minidump/CExternalTableTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CExternalTableTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CICGTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CICGTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/minidump/CICGTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CICGTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CJoinOrderDPTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CJoinOrderDPTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/minidump/CJoinOrderDPTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CJoinOrderDPTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CMiniDumperDXLTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CMiniDumperDXLTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/minidump/CMiniDumperDXLTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CMiniDumperDXLTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CMinidumpWithConstExprEvaluatorTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CMinidumpWithConstExprEvaluatorTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/minidump/CMinidumpWithConstExprEvaluatorTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CMinidumpWithConstExprEvaluatorTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CMissingStatsTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CMissingStatsTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/minidump/CMissingStatsTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CMissingStatsTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CMultilevelPartitionTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CMultilevelPartitionTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/minidump/CMultilevelPartitionTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CMultilevelPartitionTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CPhysicalParallelUnionAllTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CPhysicalParallelUnionAllTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/minidump/CPhysicalParallelUnionAllTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CPhysicalParallelUnionAllTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CPruneColumnsTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CPruneColumnsTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/minidump/CPruneColumnsTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CPruneColumnsTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CPullUpProjectElementTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CPullUpProjectElementTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/minidump/CPullUpProjectElementTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CPullUpProjectElementTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CSubqueryTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CSubqueryTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/minidump/CSubqueryTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CSubqueryTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CTVFTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CTVFTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/minidump/CTVFTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CTVFTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CWindowTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CWindowTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/minidump/CWindowTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/CWindowTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/MinidumpTest.cpp.in b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/MinidumpTest.cpp.in similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/minidump/MinidumpTest.cpp.in rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/minidump/MinidumpTest.cpp.in diff --git a/src/backend/gporca/server/src/unittest/gpopt/operators/CContradictionTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/operators/CContradictionTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/operators/CContradictionTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/operators/CContradictionTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/operators/CExpressionPreprocessorTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/operators/CExpressionPreprocessorTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/operators/CExpressionPreprocessorTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/operators/CExpressionPreprocessorTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/operators/CExpressionTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/operators/CExpressionTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/operators/CExpressionTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/operators/CExpressionTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/operators/CLogicalGbAggTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/operators/CLogicalGbAggTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/operators/CLogicalGbAggTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/operators/CLogicalGbAggTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/operators/CPredicateUtilsTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/operators/CPredicateUtilsTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/operators/CPredicateUtilsTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/operators/CPredicateUtilsTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/operators/CScalarIsDistinctFromTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/operators/CScalarIsDistinctFromTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/operators/CScalarIsDistinctFromTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/operators/CScalarIsDistinctFromTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/search/COptimizationJobsTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/search/COptimizationJobsTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/search/COptimizationJobsTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/search/COptimizationJobsTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/search/CSearchStrategyTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/search/CSearchStrategyTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/search/CSearchStrategyTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/search/CSearchStrategyTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/search/CTreeMapTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/search/CTreeMapTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/search/CTreeMapTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/search/CTreeMapTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/translate/CTranslatorDXLToExprTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/translate/CTranslatorDXLToExprTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/translate/CTranslatorDXLToExprTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/translate/CTranslatorDXLToExprTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/translate/CTranslatorExprToDXLTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/translate/CTranslatorExprToDXLTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/translate/CTranslatorExprToDXLTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/translate/CTranslatorExprToDXLTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/xforms/CDecorrelatorTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/xforms/CDecorrelatorTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/xforms/CDecorrelatorTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/xforms/CDecorrelatorTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/xforms/CJoinOrderTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/xforms/CJoinOrderTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/xforms/CJoinOrderTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/xforms/CJoinOrderTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/xforms/CSubqueryHandlerTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/xforms/CSubqueryHandlerTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/xforms/CSubqueryHandlerTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/xforms/CSubqueryHandlerTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/xforms/CXformFactoryTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/xforms/CXformFactoryTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/xforms/CXformFactoryTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/xforms/CXformFactoryTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/xforms/CXformRightOuterJoin2HashJoinTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/xforms/CXformRightOuterJoin2HashJoinTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/xforms/CXformRightOuterJoin2HashJoinTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/xforms/CXformRightOuterJoin2HashJoinTest.cpp diff --git a/src/backend/gporca/server/src/unittest/gpopt/xforms/CXformTest.cpp b/gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/xforms/CXformTest.cpp similarity index 100% rename from src/backend/gporca/server/src/unittest/gpopt/xforms/CXformTest.cpp rename to gpcontrib/gp_orca/gporca/server/src/unittest/gpopt/xforms/CXformTest.cpp diff --git a/src/include/gpopt/.clang-format b/gpcontrib/gp_orca/include/gpopt/.clang-format similarity index 100% rename from src/include/gpopt/.clang-format rename to gpcontrib/gp_orca/include/gpopt/.clang-format diff --git a/src/include/gpopt/CGPOptimizer.h b/gpcontrib/gp_orca/include/gpopt/CGPOptimizer.h similarity index 100% rename from src/include/gpopt/CGPOptimizer.h rename to gpcontrib/gp_orca/include/gpopt/CGPOptimizer.h diff --git a/src/include/gpopt/config/CConfigParamMapping.h b/gpcontrib/gp_orca/include/gpopt/config/CConfigParamMapping.h similarity index 100% rename from src/include/gpopt/config/CConfigParamMapping.h rename to gpcontrib/gp_orca/include/gpopt/config/CConfigParamMapping.h diff --git a/src/include/gpopt/gpdbwrappers.h b/gpcontrib/gp_orca/include/gpopt/gpdbwrappers.h similarity index 100% rename from src/include/gpopt/gpdbwrappers.h rename to gpcontrib/gp_orca/include/gpopt/gpdbwrappers.h diff --git a/src/include/gpopt/relcache/CMDProviderRelcache.h b/gpcontrib/gp_orca/include/gpopt/relcache/CMDProviderRelcache.h similarity index 100% rename from src/include/gpopt/relcache/CMDProviderRelcache.h rename to gpcontrib/gp_orca/include/gpopt/relcache/CMDProviderRelcache.h diff --git a/src/include/gpopt/translate/CCTEListEntry.h b/gpcontrib/gp_orca/include/gpopt/translate/CCTEListEntry.h similarity index 100% rename from src/include/gpopt/translate/CCTEListEntry.h rename to gpcontrib/gp_orca/include/gpopt/translate/CCTEListEntry.h diff --git a/src/include/gpopt/translate/CContextDXLToPlStmt.h b/gpcontrib/gp_orca/include/gpopt/translate/CContextDXLToPlStmt.h similarity index 100% rename from src/include/gpopt/translate/CContextDXLToPlStmt.h rename to gpcontrib/gp_orca/include/gpopt/translate/CContextDXLToPlStmt.h diff --git a/src/include/gpopt/translate/CContextQueryToDXL.h b/gpcontrib/gp_orca/include/gpopt/translate/CContextQueryToDXL.h similarity index 100% rename from src/include/gpopt/translate/CContextQueryToDXL.h rename to gpcontrib/gp_orca/include/gpopt/translate/CContextQueryToDXL.h diff --git a/src/include/gpopt/translate/CDXLTranslateContext.h b/gpcontrib/gp_orca/include/gpopt/translate/CDXLTranslateContext.h similarity index 100% rename from src/include/gpopt/translate/CDXLTranslateContext.h rename to gpcontrib/gp_orca/include/gpopt/translate/CDXLTranslateContext.h diff --git a/src/include/gpopt/translate/CDXLTranslateContextBaseTable.h b/gpcontrib/gp_orca/include/gpopt/translate/CDXLTranslateContextBaseTable.h similarity index 100% rename from src/include/gpopt/translate/CDXLTranslateContextBaseTable.h rename to gpcontrib/gp_orca/include/gpopt/translate/CDXLTranslateContextBaseTable.h diff --git a/src/include/gpopt/translate/CGPDBAttInfo.h b/gpcontrib/gp_orca/include/gpopt/translate/CGPDBAttInfo.h similarity index 100% rename from src/include/gpopt/translate/CGPDBAttInfo.h rename to gpcontrib/gp_orca/include/gpopt/translate/CGPDBAttInfo.h diff --git a/src/include/gpopt/translate/CGPDBAttOptCol.h b/gpcontrib/gp_orca/include/gpopt/translate/CGPDBAttOptCol.h similarity index 100% rename from src/include/gpopt/translate/CGPDBAttOptCol.h rename to gpcontrib/gp_orca/include/gpopt/translate/CGPDBAttOptCol.h diff --git a/src/include/gpopt/translate/CIndexQualInfo.h b/gpcontrib/gp_orca/include/gpopt/translate/CIndexQualInfo.h similarity index 100% rename from src/include/gpopt/translate/CIndexQualInfo.h rename to gpcontrib/gp_orca/include/gpopt/translate/CIndexQualInfo.h diff --git a/src/include/gpopt/translate/CMappingColIdVar.h b/gpcontrib/gp_orca/include/gpopt/translate/CMappingColIdVar.h similarity index 100% rename from src/include/gpopt/translate/CMappingColIdVar.h rename to gpcontrib/gp_orca/include/gpopt/translate/CMappingColIdVar.h diff --git a/src/include/gpopt/translate/CMappingColIdVarPlStmt.h b/gpcontrib/gp_orca/include/gpopt/translate/CMappingColIdVarPlStmt.h similarity index 100% rename from src/include/gpopt/translate/CMappingColIdVarPlStmt.h rename to gpcontrib/gp_orca/include/gpopt/translate/CMappingColIdVarPlStmt.h diff --git a/src/include/gpopt/translate/CMappingElementColIdParamId.h b/gpcontrib/gp_orca/include/gpopt/translate/CMappingElementColIdParamId.h similarity index 100% rename from src/include/gpopt/translate/CMappingElementColIdParamId.h rename to gpcontrib/gp_orca/include/gpopt/translate/CMappingElementColIdParamId.h diff --git a/src/include/gpopt/translate/CMappingVarColId.h b/gpcontrib/gp_orca/include/gpopt/translate/CMappingVarColId.h similarity index 100% rename from src/include/gpopt/translate/CMappingVarColId.h rename to gpcontrib/gp_orca/include/gpopt/translate/CMappingVarColId.h diff --git a/src/include/gpopt/translate/COptColInfo.h b/gpcontrib/gp_orca/include/gpopt/translate/COptColInfo.h similarity index 100% rename from src/include/gpopt/translate/COptColInfo.h rename to gpcontrib/gp_orca/include/gpopt/translate/COptColInfo.h diff --git a/src/include/gpopt/translate/CPartPruneStepsBuilder.h b/gpcontrib/gp_orca/include/gpopt/translate/CPartPruneStepsBuilder.h similarity index 100% rename from src/include/gpopt/translate/CPartPruneStepsBuilder.h rename to gpcontrib/gp_orca/include/gpopt/translate/CPartPruneStepsBuilder.h diff --git a/src/include/gpopt/translate/CQueryMutators.h b/gpcontrib/gp_orca/include/gpopt/translate/CQueryMutators.h similarity index 100% rename from src/include/gpopt/translate/CQueryMutators.h rename to gpcontrib/gp_orca/include/gpopt/translate/CQueryMutators.h diff --git a/src/include/gpopt/translate/CTranslatorDXLToPlStmt.h b/gpcontrib/gp_orca/include/gpopt/translate/CTranslatorDXLToPlStmt.h similarity index 100% rename from src/include/gpopt/translate/CTranslatorDXLToPlStmt.h rename to gpcontrib/gp_orca/include/gpopt/translate/CTranslatorDXLToPlStmt.h diff --git a/src/include/gpopt/translate/CTranslatorDXLToScalar.h b/gpcontrib/gp_orca/include/gpopt/translate/CTranslatorDXLToScalar.h similarity index 100% rename from src/include/gpopt/translate/CTranslatorDXLToScalar.h rename to gpcontrib/gp_orca/include/gpopt/translate/CTranslatorDXLToScalar.h diff --git a/src/include/gpopt/translate/CTranslatorQueryToDXL.h b/gpcontrib/gp_orca/include/gpopt/translate/CTranslatorQueryToDXL.h similarity index 100% rename from src/include/gpopt/translate/CTranslatorQueryToDXL.h rename to gpcontrib/gp_orca/include/gpopt/translate/CTranslatorQueryToDXL.h diff --git a/src/include/gpopt/translate/CTranslatorRelcacheToDXL.h b/gpcontrib/gp_orca/include/gpopt/translate/CTranslatorRelcacheToDXL.h similarity index 100% rename from src/include/gpopt/translate/CTranslatorRelcacheToDXL.h rename to gpcontrib/gp_orca/include/gpopt/translate/CTranslatorRelcacheToDXL.h diff --git a/src/include/gpopt/translate/CTranslatorScalarToDXL.h b/gpcontrib/gp_orca/include/gpopt/translate/CTranslatorScalarToDXL.h similarity index 100% rename from src/include/gpopt/translate/CTranslatorScalarToDXL.h rename to gpcontrib/gp_orca/include/gpopt/translate/CTranslatorScalarToDXL.h diff --git a/src/include/gpopt/translate/CTranslatorUtils.h b/gpcontrib/gp_orca/include/gpopt/translate/CTranslatorUtils.h similarity index 100% rename from src/include/gpopt/translate/CTranslatorUtils.h rename to gpcontrib/gp_orca/include/gpopt/translate/CTranslatorUtils.h diff --git a/src/include/gpopt/utils/CConstExprEvaluatorProxy.h b/gpcontrib/gp_orca/include/gpopt/utils/CConstExprEvaluatorProxy.h similarity index 100% rename from src/include/gpopt/utils/CConstExprEvaluatorProxy.h rename to gpcontrib/gp_orca/include/gpopt/utils/CConstExprEvaluatorProxy.h diff --git a/src/include/gpopt/utils/CMemoryPoolPalloc.h b/gpcontrib/gp_orca/include/gpopt/utils/CMemoryPoolPalloc.h similarity index 100% rename from src/include/gpopt/utils/CMemoryPoolPalloc.h rename to gpcontrib/gp_orca/include/gpopt/utils/CMemoryPoolPalloc.h diff --git a/src/include/gpopt/utils/CMemoryPoolPallocManager.h b/gpcontrib/gp_orca/include/gpopt/utils/CMemoryPoolPallocManager.h similarity index 100% rename from src/include/gpopt/utils/CMemoryPoolPallocManager.h rename to gpcontrib/gp_orca/include/gpopt/utils/CMemoryPoolPallocManager.h diff --git a/src/include/gpopt/utils/COptTasks.h b/gpcontrib/gp_orca/include/gpopt/utils/COptTasks.h similarity index 100% rename from src/include/gpopt/utils/COptTasks.h rename to gpcontrib/gp_orca/include/gpopt/utils/COptTasks.h diff --git a/src/include/gpopt/utils/RelationWrapper.h b/gpcontrib/gp_orca/include/gpopt/utils/RelationWrapper.h similarity index 100% rename from src/include/gpopt/utils/RelationWrapper.h rename to gpcontrib/gp_orca/include/gpopt/utils/RelationWrapper.h diff --git a/src/include/gpopt/utils/funcs.h b/gpcontrib/gp_orca/include/gpopt/utils/funcs.h similarity index 100% rename from src/include/gpopt/utils/funcs.h rename to gpcontrib/gp_orca/include/gpopt/utils/funcs.h diff --git a/src/include/gpopt/utils/gpdbdefs.h b/gpcontrib/gp_orca/include/gpopt/utils/gpdbdefs.h similarity index 100% rename from src/include/gpopt/utils/gpdbdefs.h rename to gpcontrib/gp_orca/include/gpopt/utils/gpdbdefs.h diff --git a/src/include/optimizer/orca.h b/gpcontrib/gp_orca/include/optimizer/orca.h similarity index 97% rename from src/include/optimizer/orca.h rename to gpcontrib/gp_orca/include/optimizer/orca.h index d26903fc0856..b24b05d81fc9 100644 --- a/src/include/optimizer/orca.h +++ b/gpcontrib/gp_orca/include/optimizer/orca.h @@ -19,8 +19,6 @@ #include "pg_config.h" -#ifdef USE_ORCA - extern PlannedStmt * optimize_query(Query *parse, int cursorOptions, ParamListInfo boundParams); extern Node *transformGroupedWindows(Node *node, void *context); @@ -28,6 +26,4 @@ extern Node *transformGroupedWindows(Node *node, void *context); typedef void *(*plan_hint_hook_type) (Query *parse); extern PGDLLIMPORT plan_hint_hook_type plan_hint_hook; -#endif - #endif /* ORCA_H */ diff --git a/src/backend/optimizer/plan/orca.c b/gpcontrib/gp_orca/orca.c similarity index 100% rename from src/backend/optimizer/plan/orca.c rename to gpcontrib/gp_orca/orca.c diff --git a/gpcontrib/pg_hint_plan/pg_hint_plan.c b/gpcontrib/pg_hint_plan/pg_hint_plan.c index d5e919248dbd..d8d33507dc17 100644 --- a/gpcontrib/pg_hint_plan/pg_hint_plan.c +++ b/gpcontrib/pg_hint_plan/pg_hint_plan.c @@ -30,7 +30,6 @@ #include "optimizer/geqo.h" #endif #include "optimizer/joininfo.h" -#include "optimizer/orca.h" #include "optimizer/optimizer.h" #include "optimizer/pathnode.h" #include "optimizer/paths.h" @@ -412,7 +411,7 @@ static void pg_hint_plan_ProcessUtility(PlannedStmt *pstmt, ProcessUtilityContext context, ParamListInfo params, QueryEnvironment *queryEnv, DestReceiver *dest, char *completionTag); -#ifdef USE_ORCA +#ifdef USE_ORCA_RE static void *external_plan_hint_hook(Query *parse); #endif static PlannedStmt *pg_hint_plan_planner(Query *parse, int cursorOptions, @@ -575,7 +574,7 @@ static join_search_hook_type prev_join_search = NULL; static set_rel_pathlist_hook_type prev_set_rel_pathlist = NULL; static ProcessUtility_hook_type prev_ProcessUtility_hook = NULL; static ExecutorEnd_hook_type prev_ExecutorEnd = NULL; -#ifdef USE_ORCA +#ifdef USE_ORCA_RE static plan_hint_hook_type prev_plan_hint_hook = NULL; #endif @@ -733,7 +732,7 @@ _PG_init(void) ProcessUtility_hook = pg_hint_plan_ProcessUtility; prev_ExecutorEnd = ExecutorEnd_hook; ExecutorEnd_hook = pg_hint_ExecutorEnd; -#ifdef USE_ORCA +#ifdef USE_ORCA_RE prev_plan_hint_hook = plan_hint_hook; plan_hint_hook = external_plan_hint_hook; #endif @@ -761,7 +760,7 @@ _PG_fini(void) set_rel_pathlist_hook = prev_set_rel_pathlist; ProcessUtility_hook = prev_ProcessUtility_hook; ExecutorEnd_hook = prev_ExecutorEnd; -#ifdef USE_ORCA +#ifdef USE_ORCA_RE plan_hint_hook = prev_plan_hint_hook; #endif @@ -5038,7 +5037,7 @@ void plpgsql_query_erase_callback(ResourceReleasePhase phase, #include "pg_stat_statements.c" -#ifdef USE_ORCA +#ifdef USE_ORCA_RE /* * This function hook allows external code (i.e. backend) to parse a query into * hint structures. diff --git a/src/backend/Makefile b/src/backend/Makefile index 0b6e485ebbc4..c87fe52bc685 100644 --- a/src/backend/Makefile +++ b/src/backend/Makefile @@ -24,9 +24,7 @@ SUBDIRS = access bootstrap catalog parser commands executor foreign lib libpq \ jit SUBDIRS += fts cdb -ifeq ($(enable_orca),yes) -SUBDIRS += gporca gpopt -endif + include $(srcdir)/common.mk @@ -248,10 +246,6 @@ endif $(INSTALL_DATA) $(srcdir)/libpq/pg_hba.conf.sample '$(DESTDIR)$(datadir)/pg_hba.conf.sample' $(INSTALL_DATA) $(srcdir)/libpq/pg_ident.conf.sample '$(DESTDIR)$(datadir)/pg_ident.conf.sample' $(INSTALL_DATA) $(srcdir)/utils/misc/postgresql.conf.sample '$(DESTDIR)$(datadir)/postgresql.conf.sample' -ifeq ($(enable_orca), yes) - $(MAKE) -C gporca $@ INSTLOC=$(DESTDIR)$(libdir) - $(MAKE) -C gpopt $@ INSTLOC=$(DESTDIR)$(libdir) -endif ifeq ($(with_llvm), yes) install-bin: install-postgres-bitcode diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c index c5996c438842..5cce220de8f9 100644 --- a/src/backend/commands/explain.c +++ b/src/backend/commands/explain.c @@ -53,9 +53,8 @@ #include "optimizer/clauses.h" #include "optimizer/tlist.h" #include "optimizer/optimizer.h" -#include "optimizer/orca.h" -#ifdef USE_ORCA +#ifdef USE_ORCA_RE extern char *SerializeDXLPlan(Query *parse); #endif @@ -80,7 +79,7 @@ static void ExplainOneQuery(Query *query, int cursorOptions, static void report_triggers(ResultRelInfo *rInfo, bool show_relname, ExplainState *es); -#ifdef USE_ORCA +#ifdef USE_ORCA_RE static void ExplainDXL(Query *query, ExplainState *es, const char *queryString, ParamListInfo params); @@ -375,7 +374,7 @@ ExplainResultDesc(ExplainStmt *stmt) return tupdesc; } -#ifdef USE_ORCA +#ifdef USE_ORCA_RE /* * ExplainDXL - * print out the execution plan for one Query in DXL format @@ -476,7 +475,7 @@ ExplainOneQuery(Query *query, int cursorOptions, const char *queryString, ParamListInfo params, QueryEnvironment *queryEnv) { -#ifdef USE_ORCA +#ifdef USE_ORCA_RE if (es->dxl) { ExplainDXL(query, es, queryString, params); @@ -983,10 +982,8 @@ ExplainPrintPlan(ExplainState *es, QueryDesc *queryDesc) */ if (queryDesc->plannedstmt->planGen == PLANGEN_PLANNER) ExplainPropertyStringInfo("Optimizer", es, "Postgres-based planner"); -#ifdef USE_ORCA else ExplainPropertyStringInfo("Optimizer", es, "GPORCA"); -#endif ExplainPrintSettings(es); } diff --git a/src/backend/gpopt/Makefile b/src/backend/gpopt/Makefile deleted file mode 100644 index ef160e3478e7..000000000000 --- a/src/backend/gpopt/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -#------------------------------------------------------------------------- -# -# Makefile-- -# Makefile for gpopt -# -#------------------------------------------------------------------------- - -subdir = src/backend/gpopt -top_builddir = ../../.. -include $(top_builddir)/src/Makefile.global -include $(srcdir)/gpopt.mk - -SUBDIRS = config translate relcache utils - -OBJS = CGPOptimizer.o gpdbwrappers.o - -include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/gpopt/config/Makefile b/src/backend/gpopt/config/Makefile deleted file mode 100644 index 8e9c5ca9cf71..000000000000 --- a/src/backend/gpopt/config/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -#------------------------------------------------------------------------- -# -# Makefile-- -# Makefile for gpopt -# -#------------------------------------------------------------------------- - -subdir = src/backend/gpopt/config -top_builddir = ../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gpopt/gpopt.mk - -OBJS = CConfigParamMapping.o - -include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/gpopt/gpopt.mk b/src/backend/gpopt/gpopt.mk deleted file mode 100644 index 5f7134eb5722..000000000000 --- a/src/backend/gpopt/gpopt.mk +++ /dev/null @@ -1,9 +0,0 @@ -override CPPFLAGS := -I$(top_srcdir)/src/backend/gporca/libgpos/include $(CPPFLAGS) -override CPPFLAGS := -I$(top_srcdir)/src/backend/gporca/libgpopt/include $(CPPFLAGS) -override CPPFLAGS := -I$(top_srcdir)/src/backend/gporca/libnaucrates/include $(CPPFLAGS) -override CPPFLAGS := -I$(top_srcdir)/src/backend/gporca/libgpdbcost/include $(CPPFLAGS) - -# orca is not accessed in JIT (executor stage), avoid the generation of .bc here -# NOTE: accordingly we MUST avoid them in install step (install-postgres-bitcode -# in src/backend/Makefile) -with_llvm = no diff --git a/src/backend/gpopt/relcache/Makefile b/src/backend/gpopt/relcache/Makefile deleted file mode 100644 index e9332a3db103..000000000000 --- a/src/backend/gpopt/relcache/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -#------------------------------------------------------------------------- -# -# Makefile-- -# Makefile for gpopt -# -#------------------------------------------------------------------------- - -subdir = src/backend/gpopt/relcache -top_builddir = ../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gpopt/gpopt.mk - -OBJS = CMDProviderRelcache.o - -include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/gpopt/translate/Makefile b/src/backend/gpopt/translate/Makefile deleted file mode 100644 index 60d5f244c732..000000000000 --- a/src/backend/gpopt/translate/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -#------------------------------------------------------------------------- -# -# Makefile-- -# Makefile for gpopt -# -#------------------------------------------------------------------------- - -subdir = src/backend/gpopt/translate -top_builddir = ../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gpopt/gpopt.mk - -OBJS = CMappingColIdVar.o \ - CMappingVarColId.o \ - CPartPruneStepsBuilder.o \ - CMappingElementColIdParamId.o \ - CMappingColIdVarPlStmt.o \ - CDXLTranslateContextBaseTable.o \ - CCTEListEntry.o \ - CContextDXLToPlStmt.o \ - CDXLTranslateContext.o \ - CQueryMutators.o \ - CTranslatorScalarToDXL.o \ - CTranslatorDXLToScalar.o \ - CTranslatorUtils.o \ - CTranslatorRelcacheToDXL.o \ - CContextQueryToDXL.o \ - CTranslatorQueryToDXL.o \ - CTranslatorDXLToPlStmt.o - -include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/gpopt/utils/Makefile b/src/backend/gpopt/utils/Makefile deleted file mode 100644 index 2d21f083ad97..000000000000 --- a/src/backend/gpopt/utils/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -#------------------------------------------------------------------------- -# -# Makefile-- -# Makefile for gpopt -# -#------------------------------------------------------------------------- - -subdir = src/backend/gpopt/utils -top_builddir = ../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gpopt/gpopt.mk - -OBJS = COptTasks.o CConstExprEvaluatorProxy.o CMemoryPoolPalloc.o CMemoryPoolPallocManager.o funcs.o RelationWrapper.o - -include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/gporca/Makefile b/src/backend/gporca/Makefile deleted file mode 100644 index ff20ba2ae801..000000000000 --- a/src/backend/gporca/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -# Makefile for optimizer -# -# src/backend/gporca/Makefile -# - -subdir = src/backend/gporca -top_builddir = ../../.. -include $(top_builddir)/src/Makefile.global - -SUBDIRS = libgpos libgpdbcost libnaucrates libgpopt - -include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/gporca/gporca.mk b/src/backend/gporca/gporca.mk deleted file mode 100644 index 5aa2c88887c4..000000000000 --- a/src/backend/gporca/gporca.mk +++ /dev/null @@ -1,12 +0,0 @@ -override CPPFLAGS := -I$(top_srcdir)/src/backend/gporca/libgpos/include $(CPPFLAGS) -override CPPFLAGS := -I$(top_srcdir)/src/backend/gporca/libgpopt/include $(CPPFLAGS) -override CPPFLAGS := -I$(top_srcdir)/src/backend/gporca/libnaucrates/include $(CPPFLAGS) -override CPPFLAGS := -I$(top_srcdir)/src/backend/gporca/libgpdbcost/include $(CPPFLAGS) -# Do not omit frame pointer. Even with RELEASE builds, it is used for -# backtracing. -override CXXFLAGS := -Werror -Wextra -Wpedantic -fno-omit-frame-pointer $(CXXFLAGS) - -# orca is not accessed in JIT (executor stage), avoid the generation of .bc here -# NOTE: accordingly we MUST avoid them in install step (install-postgres-bitcode -# in src/backend/Makefile) -with_llvm = no diff --git a/src/backend/gporca/libgpdbcost/Makefile b/src/backend/gporca/libgpdbcost/Makefile deleted file mode 100644 index 36da8bb917bd..000000000000 --- a/src/backend/gporca/libgpdbcost/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libgpdbcost/Makefile -# - -subdir = src/backend/gporca/libgpdbcost -top_builddir = ../../../.. -include $(top_builddir)/src/Makefile.global - -SUBDIRS = src - -include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/gporca/libgpdbcost/src/Makefile b/src/backend/gporca/libgpdbcost/src/Makefile deleted file mode 100644 index 394bff7c0d1e..000000000000 --- a/src/backend/gporca/libgpdbcost/src/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libgpdbcost/src/Makefile -# - -subdir = src/backend/gporca/libgpdbcost/src -top_builddir = ../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -OBJS = CCostModelGPDB.o \ - CCostModelParamsGPDB.o \ - ICostModel.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/gporca/libgpopt/Makefile b/src/backend/gporca/libgpopt/Makefile deleted file mode 100644 index 4872a4fe657b..000000000000 --- a/src/backend/gporca/libgpopt/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libgpopt/Makefile -# - -subdir = src/backend/gporca/libgpopt -top_builddir = ../../../.. -include $(top_builddir)/src/Makefile.global - -SUBDIRS = src - -include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/gporca/libgpopt/src/Makefile b/src/backend/gporca/libgpopt/src/Makefile deleted file mode 100644 index 3e485b9df03b..000000000000 --- a/src/backend/gporca/libgpopt/src/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libgpopt/src/Makefile -# - -subdir = src/backend/gporca/libgpopt/src -top_builddir = ../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -SUBDIRS = base engine eval hints mdcache metadata minidump operators optimizer search translate xforms -OBJS = exception.o init.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/gporca/libgpopt/src/base/Makefile b/src/backend/gporca/libgpopt/src/base/Makefile deleted file mode 100644 index 604fd3a6fa45..000000000000 --- a/src/backend/gporca/libgpopt/src/base/Makefile +++ /dev/null @@ -1,80 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libgpopt/src/base/Makefile -# - -subdir = src/backend/gporca/libgpopt/src/base -top_builddir = ../../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -OBJS = CAutoOptCtxt.o \ - CCTEInfo.o \ - CCTEMap.o \ - CCTEReq.o \ - CCastUtils.o \ - CColConstraintsArrayMapper.o \ - CColConstraintsHashMapper.o \ - CColRef.o \ - CColRefComputed.o \ - CColRefSet.o \ - CColRefSetIter.o \ - CColRefTable.o \ - CColumnFactory.o \ - CConstraint.o \ - CConstraintConjunction.o \ - CConstraintDisjunction.o \ - CConstraintInterval.o \ - CConstraintNegation.o \ - CCostContext.o \ - CDatumSortedSet.o \ - CDefaultComparator.o \ - CDistributionSpecHashed.o \ - CDistributionSpecHashedNoOp.o \ - CDistributionSpecNonSingleton.o \ - CDistributionSpecRandom.o \ - CDistributionSpecReplicated.o \ - CDistributionSpecRouted.o \ - CDistributionSpecSingleton.o \ - CDistributionSpecStrictHashed.o \ - CDistributionSpecStrictRandom.o \ - CDistributionSpecStrictSingleton.o \ - CDistributionSpecUniversal.o \ - CDrvdProp.o \ - CDrvdPropCtxt.o \ - CDrvdPropCtxtPlan.o \ - CDrvdPropPlan.o \ - CDrvdPropRelational.o \ - CDrvdPropScalar.o \ - CEnfdDistribution.o \ - CEnfdOrder.o \ - CEnfdPartitionPropagation.o \ - CEnfdProp.o \ - CEnfdRewindability.o \ - CFunctionProp.o \ - CFunctionalDependency.o \ - CIOUtils.o \ - CKeyCollection.o \ - COptCtxt.o \ - COptimizationContext.o \ - COrderSpec.o \ - CPartInfo.o \ - CPartKeys.o \ - CPartitionPropagationSpec.o \ - CPrintPrefix.o \ - CPropConstraint.o \ - CQueryContext.o \ - CRange.o \ - CReqdProp.o \ - CReqdPropPlan.o \ - CReqdPropRelational.o \ - CRewindabilitySpec.o \ - CUtils.o \ - CWindowFrame.o \ - CWindowOids.o \ - IColConstraintsMapper.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/gporca/libgpopt/src/engine/Makefile b/src/backend/gporca/libgpopt/src/engine/Makefile deleted file mode 100644 index 2747dc2a5929..000000000000 --- a/src/backend/gporca/libgpopt/src/engine/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libgpopt/src/engine/Makefile -# - -subdir = src/backend/gporca/libgpopt/src/engine -top_builddir = ../../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -OBJS = CEngine.o \ - CEnumeratorConfig.o \ - CPartialPlan.o \ - CStatisticsConfig.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/gporca/libgpopt/src/eval/Makefile b/src/backend/gporca/libgpopt/src/eval/Makefile deleted file mode 100644 index 630e93fd479c..000000000000 --- a/src/backend/gporca/libgpopt/src/eval/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libgpopt/src/eval/Makefile -# - -subdir = src/backend/gporca/libgpopt/src/eval -top_builddir = ../../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -OBJS = CConstExprEvaluatorDXL.o \ - CConstExprEvaluatorDefault.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/gporca/libgpopt/src/hints/Makefile b/src/backend/gporca/libgpopt/src/hints/Makefile deleted file mode 100644 index 36cf66407634..000000000000 --- a/src/backend/gporca/libgpopt/src/hints/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libgpopt/src/hints/Makefile -# - -subdir = src/backend/gporca/libgpopt/src/hints -top_builddir = ../../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -OBJS = CPlanHint.o CScanHint.o CRowHint.o CJoinHint.o CHintUtils.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/gporca/libgpopt/src/mdcache/Makefile b/src/backend/gporca/libgpopt/src/mdcache/Makefile deleted file mode 100644 index b42684d54c2d..000000000000 --- a/src/backend/gporca/libgpopt/src/mdcache/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libgpopt/src/mdcache/Makefile -# - -subdir = src/backend/gporca/libgpopt/src/mdcache -top_builddir = ../../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -OBJS = CMDAccessor.o \ - CMDAccessorUtils.o \ - CMDCache.o \ - CMDKey.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/gporca/libgpopt/src/metadata/Makefile b/src/backend/gporca/libgpopt/src/metadata/Makefile deleted file mode 100644 index 442cf63e16d1..000000000000 --- a/src/backend/gporca/libgpopt/src/metadata/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libgpopt/src/metadata/Makefile -# - -subdir = src/backend/gporca/libgpopt/src/metadata -top_builddir = ../../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -OBJS = CColumnDescriptor.o \ - CIndexDescriptor.o \ - CName.o \ - CTableDescriptor.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/gporca/libgpopt/src/minidump/Makefile b/src/backend/gporca/libgpopt/src/minidump/Makefile deleted file mode 100644 index fa0958b31544..000000000000 --- a/src/backend/gporca/libgpopt/src/minidump/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libgpopt/src/minidump/Makefile -# - -subdir = src/backend/gporca/libgpopt/src/minidump -top_builddir = ../../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -OBJS = CDXLMinidump.o \ - CMetadataAccessorFactory.o \ - CMiniDumperDXL.o \ - CMinidumperUtils.o \ - CSerializableMDAccessor.o \ - CSerializableOptimizerConfig.o \ - CSerializablePlan.o \ - CSerializableQuery.o \ - CSerializableStackTrace.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/gporca/libgpopt/src/operators/Makefile b/src/backend/gporca/libgpopt/src/operators/Makefile deleted file mode 100644 index c495244b032d..000000000000 --- a/src/backend/gporca/libgpopt/src/operators/Makefile +++ /dev/null @@ -1,195 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libgpopt/src/operators/Makefile -# - -subdir = src/backend/gporca/libgpopt/src/operators -top_builddir = ../../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -OBJS = CExpression.o \ - CExpressionFactorizer.o \ - CExpressionHandle.o \ - CExpressionPreprocessor.o \ - CExpressionUtils.o \ - CHashedDistributions.o \ - CLogical.o \ - CLogicalApply.o \ - CLogicalAssert.o \ - CLogicalBitmapTableGet.o \ - CLogicalCTEAnchor.o \ - CLogicalCTEConsumer.o \ - CLogicalCTEProducer.o \ - CLogicalConstTableGet.o \ - CLogicalDML.o \ - CLogicalDelete.o \ - CLogicalDifference.o \ - CLogicalDifferenceAll.o \ - CLogicalDynamicBitmapTableGet.o \ - CLogicalDynamicGet.o \ - CLogicalDynamicGetBase.o \ - CLogicalDynamicIndexGet.o \ - CLogicalForeignGet.o \ - CLogicalFullOuterJoin.o \ - CLogicalGbAgg.o \ - CLogicalGbAggDeduplicate.o \ - CLogicalGet.o \ - CLogicalIndexApply.o \ - CLogicalIndexGet.o \ - CLogicalInnerApply.o \ - CLogicalInnerCorrelatedApply.o \ - CLogicalInnerJoin.o \ - CLogicalInsert.o \ - CLogicalIntersect.o \ - CLogicalIntersectAll.o \ - CLogicalJoin.o \ - CLogicalLeftAntiSemiApply.o \ - CLogicalLeftAntiSemiApplyNotIn.o \ - CLogicalLeftAntiSemiCorrelatedApply.o \ - CLogicalLeftAntiSemiCorrelatedApplyNotIn.o \ - CLogicalLeftAntiSemiJoin.o \ - CLogicalLeftAntiSemiJoinNotIn.o \ - CLogicalLeftOuterApply.o \ - CLogicalLeftOuterCorrelatedApply.o \ - CLogicalLeftOuterJoin.o \ - CLogicalLeftSemiApply.o \ - CLogicalLeftSemiApplyIn.o \ - CLogicalLeftSemiCorrelatedApply.o \ - CLogicalLeftSemiCorrelatedApplyIn.o \ - CLogicalLeftSemiJoin.o \ - CLogicalLimit.o \ - CLogicalMaxOneRow.o \ - CLogicalDynamicForeignGet.o \ - CLogicalNAryJoin.o \ - CLogicalProject.o \ - CLogicalRightOuterJoin.o \ - CLogicalSelect.o \ - CLogicalSequence.o \ - CLogicalSequenceProject.o \ - CLogicalSetOp.o \ - CLogicalSplit.o \ - CLogicalTVF.o \ - CLogicalUnary.o \ - CLogicalUnion.o \ - CLogicalUnionAll.o \ - CLogicalUpdate.o \ - CNormalizer.o \ - COperator.o \ - CPattern.o \ - CPhysical.o \ - CPhysicalAgg.o \ - CPhysicalAssert.o \ - CPhysicalBitmapTableScan.o \ - CPhysicalCTEConsumer.o \ - CPhysicalCTEProducer.o \ - CPhysicalComputeScalar.o \ - CPhysicalConstTableGet.o \ - CPhysicalDML.o \ - CPhysicalDynamicBitmapTableScan.o \ - CPhysicalDynamicIndexOnlyScan.o \ - CPhysicalDynamicIndexScan.o \ - CPhysicalDynamicScan.o \ - CPhysicalDynamicTableScan.o \ - CPhysicalForeignScan.o \ - CPhysicalFilter.o \ - CPhysicalFullMergeJoin.o \ - CPhysicalHashAgg.o \ - CPhysicalHashAggDeduplicate.o \ - CPhysicalHashJoin.o \ - CPhysicalIndexScan.o \ - CPhysicalIndexOnlyScan.o \ - CPhysicalInnerHashJoin.o \ - CPhysicalInnerIndexNLJoin.o \ - CPhysicalInnerNLJoin.o \ - CPhysicalJoin.o \ - CPhysicalLeftAntiSemiHashJoin.o \ - CPhysicalLeftAntiSemiHashJoinNotIn.o \ - CPhysicalLeftAntiSemiNLJoin.o \ - CPhysicalLeftOuterHashJoin.o \ - CPhysicalLeftOuterIndexNLJoin.o \ - CPhysicalLeftOuterNLJoin.o \ - CPhysicalLeftSemiHashJoin.o \ - CPhysicalLeftSemiNLJoin.o \ - CPhysicalFullHashJoin.o \ - CPhysicalLimit.o \ - CPhysicalMotion.o \ - CPhysicalMotionBroadcast.o \ - CPhysicalMotionGather.o \ - CPhysicalMotionHashDistribute.o \ - CPhysicalMotionRandom.o \ - CPhysicalMotionRoutedDistribute.o \ - CPhysicalDynamicForeignScan.o \ - CPhysicalNLJoin.o \ - CPhysicalParallelUnionAll.o \ - CPhysicalPartitionSelector.o \ - CPhysicalRightOuterHashJoin.o \ - CPhysicalScalarAgg.o \ - CPhysicalScan.o \ - CPhysicalSequence.o \ - CPhysicalSequenceProject.o \ - CPhysicalSerialUnionAll.o \ - CPhysicalSort.o \ - CPhysicalSplit.o \ - CPhysicalSpool.o \ - CPhysicalStreamAgg.o \ - CPhysicalStreamAggDeduplicate.o \ - CPhysicalTVF.o \ - CPhysicalTableScan.o \ - CPhysicalUnionAll.o \ - CPhysicalUnionAllFactory.o \ - CPredicateUtils.o \ - CScalar.o \ - CScalarAggFunc.o \ - CScalarArray.o \ - CScalarArrayCmp.o \ - CScalarArrayCoerceExpr.o \ - CScalarArrayRef.o \ - CScalarArrayRefIndexList.o \ - CScalarValuesList.o \ - CScalarAssertConstraint.o \ - CScalarAssertConstraintList.o \ - CScalarBitmapBoolOp.o \ - CScalarBitmapIndexProbe.o \ - CScalarBoolOp.o \ - CScalarBooleanTest.o \ - CScalarCaseTest.o \ - CScalarCast.o \ - CScalarCmp.o \ - CScalarCoalesce.o \ - CScalarCoerceBase.o \ - CScalarCoerceToDomain.o \ - CScalarCoerceViaIO.o \ - CScalarConst.o \ - CScalarDMLAction.o \ - CScalarFieldSelect.o \ - CScalarFunc.o \ - CScalarIdent.o \ - CScalarIf.o \ - CScalarIsDistinctFrom.o \ - CScalarMinMax.o \ - CScalarNAryJoinPredList.o \ - CScalarNullIf.o \ - CScalarNullTest.o \ - CScalarOp.o \ - CScalarParam.o \ - CScalarProjectElement.o \ - CScalarProjectList.o \ - CScalarSortGroupClause.o \ - CScalarSubquery.o \ - CScalarSubqueryAll.o \ - CScalarSubqueryAny.o \ - CScalarSubqueryExistential.o \ - CScalarSubqueryQuantified.o \ - CScalarSwitch.o \ - CScalarSwitchCase.o \ - CScalarWindowFunc.o \ - CStrictHashedDistributions.o \ - COrderedAggPreprocessor.o \ - CLeftJoinPruningPreprocessor.o \ - CJoinOrderHintsPreprocessor.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/gporca/libgpopt/src/optimizer/Makefile b/src/backend/gporca/libgpopt/src/optimizer/Makefile deleted file mode 100644 index 5f717213a451..000000000000 --- a/src/backend/gporca/libgpopt/src/optimizer/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libgpopt/src/optimizer/Makefile -# - -subdir = src/backend/gporca/libgpopt/src/optimizer -top_builddir = ../../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -OBJS = COptimizer.o COptimizerConfig.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/gporca/libgpopt/src/search/Makefile b/src/backend/gporca/libgpopt/src/search/Makefile deleted file mode 100644 index eabf2fc4e673..000000000000 --- a/src/backend/gporca/libgpopt/src/search/Makefile +++ /dev/null @@ -1,36 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libgpopt/src/search/Makefile -# - -subdir = src/backend/gporca/libgpopt/src/search -top_builddir = ../../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -OBJS = CBinding.o \ - CGroup.o \ - CGroupExpression.o \ - CGroupProxy.o \ - CJob.o \ - CJobFactory.o \ - CJobGroup.o \ - CJobGroupExploration.o \ - CJobGroupExpression.o \ - CJobGroupExpressionExploration.o \ - CJobGroupExpressionImplementation.o \ - CJobGroupExpressionOptimization.o \ - CJobGroupImplementation.o \ - CJobGroupOptimization.o \ - CJobQueue.o \ - CJobTest.o \ - CJobTransformation.o \ - CMemo.o \ - CScheduler.o \ - CSchedulerContext.o \ - CSearchStage.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/gporca/libgpopt/src/translate/Makefile b/src/backend/gporca/libgpopt/src/translate/Makefile deleted file mode 100644 index 093255cf55d6..000000000000 --- a/src/backend/gporca/libgpopt/src/translate/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libgpopt/src/translate/Makefile -# - -subdir = src/backend/gporca/libgpopt/src/translate -top_builddir = ../../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -OBJS = CTranslatorDXLToExpr.o \ - CTranslatorDXLToExprUtils.o \ - CTranslatorExprToDXL.o \ - CTranslatorExprToDXLUtils.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/gporca/libgpopt/src/xforms/Makefile b/src/backend/gporca/libgpopt/src/xforms/Makefile deleted file mode 100644 index addfb3402569..000000000000 --- a/src/backend/gporca/libgpopt/src/xforms/Makefile +++ /dev/null @@ -1,144 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libgpopt/src/xforms/Makefile -# - -subdir = src/backend/gporca/libgpopt/src/xforms -top_builddir = ../../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -OBJS = CDecorrelator.o \ - CJoinOrder.o \ - CJoinOrderDP.o \ - CJoinOrderDPv2.o \ - CJoinOrderGreedy.o \ - CJoinOrderMinCard.o \ - CSubqueryHandler.o \ - CXform.o \ - CXformCTEAnchor2Sequence.o \ - CXformCTEAnchor2TrivialSelect.o \ - CXformCollapseGbAgg.o \ - CXformCollapseProject.o \ - CXformDelete2DML.o \ - CXformDifference2LeftAntiSemiJoin.o \ - CXformDifferenceAll2LeftAntiSemiJoin.o \ - CXformDynamicGet2DynamicTableScan.o \ - CXformDynamicIndexOnlyGet2DynamicIndexOnlyScan.o \ - CXformDynamicIndexGet2DynamicIndexScan.o \ - CXformEagerAgg.o \ - CXformExpandDynamicGetWithForeignPartitions.o \ - CXformExpandFullOuterJoin.o \ - CXformExpandNAryJoin.o \ - CXformExpandNAryJoinDP.o \ - CXformExpandNAryJoinDPv2.o \ - CXformExpandNAryJoinGreedy.o \ - CXformExpandNAryJoinMinCard.o \ - CXformExploration.o \ - CXformForeignGet2ForeignScan.o \ - CXformFactory.o \ - CXformGbAgg2Apply.o \ - CXformGbAgg2HashAgg.o \ - CXformGbAgg2ScalarAgg.o \ - CXformGbAgg2StreamAgg.o \ - CXformGbAggDedup2HashAggDedup.o \ - CXformGbAggDedup2StreamAggDedup.o \ - CXformGbAggWithMDQA2Join.o \ - CXformGet2TableScan.o \ - CXformImplementAssert.o \ - CXformImplementBitmapTableGet.o \ - CXformImplementCTEConsumer.o \ - CXformImplementCTEProducer.o \ - CXformImplementConstTableGet.o \ - CXformImplementDML.o \ - CXformImplementDynamicBitmapTableGet.o \ - CXformImplementFullOuterMergeJoin.o \ - CXformImplementLimit.o \ - CXformImplementSequence.o \ - CXformImplementSequenceProject.o \ - CXformImplementSplit.o \ - CXformImplementTVF.o \ - CXformImplementTVFNoArgs.o \ - CXformImplementUnionAll.o \ - CXformImplementation.o \ - CXformIndexGet2IndexScan.o \ - CXformIndexOnlyGet2IndexOnlyScan.o \ - CXformInlineCTEConsumer.o \ - CXformInlineCTEConsumerUnderSelect.o \ - CXformInnerApply2InnerJoin.o \ - CXformInnerApply2InnerJoinNoCorrelations.o \ - CXformInnerApplyWithOuterKey2InnerJoin.o \ - CXformImplementInnerJoin.o \ - CXformInsert2DML.o \ - CXformIntersect2Join.o \ - CXformIntersectAll2LeftSemiJoin.o \ - CXformJoin2IndexApply.o \ - CXformPushJoinBelowUnionAll.o \ - CXformJoin2IndexApplyGeneric.o \ - CXformJoinAssociativity.o \ - CXformInnerJoinCommutativity.o \ - CXformFullJoinCommutativity.o \ - CXformLeftAntiSemiApply2LeftAntiSemiJoin.o \ - CXformLeftAntiSemiApply2LeftAntiSemiJoinNoCorrelations.o \ - CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotIn.o \ - CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotInNoCorrelations.o \ - CXformLeftAntiSemiJoin2CrossProduct.o \ - CXformLeftAntiSemiJoin2HashJoin.o \ - CXformLeftAntiSemiJoin2NLJoin.o \ - CXformLeftAntiSemiJoinNotIn2HashJoinNotIn.o \ - CXformLeftAntiSemiJoinNotIn2NLJoinNotIn.o \ - CXformLeftJoin2RightJoin.o \ - CXformLeftOuter2InnerUnionAllLeftAntiSemiJoin.o \ - CXformLeftOuterApply2LeftOuterJoin.o \ - CXformLeftOuterApply2LeftOuterJoinNoCorrelations.o \ - CXformLeftOuterJoin2HashJoin.o \ - CXformLeftOuterJoin2NLJoin.o \ - CXformLeftSemiApply2LeftSemiJoin.o \ - CXformLeftSemiApply2LeftSemiJoinNoCorrelations.o \ - CXformLeftSemiApplyWithExternalCorrs2InnerJoin.o \ - CXformLeftSemiJoin2CrossProduct.o \ - CXformLeftSemiJoin2HashJoin.o \ - CXformLeftSemiJoin2InnerJoin.o \ - CXformLeftSemiJoin2InnerJoinUnderGb.o \ - CXformLeftSemiJoin2NLJoin.o \ - CXformLimit2IndexGet.o \ - CXformMaxOneRow2Assert.o \ - CXformMinMax2IndexGet.o \ - CXformDynamicForeignGet2DynamicForeignScan.o \ - CXformProject2Apply.o \ - CXformProject2ComputeScalar.o \ - CXformPushDownLeftOuterJoin.o \ - CXformPushGbBelowJoin.o \ - CXformPushGbDedupBelowJoin.o \ - CXformPushGbWithHavingBelowJoin.o \ - CXformRemoveSubqDistinct.o \ - CXformResult.o \ - CXformRightOuterJoin2HashJoin.o \ - CXformFullOuterJoin2HashJoin.o \ - CXformSelect2Apply.o \ - CXformSelect2BitmapBoolOp.o \ - CXformSelect2DynamicIndexGet.o \ - CXformSelect2DynamicIndexOnlyGet.o \ - CXformSelect2Filter.o \ - CXformSelect2IndexGet.o \ - CXformSelect2IndexOnlyGet.o \ - CXformSequenceProject2Apply.o \ - CXformSimplifyGbAgg.o \ - CXformSimplifyLeftOuterJoin.o \ - CXformSimplifySubquery.o \ - CXformSplitDQA.o \ - CXformSplitGbAgg.o \ - CXformSplitGbAggDedup.o \ - CXformSplitLimit.o \ - CXformSubqJoin2Apply.o \ - CXformSubqueryUnnest.o \ - CXformUnion2UnionAll.o \ - CXformUnnestTVF.o \ - CXformUpdate2DML.o \ - CXformUtils.o \ - CxformSelect2DynamicBitmapBoolOp.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/gporca/libgpos/Makefile b/src/backend/gporca/libgpos/Makefile deleted file mode 100644 index 671567a171e4..000000000000 --- a/src/backend/gporca/libgpos/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/Makefile -# - -subdir = src/backend/gporca -top_builddir = ../../../.. -include $(top_builddir)/src/Makefile.global - -SUBDIRS = src - -include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/gporca/libgpos/src/Makefile b/src/backend/gporca/libgpos/src/Makefile deleted file mode 100644 index 880cad263973..000000000000 --- a/src/backend/gporca/libgpos/src/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/Makefile -# - -subdir = src/backend/gporca/libgpos/src -top_builddir = ../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -SUBDIRS = common error io memory string task -OBJS = _api.o utils.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/gporca/libgpos/src/common/Makefile b/src/backend/gporca/libgpos/src/common/Makefile deleted file mode 100644 index 979bb89f55db..000000000000 --- a/src/backend/gporca/libgpos/src/common/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libgpos/src/common/Makefile -# - -subdir = src/backend/gporca/libgpos/src/common -top_builddir = ../../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -OBJS = CAutoTimer.o \ - CBitSet.o \ - CBitSetIter.o \ - CBitVector.o \ - CDebugCounter.o \ - CHeapObject.o \ - CMainArgs.o \ - CRandom.o \ - CStackDescriptor.o \ - CStackObject.o \ - CTimerUser.o \ - CWallClock.o \ - clibwrapper.o \ - syslibwrapper.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/gporca/libgpos/src/error/Makefile b/src/backend/gporca/libgpos/src/error/Makefile deleted file mode 100644 index 71a6b45ff0e2..000000000000 --- a/src/backend/gporca/libgpos/src/error/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libgpos/src/error/Makefile -# - -subdir = src/backend/gporca/libgpos/src/error -top_builddir = ../../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -OBJS = CAutoExceptionStack.o \ - CAutoTrace.o \ - CErrorContext.o \ - CErrorHandlerStandard.o \ - CException.o \ - CLogger.o \ - CLoggerStream.o \ - CLoggerSyslog.o \ - CMessage.o \ - CMessageRepository.o \ - CMessageTable.o \ - CMiniDumper.o \ - CSerializable.o \ - ILogger.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/gporca/libgpos/src/io/Makefile b/src/backend/gporca/libgpos/src/io/Makefile deleted file mode 100644 index 90a079994ccc..000000000000 --- a/src/backend/gporca/libgpos/src/io/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libgpos/src/io/Makefile -# - -subdir = src/backend/gporca/libgpos/src/io -top_builddir = ../../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -OBJS = CFileDescriptor.o \ - CFileReader.o \ - CFileWriter.o \ - COstream.o \ - COstreamBasic.o \ - COstreamStdString.o \ - COstreamString.o \ - ioutils.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/gporca/libgpos/src/memory/Makefile b/src/backend/gporca/libgpos/src/memory/Makefile deleted file mode 100644 index 3339eaad4c6e..000000000000 --- a/src/backend/gporca/libgpos/src/memory/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libgpos/src/memory/Makefile -# - -subdir = src/backend/gporca/libgpos/src/memory -top_builddir = ../../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -OBJS = CAutoMemoryPool.o \ - CCacheFactory.o \ - CMemoryPool.o \ - CMemoryPoolManager.o \ - CMemoryPoolTracker.o \ - CMemoryVisitorPrint.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/gporca/libgpos/src/string/Makefile b/src/backend/gporca/libgpos/src/string/Makefile deleted file mode 100644 index 016b62d04cae..000000000000 --- a/src/backend/gporca/libgpos/src/string/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libgpos/src/string/Makefile -# - -subdir = src/backend/gporca/libgpos/src/string -top_builddir = ../../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -OBJS = CStringStatic.o \ - CWString.o \ - CWStringBase.o \ - CWStringConst.o \ - CWStringDynamic.o \ - CWStringStatic.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/gporca/libgpos/src/task/Makefile b/src/backend/gporca/libgpos/src/task/Makefile deleted file mode 100644 index 989ab2f2c3d4..000000000000 --- a/src/backend/gporca/libgpos/src/task/Makefile +++ /dev/null @@ -1,26 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/gporca/libgpos/src/task/Makefile -# - -subdir = src/backend/gporca/libgpos/src/task -top_builddir = ../../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -OBJS = CAutoSuspendAbort.o \ - CAutoTaskProxy.o \ - CAutoTraceFlag.o \ - CTask.o \ - CTaskContext.o \ - CTaskLocalStorage.o \ - CTaskSchedulerFifo.o \ - CWorker.o \ - CWorkerPoolManager.o \ - ITask.o \ - IWorker.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/gporca/libgpos/src/test/Makefile b/src/backend/gporca/libgpos/src/test/Makefile deleted file mode 100644 index e5244319b796..000000000000 --- a/src/backend/gporca/libgpos/src/test/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libgpos/src/test/Makefile -# - -subdir = src/backend/gporca/libgpos/src/memory -top_builddir = ../../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -include $(top_srcdir)/src/backend/common.mk - - diff --git a/src/backend/gporca/libnaucrates/Makefile b/src/backend/gporca/libnaucrates/Makefile deleted file mode 100644 index b8a00644f2a4..000000000000 --- a/src/backend/gporca/libnaucrates/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libnaucrates/Makefile -# - -subdir = src/backend/gporca/libnaucrates -top_builddir = ../../../.. -include $(top_builddir)/src/Makefile.global - -SUBDIRS = src - -include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/gporca/libnaucrates/src/Makefile b/src/backend/gporca/libnaucrates/src/Makefile deleted file mode 100644 index 45f00556a368..000000000000 --- a/src/backend/gporca/libnaucrates/src/Makefile +++ /dev/null @@ -1,22 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/Makefile -# - -subdir = src/backend/gporca/libnaucrates/src -top_builddir = ../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -SUBDIRS = base md operators parser statistics xml -OBJS = CCostModelConfigSerializer.o \ - CDXLUtils.o \ - CIdGenerator.o \ - exception.o \ - init.o \ - traceflags.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/gporca/libnaucrates/src/base/Makefile b/src/backend/gporca/libnaucrates/src/base/Makefile deleted file mode 100644 index 525b6e4f39a5..000000000000 --- a/src/backend/gporca/libnaucrates/src/base/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libnaucrates/src/base/Makefile -# - -subdir = src/backend/gporca/libnaucrates/src/base -top_builddir = ../../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -OBJS = CDatumBoolGPDB.o \ - CDatumGenericGPDB.o \ - CDatumInt2GPDB.o \ - CDatumInt4GPDB.o \ - CDatumInt8GPDB.o \ - CDatumOidGPDB.o \ - CQueryToDXLResult.o \ - IDatum.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/gporca/libnaucrates/src/md/Makefile b/src/backend/gporca/libnaucrates/src/md/Makefile deleted file mode 100644 index 84a2baa9fbdc..000000000000 --- a/src/backend/gporca/libnaucrates/src/md/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libnaucrates/src/md/Makefile -# - -subdir = src/backend/gporca/libnaucrates/src/md -top_builddir = ../../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -OBJS = CDXLBucket.o \ - CDXLColStats.o \ - CDXLRelStats.o \ - CDXLExtStatsInfo.o \ - CDXLExtStats.o \ - CDXLStatsDerivedColumn.o \ - CDXLStatsDerivedRelation.o \ - CMDAggregateGPDB.o \ - CMDArrayCoerceCastGPDB.o \ - CMDCastGPDB.o \ - CMDCheckConstraintGPDB.o \ - CMDColumn.o \ - CMDExtStatsInfo.o \ - CMDFunctionGPDB.o \ - CMDIdCast.o \ - CMDIdColStats.o \ - CMDIdGPDB.o \ - CMDIdGPDBCtas.o \ - CMDIdRelStats.o \ - CMDIdScCmp.o \ - CMDIndexGPDB.o \ - CMDIndexInfo.o \ - CMDName.o \ - CMDProviderGeneric.o \ - CMDProviderMemory.o \ - CMDRelationCtasGPDB.o \ - CMDRelationGPDB.o \ - CMDRequest.o \ - CMDScCmpGPDB.o \ - CMDScalarOpGPDB.o \ - CMDTypeBoolGPDB.o \ - CMDTypeGenericGPDB.o \ - CMDTypeInt2GPDB.o \ - CMDTypeInt4GPDB.o \ - CMDTypeInt8GPDB.o \ - CMDTypeOidGPDB.o \ - CSystemId.o \ - IMDCacheObject.o \ - IMDIndex.o \ - IMDProvider.o \ - IMDRelation.o \ - IMDType.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/gporca/libnaucrates/src/operators/Makefile b/src/backend/gporca/libnaucrates/src/operators/Makefile deleted file mode 100644 index 418bd5a0fd2a..000000000000 --- a/src/backend/gporca/libnaucrates/src/operators/Makefile +++ /dev/null @@ -1,158 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libnaucrates/src/operators/Makefile -# - -subdir = src/backend/gporca/libnaucrates/src/operators -top_builddir = ../../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -OBJS = CDXLColDescr.o \ - CDXLColRef.o \ - CDXLCtasStorageOptions.o \ - CDXLDatum.o \ - CDXLDatumBool.o \ - CDXLDatumGeneric.o \ - CDXLDatumInt2.o \ - CDXLDatumInt4.o \ - CDXLDatumInt8.o \ - CDXLDatumOid.o \ - CDXLDatumStatsDoubleMappable.o \ - CDXLDatumStatsLintMappable.o \ - CDXLDirectDispatchInfo.o \ - CDXLIndexDescr.o \ - CDXLLogical.o \ - CDXLLogicalCTAS.o \ - CDXLLogicalCTEAnchor.o \ - CDXLLogicalCTEConsumer.o \ - CDXLLogicalCTEProducer.o \ - CDXLLogicalConstTable.o \ - CDXLLogicalDelete.o \ - CDXLLogicalForeignGet.o \ - CDXLLogicalGet.o \ - CDXLLogicalGroupBy.o \ - CDXLLogicalInsert.o \ - CDXLLogicalJoin.o \ - CDXLLogicalLimit.o \ - CDXLLogicalProject.o \ - CDXLLogicalSelect.o \ - CDXLLogicalSetOp.o \ - CDXLLogicalTVF.o \ - CDXLLogicalUpdate.o \ - CDXLLogicalWindow.o \ - CDXLNode.o \ - CDXLOperator.o \ - CDXLOperatorCost.o \ - CDXLOperatorFactory.o \ - CDXLPhysical.o \ - CDXLPhysicalAbstractBitmapScan.o \ - CDXLPhysicalAgg.o \ - CDXLPhysicalAppend.o \ - CDXLPhysicalAssert.o \ - CDXLPhysicalBitmapTableScan.o \ - CDXLPhysicalBroadcastMotion.o \ - CDXLPhysicalCTAS.o \ - CDXLPhysicalCTEConsumer.o \ - CDXLPhysicalCTEProducer.o \ - CDXLPhysicalDML.o \ - CDXLPhysicalDynamicBitmapTableScan.o \ - CDXLPhysicalDynamicIndexScan.o \ - CDXLPhysicalDynamicIndexOnlyScan.o \ - CDXLPhysicalDynamicTableScan.o \ - CDXLPhysicalForeignScan.o \ - CDXLPhysicalGatherMotion.o \ - CDXLPhysicalHashJoin.o \ - CDXLPhysicalIndexOnlyScan.o \ - CDXLPhysicalIndexScan.o \ - CDXLPhysicalJoin.o \ - CDXLPhysicalLimit.o \ - CDXLPhysicalMaterialize.o \ - CDXLPhysicalMergeJoin.o \ - CDXLPhysicalMotion.o \ - CDXLPhysicalDynamicForeignScan.o \ - CDXLPhysicalNLJoin.o \ - CDXLPhysicalPartitionSelector.o \ - CDXLPhysicalProperties.o \ - CDXLPhysicalRandomMotion.o \ - CDXLPhysicalRedistributeMotion.o \ - CDXLPhysicalResult.o \ - CDXLPhysicalRoutedDistributeMotion.o \ - CDXLPhysicalSequence.o \ - CDXLPhysicalSort.o \ - CDXLPhysicalSplit.o \ - CDXLPhysicalTVF.o \ - CDXLPhysicalTableScan.o \ - CDXLPhysicalValuesScan.o \ - CDXLPhysicalWindow.o \ - CDXLProperties.o \ - CDXLScalar.o \ - CDXLScalarAggref.o \ - CDXLScalarArray.o \ - CDXLScalarArrayCoerceExpr.o \ - CDXLScalarArrayComp.o \ - CDXLScalarArrayRef.o \ - CDXLScalarArrayRefIndexList.o \ - CDXLScalarAssertConstraint.o \ - CDXLScalarAssertConstraintList.o \ - CDXLScalarBitmapBoolOp.o \ - CDXLScalarBitmapIndexProbe.o \ - CDXLScalarBoolExpr.o \ - CDXLScalarBooleanTest.o \ - CDXLScalarCaseTest.o \ - CDXLScalarCast.o \ - CDXLScalarCoalesce.o \ - CDXLScalarCoerceBase.o \ - CDXLScalarCoerceToDomain.o \ - CDXLScalarCoerceViaIO.o \ - CDXLScalarComp.o \ - CDXLScalarConstValue.o \ - CDXLScalarDMLAction.o \ - CDXLScalarDistinctComp.o \ - CDXLScalarFieldSelect.o \ - CDXLScalarFilter.o \ - CDXLScalarFuncExpr.o \ - CDXLScalarHashCondList.o \ - CDXLScalarHashExpr.o \ - CDXLScalarHashExprList.o \ - CDXLScalarIdent.o \ - CDXLScalarIfStmt.o \ - CDXLScalarIndexCondList.o \ - CDXLScalarJoinFilter.o \ - CDXLScalarLimitCount.o \ - CDXLScalarLimitOffset.o \ - CDXLScalarMergeCondList.o \ - CDXLScalarMinMax.o \ - CDXLScalarNullIf.o \ - CDXLScalarNullTest.o \ - CDXLScalarOneTimeFilter.o \ - CDXLScalarOpExpr.o \ - CDXLScalarOpList.o \ - CDXLScalarParam.o \ - CDXLScalarProjElem.o \ - CDXLScalarProjList.o \ - CDXLScalarRecheckCondFilter.o \ - CDXLScalarSortCol.o \ - CDXLScalarSortColList.o \ - CDXLScalarSubPlan.o \ - CDXLScalarSubquery.o \ - CDXLScalarSubqueryAll.o \ - CDXLScalarSubqueryAny.o \ - CDXLScalarSubqueryExists.o \ - CDXLScalarSubqueryNotExists.o \ - CDXLScalarSubqueryQuantified.o \ - CDXLScalarSwitch.o \ - CDXLScalarSwitchCase.o \ - CDXLScalarValuesList.o \ - CDXLScalarWindowFrameEdge.o \ - CDXLScalarWindowRef.o \ - CDXLSpoolInfo.o \ - CDXLTableDescr.o \ - CDXLWindowFrame.o \ - CDXLWindowKey.o \ - CDXLWindowSpec.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/gporca/libnaucrates/src/parser/Makefile b/src/backend/gporca/libnaucrates/src/parser/Makefile deleted file mode 100644 index d141742a0ff2..000000000000 --- a/src/backend/gporca/libnaucrates/src/parser/Makefile +++ /dev/null @@ -1,200 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libnaucrates/src/parser/Makefile -# - -subdir = src/backend/gporca/libnaucrates/src/parser -top_builddir = ../../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -OBJS = CParseHandlerAgg.o \ - CParseHandlerAppend.o \ - CParseHandlerArray.o \ - CParseHandlerAssert.o \ - CParseHandlerBase.o \ - CParseHandlerBroadcastMotion.o \ - CParseHandlerCTEConfig.o \ - CParseHandlerCTEList.o \ - CParseHandlerColDescr.o \ - CParseHandlerColStats.o \ - CParseHandlerColStatsBucket.o \ - CParseHandlerCondList.o \ - CParseHandlerCost.o \ - CParseHandlerCostModel.o \ - CParseHandlerCostParam.o \ - CParseHandlerCostParams.o \ - CParseHandlerCtasStorageOptions.o \ - CParseHandlerDXL.o \ - CParseHandlerDirectDispatchInfo.o \ - CParseHandlerDistinctComp.o \ - CParseHandlerDummy.o \ - CParseHandlerDynamicForeignScan.o \ - CParseHandlerDynamicIndexScan.o \ - CParseHandlerDynamicIndexOnlyScan.o \ - CParseHandlerDynamicTableScan.o \ - CParseHandlerEnumeratorConfig.o \ - CParseHandlerForeignScan.o \ - CParseHandlerFactory.o \ - CParseHandlerFilter.o \ - CParseHandlerGatherMotion.o \ - CParseHandlerGroupingColList.o \ - CParseHandlerHashExpr.o \ - CParseHandlerHashExprList.o \ - CParseHandlerHashJoin.o \ - CParseHandlerHint.o \ - CParseHandlerIndexCondList.o \ - CParseHandlerIndexDescr.o \ - CParseHandlerIndexOnlyScan.o \ - CParseHandlerIndexScan.o \ - CParseHandlerLimit.o \ - CParseHandlerLogicalCTAS.o \ - CParseHandlerLogicalCTEAnchor.o \ - CParseHandlerLogicalCTEConsumer.o \ - CParseHandlerLogicalCTEProducer.o \ - CParseHandlerLogicalConstTable.o \ - CParseHandlerLogicalDelete.o \ - CParseHandlerLogicalForeignGet.o \ - CParseHandlerLogicalGet.o \ - CParseHandlerLogicalGroupBy.o \ - CParseHandlerLogicalInsert.o \ - CParseHandlerLogicalJoin.o \ - CParseHandlerLogicalLimit.o \ - CParseHandlerLogicalOp.o \ - CParseHandlerLogicalProject.o \ - CParseHandlerLogicalSelect.o \ - CParseHandlerLogicalSetOp.o \ - CParseHandlerLogicalTVF.o \ - CParseHandlerLogicalUpdate.o \ - CParseHandlerLogicalWindow.o \ - CParseHandlerMDArrayCoerceCast.o \ - CParseHandlerMDCast.o \ - CParseHandlerMDGPDBAgg.o \ - CParseHandlerMDGPDBCheckConstraint.o \ - CParseHandlerMDGPDBFunc.o \ - CParseHandlerMDGPDBScalarOp.o \ - CParseHandlerMDIndex.o \ - CParseHandlerMDIndexInfoList.o \ - CParseHandlerMDRelation.o \ - CParseHandlerMDRelationCtas.o \ - CParseHandlerMDRequest.o \ - CParseHandlerMDScCmp.o \ - CParseHandlerMDType.o \ - CParseHandlerManager.o \ - CParseHandlerMaterialize.o \ - CParseHandlerMergeJoin.o \ - CParseHandlerMetadata.o \ - CParseHandlerMetadataColumn.o \ - CParseHandlerMetadataColumns.o \ - CParseHandlerMetadataIdList.o \ - CParseHandlerMetadataObject.o \ - CParseHandlerNLJIndexParam.o \ - CParseHandlerNLJIndexParamList.o \ - CParseHandlerNLJoin.o \ - CParseHandlerOp.o \ - CParseHandlerOptimizerConfig.o \ - CParseHandlerPartitionSelector.o \ - CParseHandlerPhysicalAbstractBitmapScan.o \ - CParseHandlerPhysicalBitmapTableScan.o \ - CParseHandlerPhysicalCTAS.o \ - CParseHandlerPhysicalCTEConsumer.o \ - CParseHandlerPhysicalCTEProducer.o \ - CParseHandlerPhysicalDML.o \ - CParseHandlerPhysicalDynamicBitmapTableScan.o \ - CParseHandlerPhysicalOp.o \ - CParseHandlerPhysicalSplit.o \ - CParseHandlerPhysicalTVF.o \ - CParseHandlerPhysicalWindow.o \ - CParseHandlerPlan.o \ - CParseHandlerPlanHint.o \ - CParseHandlerProjElem.o \ - CParseHandlerProjList.o \ - CParseHandlerProperties.o \ - CParseHandlerQuery.o \ - CParseHandlerQueryOutput.o \ - CParseHandlerRandomMotion.o \ - CParseHandlerRedistributeMotion.o \ - CParseHandlerRelStats.o \ - CParseHandlerRelationExtendedStats.o \ - CParseHandlerExtStatsInfo.o \ - CParseHandlerExtStats.o \ - CParseHandlerExtStatsDependency.o \ - CParseHandlerExtStatsDependencies.o \ - CParseHandlerExtStatsNDistinct.o \ - CParseHandlerExtStatsNDistinctList.o \ - CParseHandlerResult.o \ - CParseHandlerRoutedMotion.o \ - CParseHandlerScalarAggref.o \ - CParseHandlerScalarArrayCoerceExpr.o \ - CParseHandlerScalarArrayComp.o \ - CParseHandlerScalarArrayRef.o \ - CParseHandlerScalarArrayRefIndexList.o \ - CParseHandlerScalarAssertConstraintList.o \ - CParseHandlerScalarBitmapBoolOp.o \ - CParseHandlerScalarBitmapIndexProbe.o \ - CParseHandlerScalarBoolExpr.o \ - CParseHandlerScalarBooleanTest.o \ - CParseHandlerScalarCaseTest.o \ - CParseHandlerScalarCast.o \ - CParseHandlerScalarCoalesce.o \ - CParseHandlerScalarCoerceToDomain.o \ - CParseHandlerScalarCoerceViaIO.o \ - CParseHandlerScalarComp.o \ - CParseHandlerScalarConstValue.o \ - CParseHandlerScalarDMLAction.o \ - CParseHandlerScalarExpr.o \ - CParseHandlerScalarFieldSelect.o \ - CParseHandlerScalarFuncExpr.o \ - CParseHandlerScalarIdent.o \ - CParseHandlerScalarIfStmt.o \ - CParseHandlerScalarLimitCount.o \ - CParseHandlerScalarLimitOffset.o \ - CParseHandlerScalarMinMax.o \ - CParseHandlerScalarNullIf.o \ - CParseHandlerScalarNullTest.o \ - CParseHandlerScalarOp.o \ - CParseHandlerScalarOpExpr.o \ - CParseHandlerScalarOpList.o \ - CParseHandlerScalarParam.o \ - CParseHandlerScalarSubPlan.o \ - CParseHandlerScalarSubPlanParam.o \ - CParseHandlerScalarSubPlanParamList.o \ - CParseHandlerScalarSubPlanTestExpr.o \ - CParseHandlerScalarSubquery.o \ - CParseHandlerScalarSubqueryExists.o \ - CParseHandlerScalarSubqueryQuantified.o \ - CParseHandlerScalarSwitch.o \ - CParseHandlerScalarSwitchCase.o \ - CParseHandlerScalarValuesList.o \ - CParseHandlerScalarSortGroupClause.o \ - CParseHandlerScalarWindowFrameEdge.o \ - CParseHandlerScalarWindowRef.o \ - CParseHandlerSearchStage.o \ - CParseHandlerSearchStrategy.o \ - CParseHandlerSequence.o \ - CParseHandlerSort.o \ - CParseHandlerSortCol.o \ - CParseHandlerSortColList.o \ - CParseHandlerStackTrace.o \ - CParseHandlerStatistics.o \ - CParseHandlerStatisticsConfig.o \ - CParseHandlerStatsBound.o \ - CParseHandlerStatsDerivedColumn.o \ - CParseHandlerStatsDerivedRelation.o \ - CParseHandlerTableDescr.o \ - CParseHandlerTableScan.o \ - CParseHandlerTraceFlags.o \ - CParseHandlerUtils.o \ - CParseHandlerValuesScan.o \ - CParseHandlerWindowFrame.o \ - CParseHandlerWindowKey.o \ - CParseHandlerWindowKeyList.o \ - CParseHandlerWindowOids.o \ - CParseHandlerWindowSpec.o \ - CParseHandlerWindowSpecList.o \ - CParseHandlerXform.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/gporca/libnaucrates/src/statistics/Makefile b/src/backend/gporca/libnaucrates/src/statistics/Makefile deleted file mode 100644 index 88ac97404e89..000000000000 --- a/src/backend/gporca/libnaucrates/src/statistics/Makefile +++ /dev/null @@ -1,40 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libnaucrates/src/statistics/Makefile -# - -subdir = src/backend/gporca/libnaucrates/src/statistics -top_builddir = ../../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -OBJS = CBucket.o \ - CFilterStatsProcessor.o \ - CExtendedStatsProcessor.o \ - CGroupByStatsProcessor.o \ - CHistogram.o \ - CInnerJoinStatsProcessor.o \ - CJoinStatsProcessor.o \ - CLeftAntiSemiJoinStatsProcessor.o \ - CLeftOuterJoinStatsProcessor.o \ - CLeftSemiJoinStatsProcessor.o \ - CLimitStatsProcessor.o \ - CPoint.o \ - CProjectStatsProcessor.o \ - CScaleFactorUtils.o \ - CStatistics.o \ - CStatisticsUtils.o \ - CStatsPredConj.o \ - CStatsPredDisj.o \ - CStatsPredLike.o \ - CStatsPredPoint.o \ - CStatsPredArrayCmp.o \ - CStatsPredUnsupported.o \ - CStatsPredUtils.o \ - CUnionAllStatsProcessor.o \ - CUpperBoundNDVs.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/gporca/libnaucrates/src/xml/Makefile b/src/backend/gporca/libnaucrates/src/xml/Makefile deleted file mode 100644 index 8f49ca8dc5c2..000000000000 --- a/src/backend/gporca/libnaucrates/src/xml/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# -# Makefile for optimizer -# -# src/backend/gporca/libnaucrates/src/xml/Makefile -# - -subdir = src/backend/gporca/libnaucrates/src/xml -top_builddir = ../../../../../.. -include $(top_builddir)/src/Makefile.global - -include $(top_srcdir)/src/backend/gporca/gporca.mk - -OBJS = CDXLMemoryManager.o \ - CDXLSections.o \ - CXMLSerializer.o \ - dxltokens.o - -include $(top_srcdir)/src/backend/common.mk - diff --git a/src/backend/optimizer/plan/Makefile b/src/backend/optimizer/plan/Makefile index e1bd4106d595..ba7a8a110844 100644 --- a/src/backend/optimizer/plan/Makefile +++ b/src/backend/optimizer/plan/Makefile @@ -20,8 +20,4 @@ OBJS = analyzejoins.o createplan.o initsplan.o planagg.o planmain.o planner.o \ joinpartprune.o \ transform.o -ifeq ($(enable_orca),yes) -OBJS += orca.o -endif - include $(top_srcdir)/src/backend/common.mk diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c index 483b07a2b27e..7f19754d2ab0 100644 --- a/src/backend/optimizer/plan/planner.c +++ b/src/backend/optimizer/plan/planner.c @@ -82,7 +82,6 @@ #include "cdb/cdbtargeteddispatch.h" #include "cdb/cdbutil.h" #include "cdb/cdbvars.h" -#include "optimizer/orca.h" #include "storage/lmgr.h" #include "utils/guc.h" @@ -296,7 +295,7 @@ static split_rollup_data *make_new_rollups_for_hash_grouping_set(PlannerInfo *ro Path *path, grouping_sets_data *gd); -static void compute_jit_flags(PlannedStmt* pstmt); +void compute_jit_flags(PlannedStmt* pstmt); /***************************************************************************** * @@ -354,57 +353,6 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams) instr_time starttime; instr_time endtime; - /* - * Use ORCA only if it is enabled and we are in a coordinator QD process. - * - * ORCA excels in complex queries, most of which will access distributed - * tables. We can't run such queries from the segments slices anyway because - * they require dispatching a query within another - which is not allowed in - * GPDB (see querytree_safe_for_qe()). Note that this restriction also - * applies to non-QD coordinator slices. Furthermore, ORCA doesn't currently - * support pl/ statements (relevant when they are planned on the segments). - * For these reasons, restrict to using ORCA on the coordinator QD processes only. - * - * PARALLEL RETRIEVE CURSOR is not supported by ORCA yet. - */ - if (optimizer && - GP_ROLE_DISPATCH == Gp_role && - IS_QUERY_DISPATCHER() && - (cursorOptions & CURSOR_OPT_SKIP_FOREIGN_PARTITIONS) == 0 && - (cursorOptions & CURSOR_OPT_PARALLEL_RETRIEVE) == 0) - { - if (gp_log_optimization_time) - INSTR_TIME_SET_CURRENT(starttime); - -#ifdef USE_ORCA - result = optimize_query(parse, cursorOptions, boundParams); -#else - /* Make sure this branch is not taken in builds using --disable-orca. */ - Assert(false); - /* Keep compilers quiet in case the build used --disable-orca. */ - result = NULL; -#endif - - /* decide jit state */ - if (result) - { - /* - * Setting Jit flags for Optimizer - */ - compute_jit_flags(result); - } - - if (gp_log_optimization_time) - { - INSTR_TIME_SET_CURRENT(endtime); - INSTR_TIME_SUBTRACT(endtime, starttime); - elog(LOG, "Optimizer Time: %.3f ms", INSTR_TIME_GET_MILLISEC(endtime)); - } - - if (result) - return result; - } - /* * Fall back to using the PostgreSQL planner in case Orca didn't run (in * utility mode or on a segment) or if it didn't produce a plan. @@ -8762,7 +8710,7 @@ make_new_rollups_for_hash_grouping_set(PlannerInfo *root, * for Optimizer and used here for setting the JIT flags. * */ -static void compute_jit_flags(PlannedStmt* pstmt) +void compute_jit_flags(PlannedStmt* pstmt) { Plan* top_plan = pstmt->planTree; pstmt->jitFlags = PGJIT_NONE; diff --git a/src/backend/utils/adt/gp_optimizer_functions.c b/src/backend/utils/adt/gp_optimizer_functions.c index 79e60db9f6b1..1e93ad562562 100644 --- a/src/backend/utils/adt/gp_optimizer_functions.c +++ b/src/backend/utils/adt/gp_optimizer_functions.c @@ -24,7 +24,7 @@ extern Datum EnableXform(PG_FUNCTION_ARGS); Datum enable_xform(PG_FUNCTION_ARGS) { -#ifdef USE_ORCA +#ifdef USE_ORCA_RE return EnableXform(fcinfo); #else return CStringGetTextDatum("Server has been compiled without ORCA"); @@ -39,7 +39,7 @@ extern Datum DisableXform(PG_FUNCTION_ARGS); Datum disable_xform(PG_FUNCTION_ARGS) { -#ifdef USE_ORCA +#ifdef USE_ORCA_RE return DisableXform(fcinfo); #else return CStringGetTextDatum("Server has been compiled without ORCA"); @@ -54,7 +54,7 @@ extern Datum LibraryVersion(); Datum gp_opt_version(PG_FUNCTION_ARGS pg_attribute_unused()) { -#ifdef USE_ORCA +#ifdef USE_ORCA_RE return LibraryVersion(); #else return CStringGetTextDatum("Server has been compiled without ORCA"); diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c index 56f1be490b36..45341cabf33b 100644 --- a/src/backend/utils/init/postinit.c +++ b/src/backend/utils/init/postinit.c @@ -101,10 +101,6 @@ static void process_startup_options(Port *port, bool am_superuser); static void process_settings(Oid databaseid, Oid roleid); extern bool DoingCommandRead; -#ifdef USE_ORCA -extern void InitGPOPT(); -extern void TerminateGPOPT(); -#endif /*** InitPostgres support ***/ @@ -683,20 +679,6 @@ InitPostgres(const char *in_dbname, Oid dboid, const char *username, /* Initialize memory protection */ GPMemoryProtect_Init(); -#ifdef USE_ORCA - if (Gp_role == GP_ROLE_DISPATCH) - { - /* Initialize GPOPT */ - OptimizerMemoryContext = AllocSetContextCreate(TopMemoryContext, - "GPORCA Top-level Memory Context", - ALLOCSET_DEFAULT_MINSIZE, - ALLOCSET_DEFAULT_INITSIZE, - ALLOCSET_DEFAULT_MAXSIZE); - - InitGPOPT(); - } -#endif - /* * Initialize my entry in the shared-invalidation manager's array of * per-backend data. @@ -1460,16 +1442,6 @@ ShutdownPostgres(int code, Datum arg) */ ReportOOMConsumption(); -#ifdef USE_ORCA - if (Gp_role == GP_ROLE_DISPATCH) - { - TerminateGPOPT(); - - if (OptimizerMemoryContext != NULL) - MemoryContextDelete(OptimizerMemoryContext); - } -#endif - /* Disable memory protection */ GPMemoryProtect_Shutdown(); /* Release SessionState entry */ diff --git a/src/backend/utils/misc/guc_gp.c b/src/backend/utils/misc/guc_gp.c index 95338003ca22..b5c8e287c791 100644 --- a/src/backend/utils/misc/guc_gp.c +++ b/src/backend/utils/misc/guc_gp.c @@ -1869,11 +1869,7 @@ struct config_bool ConfigureNamesBool_gp[] = NULL }, &optimizer, -#ifdef USE_ORCA - true, -#else false, -#endif check_optimizer, NULL, NULL }, diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample index 971863114328..9f1650b0b074 100644 --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample @@ -693,6 +693,7 @@ optimizer_analyze_root_partition = on # stats collection on root partitions # - Shared Library Preloading - #shared_preload_libraries = '' # (change requires restart) +shared_preload_libraries = 'gp_orca' #local_preload_libraries = '' #session_preload_libraries = '' #jit_provider = 'llvmjit' # JIT library to use diff --git a/src/backend/utils/mmgr/memprot.c b/src/backend/utils/mmgr/memprot.c index 1b75c920f58a..ee8b7f71098d 100644 --- a/src/backend/utils/mmgr/memprot.c +++ b/src/backend/utils/mmgr/memprot.c @@ -245,7 +245,7 @@ GPMemoryProtect_TrackStartupMemory(void) */ bytes += 6L << BITS_IN_MB; -#ifdef USE_ORCA +//#ifdef USE_ORCA_RE /* When compile with ORCA it will commit 6MB more */ bytes += 6L << BITS_IN_MB; @@ -258,7 +258,7 @@ GPMemoryProtect_TrackStartupMemory(void) if (optimizer_use_gpdb_allocators) bytes -= 2L << BITS_IN_MB; #endif /* GP_VERSION_NUM */ -#endif /* USE_ORCA */ +//#endif /* USE_ORCA_RE */ /* Leave some buffer for extensions like metrics_collector */ bytes += 2L << BITS_IN_MB;