From 4df63329dc0447239c7f42d1aa492b107aa03790 Mon Sep 17 00:00:00 2001
From: Roman Eskin <r.eskin@arenadata.io>
Date: Thu, 7 Nov 2024 20:20:48 +1000
Subject: [PATCH 01/17] Add gp_orca extension skeleton (#1105)

This patch adds a skeleton for a new extension gpcontrib/gp_orca with empty
_PG_init and _PG_fini. The extension will be filled in consequent commits.
Plus this patch updates 'shared_preload_libraries' value in the
postgresql.conf.sample file if ORCA is enabled.
---
 gpcontrib/Makefile         |  3 +++
 gpcontrib/gp_orca/Makefile | 19 +++++++++++++++++++
 gpcontrib/gp_orca/gporca.c | 28 ++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 gpcontrib/gp_orca/Makefile
 create mode 100644 gpcontrib/gp_orca/gporca.c

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/Makefile b/gpcontrib/gp_orca/Makefile
new file mode 100644
index 000000000000..040e43fe2234
--- /dev/null
+++ b/gpcontrib/gp_orca/Makefile
@@ -0,0 +1,19 @@
+MODULE_big = gp_orca
+
+OBJS = gporca.o \
+
+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
+
+install: install-gp-orca
+
+install-gp-orca: $(DESTDIR)$(datadir)/postgresql.conf.sample
+	sed -i "s/#shared_preload_libraries = ''/shared_preload_libraries = 'gp_orca'/g" $(DESTDIR)$(datadir)/postgresql.conf.sample
diff --git a/gpcontrib/gp_orca/gporca.c b/gpcontrib/gp_orca/gporca.c
new file mode 100644
index 000000000000..7606dc82b77a
--- /dev/null
+++ b/gpcontrib/gp_orca/gporca.c
@@ -0,0 +1,28 @@
+#include "postgres.h"
+
+#include "cdb/cdbvars.h"
+#include "miscadmin.h"
+#include "utils/builtins.h"
+
+PG_MODULE_MAGIC;
+
+void		_PG_init(void);
+void		_PG_fini(void);
+
+void
+_PG_init(void)
+{
+	if (!process_shared_preload_libraries_in_progress)
+		ereport(ERROR,
+				(errcode(ERRCODE_INTERNAL_ERROR),
+				 errmsg("This module can only be loaded via shared_preload_libraries")));
+
+	if (!IS_QUERY_DISPATCHER())
+		return;
+}
+
+void
+_PG_fini(void)
+{
+}
+

From b1cffb6d888bfcc5f355b8b83f43b8144ec016a9 Mon Sep 17 00:00:00 2001
From: Roman Eskin <r.eskin@arenadata.io>
Date: Tue, 12 Nov 2024 17:45:42 +1000
Subject: [PATCH 02/17] Decouple Orca from the
 GPMemoryProtect_TrackStartupMemory() (#1108)

GPMemoryProtect_TrackStartupMemory() contained compile-time dependency on Orca.
It prevented moving of all Orca's code into a shared lib and making its work
transparent to the GPDB core.

This patch reworks the logic of the GPMemoryProtect_TrackStartupMemory(). Now
extension should call GPMemoryProtect_RequestAddinStartupMemory() at its
_PG_init(), if the extension affects the per-process startup committed memory.
Such call is added to the Orca's _PG_init(). Orca related code is removed from
the GPMemoryProtect_TrackStartupMemory().
---
 gpcontrib/gp_orca/gporca.c       | 13 +++++++++
 src/backend/utils/mmgr/memprot.c | 45 ++++++++++++++++++++------------
 src/include/utils/palloc.h       |  1 +
 3 files changed, 42 insertions(+), 17 deletions(-)

diff --git a/gpcontrib/gp_orca/gporca.c b/gpcontrib/gp_orca/gporca.c
index 7606dc82b77a..d9d90344c359 100644
--- a/gpcontrib/gp_orca/gporca.c
+++ b/gpcontrib/gp_orca/gporca.c
@@ -3,6 +3,8 @@
 #include "cdb/cdbvars.h"
 #include "miscadmin.h"
 #include "utils/builtins.h"
+#include "utils/guc.h"
+#include "utils/vmem_tracker.h"
 
 PG_MODULE_MAGIC;
 
@@ -19,6 +21,17 @@ _PG_init(void)
 
 	if (!IS_QUERY_DISPATCHER())
 		return;
+
+	/* When compile with ORCA it will commit 6MB more */
+	Size orca_mem = 6L << BITS_IN_MB;
+	/*
+	 * When optimizer_use_gpdb_allocators is on, at least 2MB of above will be
+	 * tracked by vmem tracker later, so do not recount them.
+	 */
+	if (optimizer_use_gpdb_allocators)
+		orca_mem -= (2L << BITS_IN_MB);
+
+	GPMemoryProtect_RequestAddinStartupMemory(orca_mem);
 }
 
 void
diff --git a/src/backend/utils/mmgr/memprot.c b/src/backend/utils/mmgr/memprot.c
index 1b75c920f58a..d5f50893723d 100644
--- a/src/backend/utils/mmgr/memprot.c
+++ b/src/backend/utils/mmgr/memprot.c
@@ -46,6 +46,9 @@
 int 		gp_max_alloc_size_mb = GP_MAX_ALLOC_SIZE_MB_DEFAULT;
 #endif
 
+static Size startup_mem_total_addin_request = 0;
+static bool startup_mem_addin_request_allowed = true;
+
 static void gp_failed_to_alloc(MemoryAllocationStatus ec, int en, int sz);
 
 /*
@@ -208,6 +211,23 @@ void GPMemoryProtect_Shutdown()
 	VmemTracker_Shutdown();
 }
 
+/*
+ * GPMemoryProtect_RequestAddinStartupMemory
+ *		Request that GPMemoryProtect_TrackStartupMemory will register additional
+ *		memory for use by a loadable module.
+ *
+ * This is only useful if called from the _PG_init hook of a library that
+ * is loaded into the postmaster via shared_preload_libraries.
+ */
+void
+GPMemoryProtect_RequestAddinStartupMemory(Size size)
+{
+	if (IsUnderPostmaster || !startup_mem_addin_request_allowed)
+		return;					/* too late */
+
+	startup_mem_total_addin_request = add_size(startup_mem_total_addin_request, size);
+}
+
 /*
  * Add the per-process startup committed memory to vmem tracker.
  *
@@ -235,7 +255,7 @@ void
 GPMemoryProtect_TrackStartupMemory(void)
 {
 	MemoryAllocationStatus status;
-	int64		bytes = 0;
+	Size		bytes = 0;
 
 	Assert(gp_mp_inited);
 
@@ -245,26 +265,17 @@ GPMemoryProtect_TrackStartupMemory(void)
 	 */
 	bytes += 6L << BITS_IN_MB;
 
-#ifdef USE_ORCA
-	/* When compile with ORCA it will commit 6MB more */
-	bytes += 6L << BITS_IN_MB;
-
-	/*
-	 * When optimizer_use_gpdb_allocators is on, at least 2MB of above will be
-	 * tracked by vmem tracker later, so do not recount them.  This GUC is not
-	 * available until gpdb 5.1.0 .
-	 */
-#if GP_VERSION_NUM >= 50100
-	if (optimizer_use_gpdb_allocators)
-		bytes -= 2L << BITS_IN_MB;
-#endif  /* GP_VERSION_NUM */
-#endif  /* USE_ORCA */
-
 	/* Leave some buffer for extensions like metrics_collector */
 	bytes += 2L << BITS_IN_MB;
 
+	/* freeze the addin request size and include it */
+	startup_mem_addin_request_allowed = false;
+	bytes = add_size(bytes, startup_mem_total_addin_request);
+
+	/* Ensure we do not overflow when converting to signed */
+	Assert((int64)bytes > 0);
 	/* Register the startup memory */
-	status = VmemTracker_RegisterStartupMemory(bytes);
+	status = VmemTracker_RegisterStartupMemory((int64)bytes);
 	if (status != MemoryAllocation_Success)
 		gp_failed_to_alloc(status, 0, bytes);
 }
diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h
index 8bd1aa9d3816..1fb9b7e6715c 100644
--- a/src/include/utils/palloc.h
+++ b/src/include/utils/palloc.h
@@ -210,6 +210,7 @@ extern void GPMemoryProtect_ShmemInit(void);
 extern void GPMemoryProtect_Init(void);
 extern void GPMemoryProtect_Shutdown(void);
 extern void GPMemoryProtect_TrackStartupMemory(void);
+extern void GPMemoryProtect_RequestAddinStartupMemory(Size size);
 extern void UpdateTimeAtomically(volatile OOMTimeType* time_var);
 
 /*

From acbd08ab501089adab14011a4a018ba22f29f549 Mon Sep 17 00:00:00 2001
From: Roman Eskin <r.eskin@arenadata.io>
Date: Fri, 15 Nov 2024 20:16:19 +1000
Subject: [PATCH 03/17] Connect Orca via a planner hook (#1112)

Problem:
Orca's code was strongly coupled with the standard_planner() code. It introduced
difficulties for moving Orca's functionality into a shared lib.

This patch:
1. moves the invocation of Orca planner out from the standard_planner() into a
hook in gp_orca shared lib;
2. moves the init procedure of Orca to the first call of the hook (thus the init
is done when the backend has already been initialized including its memory
protection means);
3. moves the deinit procedure of Orca into a callback, that is registered at the
init (thus the deinit is done right before ShutdownPostgres() is called, where
it was before).
4. adds clang-format config file
---
 gpcontrib/gp_orca/.clang-format      | 187 +++++++++++++++++++++++++++
 gpcontrib/gp_orca/gporca.c           | 121 ++++++++++++++++-
 src/backend/optimizer/plan/planner.c |  59 +--------
 src/backend/utils/init/postinit.c    |  28 ----
 4 files changed, 303 insertions(+), 92 deletions(-)
 create mode 100644 gpcontrib/gp_orca/.clang-format

diff --git a/gpcontrib/gp_orca/.clang-format b/gpcontrib/gp_orca/.clang-format
new file mode 100644
index 000000000000..43f3288fef09
--- /dev/null
+++ b/gpcontrib/gp_orca/.clang-format
@@ -0,0 +1,187 @@
+---
+Language:        Cpp
+AccessModifierOffset: -4
+AlignAfterOpenBracket: Align
+AlignConsecutiveMacros: false
+AlignConsecutiveAssignments: false
+AlignConsecutiveBitFields: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Left
+AlignOperands:   Align
+AlignTrailingComments: true
+AllowAllArgumentsOnNextLine: true
+AllowAllConstructorInitializersOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortEnumsOnASingleLine: true
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortLambdasOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: All
+AlwaysBreakAfterReturnType: AllDefinitions
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: true
+BinPackParameters: true
+BraceWrapping:
+  AfterCaseLabel:  true
+  AfterClass:      true
+  AfterControlStatement: Always
+  AfterEnum:       true
+  AfterFunction:   true
+  AfterNamespace:  true
+  AfterObjCDeclaration: true
+  AfterStruct:     true
+  AfterUnion:      true
+  AfterExternBlock: false
+  BeforeCatch:     true
+  BeforeElse:      true
+  BeforeLambdaBody: false
+  BeforeWhile:     false
+  IndentBraces:    false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Custom
+BreakBeforeInheritanceComma: false
+BreakInheritanceList: BeforeColon
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeColon
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: false
+ColumnLimit:     80
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DeriveLineEnding: true
+DerivePointerAlignment: false
+DisableFormat:   false
+ExperimentalAutoDetectBinPacking: false
+FixNamespaceComments: true
+ForEachMacros:
+  - foreach
+  - Q_FOREACH
+  - BOOST_FOREACH
+IncludeBlocks:   Regroup
+IncludeCategories:
+  - Regex:           '^<ext/.*\.h>'
+    Priority:        2
+    SortPriority:    0
+  - Regex:           '^<.*\.h>'
+    Priority:        1
+    SortPriority:    0
+  - Regex:           '^<.*'
+    Priority:        2
+    SortPriority:    0
+  - Regex:           '"postgres\.h"'
+    Priority:        -1
+    SortPriority:    0
+  - Regex:           '"gpos/.*'
+    Priority:        3
+    SortPriority:    0
+  - Regex:           '"(gpopt|naucrates|gpdbcost)/.*'
+    Priority:        4
+    SortPriority:    0
+IncludeIsMainRegex: '([-_](test|unittest))?$'
+IncludeIsMainSourceRegex: ''
+IndentCaseLabels: true
+IndentCaseBlocks: false
+IndentGotoLabels: true
+IndentPPDirectives: None
+IndentExternBlock: AfterExternBlock
+IndentWidth:     4
+IndentWrappedFunctionNames: false
+InsertTrailingCommas: None
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd:   ''
+MaxEmptyLinesToKeep: 3
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Never
+ObjCBlockIndentWidth: 2
+ObjCBreakBeforeNestedBlockParam: true
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 200
+PointerAlignment: Right
+RawStringFormats:
+  - Language:        Cpp
+    Delimiters:
+      - cc
+      - CC
+      - cpp
+      - Cpp
+      - CPP
+      - 'c++'
+      - 'C++'
+    CanonicalDelimiter: ''
+    BasedOnStyle:    google
+  - Language:        TextProto
+    Delimiters:
+      - pb
+      - PB
+      - proto
+      - PROTO
+    EnclosingFunctions:
+      - EqualsProto
+      - EquivToProto
+      - PARSE_PARTIAL_TEXT_PROTO
+      - PARSE_TEST_PROTO
+      - PARSE_TEXT_PROTO
+      - ParseTextOrDie
+      - ParseTextProtoOrDie
+      - ParseTestProto
+      - ParsePartialTestProto
+    CanonicalDelimiter: ''
+    BasedOnStyle:    google
+ReflowComments:  false
+SortIncludes:    true
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: true
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 2
+SpacesInAngles:  false
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+SpaceBeforeSquareBrackets: false
+Standard:        Auto
+StatementMacros:
+  - Q_UNUSED
+  - QT_REQUIRE_VERSION
+TabWidth:        4
+UseCRLF:         false
+UseTab:          Always
+WhitespaceSensitiveMacros:
+  - STRINGIZE
+  - PP_STRINGIZE
+  - BOOST_PP_STRINGIZE
+...
+
diff --git a/gpcontrib/gp_orca/gporca.c b/gpcontrib/gp_orca/gporca.c
index d9d90344c359..9065e802849d 100644
--- a/gpcontrib/gp_orca/gporca.c
+++ b/gpcontrib/gp_orca/gporca.c
@@ -1,29 +1,133 @@
 #include "postgres.h"
 
 #include "cdb/cdbvars.h"
+#include "executor/executor.h"
 #include "miscadmin.h"
+#include "optimizer/orca.h"
+#include "optimizer/planner.h"
+#include "storage/ipc.h"
 #include "utils/builtins.h"
 #include "utils/guc.h"
+#include "utils/memutils.h"
 #include "utils/vmem_tracker.h"
 
 PG_MODULE_MAGIC;
 
-void		_PG_init(void);
-void		_PG_fini(void);
+extern void InitGPOPT();
+extern void TerminateGPOPT();
+
+extern void compute_jit_flags(PlannedStmt *pstmt);
+
+void _PG_init(void);
+void _PG_fini(void);
+
+static planner_hook_type prev_planner = NULL;
+
+static void
+gp_orca_shutdown(int code, Datum arg)
+{
+	(void) code;
+	(void) arg;
+
+	TerminateGPOPT();
+
+	if (NULL != OptimizerMemoryContext)
+		MemoryContextDelete(OptimizerMemoryContext);
+}
+
+static void
+gp_orca_init()
+{
+	/* Initialize GPOPT */
+	OptimizerMemoryContext = AllocSetContextCreate(
+		TopMemoryContext, "GPORCA Top-level Memory Context",
+		ALLOCSET_DEFAULT_MINSIZE, ALLOCSET_DEFAULT_INITSIZE,
+		ALLOCSET_DEFAULT_MAXSIZE);
+
+	InitGPOPT();
+
+	before_shmem_exit(gp_orca_shutdown, 0);
+}
+
+static PlannedStmt *
+gp_orca_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
+{
+	PlannedStmt *result = NULL;
+
+	/*
+	 * 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/<lang> 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 (NULL == OptimizerMemoryContext)
+			gp_orca_init();
+
+		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));
+		}
+
+		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)
-		ereport(ERROR,
-				(errcode(ERRCODE_INTERNAL_ERROR),
-				 errmsg("This module can only be loaded via shared_preload_libraries")));
+		ereport(
+			ERROR,
+			(errcode(ERRCODE_INTERNAL_ERROR),
+			 errmsg(
+				 "This module can only be loaded via shared_preload_libraries")));
 
-	if (!IS_QUERY_DISPATCHER())
+	if (!(IS_QUERY_DISPATCHER() && (GP_ROLE_DISPATCH == Gp_role)))
 		return;
 
 	/* When compile with ORCA it will commit 6MB more */
 	Size orca_mem = 6L << BITS_IN_MB;
+
 	/*
 	 * When optimizer_use_gpdb_allocators is on, at least 2MB of above will be
 	 * tracked by vmem tracker later, so do not recount them.
@@ -32,10 +136,13 @@ _PG_init(void)
 		orca_mem -= (2L << BITS_IN_MB);
 
 	GPMemoryProtect_RequestAddinStartupMemory(orca_mem);
+
+	prev_planner = planner_hook;
+	planner_hook = gp_orca_planner;
 }
 
 void
 _PG_fini(void)
 {
+	planner_hook = prev_planner;
 }
-
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 483b07a2b27e..716afe3f7ea6 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -296,7 +296,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,61 +354,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/<lang> 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.
-	 */
 	if (gp_log_optimization_time)
 		INSTR_TIME_SET_CURRENT(starttime);
 
@@ -8762,7 +8707,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/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 */

From bf2cc5abaa2a35f77b489a87e0c35c2f7f5d220a Mon Sep 17 00:00:00 2001
From: Roman Eskin <r.eskin@arenadata.io>
Date: Thu, 21 Nov 2024 21:50:47 +1000
Subject: [PATCH 04/17] Decouple Orca from Explain component (#1124)

Problem:
Explain component had compile-time dependencies on Orca. It introduced
difficulties for moving Orca's functionality into a shared lib.

This patch:
1. Adds explain hook implementation to the gp_orca extension. It handles DXL
output format of explain command.
2. Removes all Orca related code from explain component in the GPDB core.
3. Adds function standard_ExplainOneQuery() that now contains the default
explain code (thus it can be invoked from the hook).
4. Removes 'planGen' field from 'PlannedStmt' structure. Its type was enum, and
it had only 2 values: Planner and Optimizer (for Postgres planner and Orca
planner respectively). It was not suitable for a general planner plugged in from
an extension.
5. Adds 'plannerName' field to 'PlannedStmt' structure. It is now used to output
the name of the external planner, if it is used.
6. Updates 'compute_jit_flags()' due to changes above. Now gp_orca extension
defines its own implementation for computing JIT parameters. Orca related logic
for JIT parameters is removed from the core.
7. Adds new ABI ignore file, as the 'PlannedStmt' structure is updated.
---
 .../7.2.0_arenadata6/postgres.types.ignore    |   2 +
 gpcontrib/gp_orca/gporca.c                    | 139 ++++++++++++++-
 src/backend/commands/explain.c                | 163 ++++--------------
 .../translate/CTranslatorDXLToPlStmt.cpp      |   2 +-
 src/backend/nodes/copyfuncs.c                 |   2 +-
 src/backend/nodes/outfuncs.c                  |   2 +-
 src/backend/nodes/readfuncs.c                 |   2 +-
 src/backend/optimizer/plan/planner.c          |  54 ++----
 src/include/commands/explain.h                |   4 +
 src/include/nodes/plannodes.h                 |  15 +-
 src/include/optimizer/orca.h                  |   5 +
 src/include/optimizer/planner.h               |   5 +
 12 files changed, 204 insertions(+), 191 deletions(-)
 create mode 100644 .abi-check/7.2.0_arenadata6/postgres.types.ignore

diff --git a/.abi-check/7.2.0_arenadata6/postgres.types.ignore b/.abi-check/7.2.0_arenadata6/postgres.types.ignore
new file mode 100644
index 000000000000..1550c4f921ad
--- /dev/null
+++ b/.abi-check/7.2.0_arenadata6/postgres.types.ignore
@@ -0,0 +1,2 @@
+struct PlannedStmt
+
diff --git a/gpcontrib/gp_orca/gporca.c b/gpcontrib/gp_orca/gporca.c
index 9065e802849d..cb1cbd12ba7d 100644
--- a/gpcontrib/gp_orca/gporca.c
+++ b/gpcontrib/gp_orca/gporca.c
@@ -1,8 +1,10 @@
 #include "postgres.h"
 
 #include "cdb/cdbvars.h"
+#include "commands/explain.h"
 #include "executor/executor.h"
 #include "miscadmin.h"
+#include "optimizer/clauses.h"
 #include "optimizer/orca.h"
 #include "optimizer/planner.h"
 #include "storage/ipc.h"
@@ -13,15 +15,29 @@
 
 PG_MODULE_MAGIC;
 
-extern void InitGPOPT();
-extern void TerminateGPOPT();
-
-extern void compute_jit_flags(PlannedStmt *pstmt);
-
 void _PG_init(void);
 void _PG_fini(void);
 
 static planner_hook_type prev_planner = NULL;
+static ExplainOneQuery_hook_type prev_explain = NULL;
+
+/*
+ * Decide JIT settings for the given plan and record them in PlannedStmt.jitFlags.
+ *
+ * Since the costing model of ORCA and Postgres planner are different
+ * (Postgres planner cost usually higher), setting the JIT flags based on the
+ * common JIT costing GUCs could lead to false triggering of JIT.
+ *
+ * To prevent this situation, separate costing GUCs are created
+ * for Orca and used here for setting the JIT flags.
+ */
+static void
+gp_orca_compute_jit_flags(PlannedStmt *pstmt)
+{
+	compute_jit_flags(pstmt, optimizer_jit_above_cost,
+					  optimizer_jit_inline_above_cost,
+					  optimizer_jit_optimize_above_cost);
+}
 
 static void
 gp_orca_shutdown(int code, Datum arg)
@@ -89,7 +105,7 @@ gp_orca_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 			/*
 			 * Setting Jit flags for Optimizer
 			 */
-			compute_jit_flags(result);
+			gp_orca_compute_jit_flags(result);
 		}
 
 		if (gp_log_optimization_time)
@@ -112,6 +128,113 @@ gp_orca_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 	return result;
 }
 
+/*
+ * gp_orca_explain_dxl -
+ *	  print out the execution plan for one Query in DXL format
+ *	  this function implicitly uses optimizer
+ */
+static void
+gp_orca_explain_dxl(Query *query, ExplainState *es, ParamListInfo params)
+{
+	MemoryContext oldcxt = CurrentMemoryContext;
+	bool save_enumerate;
+	char *dxl = NULL;
+	PlannerInfo *root;
+	PlannerGlobal *glob;
+	Query *pqueryCopy;
+
+	save_enumerate = optimizer_enumerate_plans;
+
+	/* Do the EXPLAIN. */
+
+	/* enable plan enumeration before calling optimizer */
+	optimizer_enumerate_plans = true;
+
+	/*
+	 * Initialize a dummy PlannerGlobal struct. ORCA doesn't use it, but the
+	 * pre- and post-processing steps do.
+	 */
+	glob = makeNode(PlannerGlobal);
+	glob->subplans = NIL;
+	glob->subroots = NIL;
+	glob->rewindPlanIDs = NULL;
+	glob->transientPlan = false;
+	glob->oneoffPlan = false;
+	glob->share.shared_inputs = NULL;
+	glob->share.shared_input_count = 0;
+	glob->share.motStack = NIL;
+	glob->share.qdShares = NULL;
+	/* these will be filled in below, in the pre- and post-processing steps */
+	glob->finalrtable = NIL;
+	glob->relationOids = NIL;
+	glob->invalItems = NIL;
+
+	root = makeNode(PlannerInfo);
+	root->parse = query;
+	root->glob = glob;
+	root->query_level = 1;
+	root->planner_cxt = CurrentMemoryContext;
+	root->wt_param_id = -1;
+
+	/* create a local copy to hand to the optimizer */
+	pqueryCopy = (Query *) copyObject(query);
+
+	/*
+	 * Pre-process the Query tree before calling optimizer.
+	 *
+	 * Constant folding will add dependencies to functions or relations in
+	 * glob->invalItems, for any functions that are inlined or eliminated
+	 * away. (We will find dependencies to other objects later, after planning).
+	 */
+	pqueryCopy = fold_constants(root, pqueryCopy, params,
+								GPOPT_MAX_FOLDED_CONSTANT_SIZE);
+
+	/*
+	 * If any Query in the tree mixes window functions and aggregates, we need to
+	 * transform it such that the grouped query appears as a subquery
+	 */
+	pqueryCopy = (Query *) transformGroupedWindows((Node *) pqueryCopy, NULL);
+
+
+	/* optimize query using optimizer and get generated plan in DXL format */
+	dxl = SerializeDXLPlan(pqueryCopy);
+
+	/* restore old value of enumerate plans GUC */
+	optimizer_enumerate_plans = save_enumerate;
+
+	if (NULL == dxl)
+		elog(NOTICE, "Optimizer failed to produce plan");
+	else
+	{
+		appendStringInfoString(es->str, dxl);
+		appendStringInfoChar(es->str, '\n'); /* separator line */
+		pfree(dxl);
+	}
+
+	/* Free the memory we used. */
+	MemoryContextSwitchTo(oldcxt);
+}
+
+static void
+gp_orca_explain(Query *query, int cursorOptions, IntoClause *into,
+				ExplainState *es, const char *queryString, ParamListInfo params,
+				QueryEnvironment *queryEnv)
+{
+	if (es->dxl)
+	{
+		if (NULL == OptimizerMemoryContext)
+			gp_orca_init();
+
+		gp_orca_explain_dxl(query, es, params);
+	}
+	else if (prev_explain)
+		(*prev_explain)(query, cursorOptions, into, es, queryString, params,
+						queryEnv);
+	else
+		standard_ExplainOneQuery(query, cursorOptions, into, es, queryString,
+								 params, queryEnv);
+}
+
 void
 _PG_init(void)
 {
@@ -139,10 +262,14 @@ _PG_init(void)
 
 	prev_planner = planner_hook;
 	planner_hook = gp_orca_planner;
+
+	prev_explain = ExplainOneQuery_hook;
+	ExplainOneQuery_hook = gp_orca_explain;
 }
 
 void
 _PG_fini(void)
 {
 	planner_hook = prev_planner;
+	ExplainOneQuery_hook = prev_explain;
 }
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
index 6884214e2ced..86f00863a5f4 100644
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@ -53,11 +53,6 @@
 #include "optimizer/clauses.h"
 #include "optimizer/tlist.h"
 #include "optimizer/optimizer.h"
-#include "optimizer/orca.h"
-
-#ifdef USE_ORCA
-extern char *SerializeDXLPlan(Query *parse);
-#endif
 
 
 /* Hook for plugins to get control in ExplainOneQuery() */
@@ -79,13 +74,6 @@ static void ExplainOneQuery(Query *query, int cursorOptions,
 							QueryEnvironment *queryEnv);
 static void report_triggers(ResultRelInfo *rInfo, bool show_relname,
 							ExplainState *es);
-
-#ifdef USE_ORCA
-static void ExplainDXL(Query *query, ExplainState *es,
-							const char *queryString,
-							ParamListInfo params);
-#endif
-
 static double elapsed_time(instr_time *starttime);
 static bool ExplainPreScanNode(PlanState *planstate, Bitmapset **rels_used);
 static void ExplainNode(PlanState *planstate, List *ancestors,
@@ -375,94 +363,7 @@ ExplainResultDesc(ExplainStmt *stmt)
 	return tupdesc;
 }
 
-#ifdef USE_ORCA
-/*
- * ExplainDXL -
- *	  print out the execution plan for one Query in DXL format
- *	  this function implicitly uses optimizer
- */
-static void
-ExplainDXL(Query *query, ExplainState *es, const char *queryString,
-				ParamListInfo params)
-{
-	MemoryContext oldcxt = CurrentMemoryContext;
-	bool		save_enumerate;
-	char	   *dxl = NULL;
-	PlannerInfo		*root;
-	PlannerGlobal	*glob;
-	Query			*pqueryCopy;
-
-	save_enumerate = optimizer_enumerate_plans;
-
-	/* Do the EXPLAIN. */
 
-	/* enable plan enumeration before calling optimizer */
-	optimizer_enumerate_plans = true;
-
-	/*
-	 * Initialize a dummy PlannerGlobal struct. ORCA doesn't use it, but the
-	 * pre- and post-processing steps do.
-	 */
-	glob = makeNode(PlannerGlobal);
-	glob->subplans = NIL;
-	glob->subroots = NIL;
-	glob->rewindPlanIDs = NULL;
-	glob->transientPlan = false;
-	glob->oneoffPlan = false;
-	glob->share.shared_inputs = NULL;
-	glob->share.shared_input_count = 0;
-	glob->share.motStack = NIL;
-	glob->share.qdShares = NULL;
-	/* these will be filled in below, in the pre- and post-processing steps */
-	glob->finalrtable = NIL;
-	glob->relationOids = NIL;
-	glob->invalItems = NIL;
-
-	root = makeNode(PlannerInfo);
-	root->parse = query;
-	root->glob = glob;
-	root->query_level = 1;
-	root->planner_cxt = CurrentMemoryContext;
-	root->wt_param_id = -1;
-
-	/* create a local copy to hand to the optimizer */
-	pqueryCopy = (Query *) copyObject(query);
-
-	/*
-	 * Pre-process the Query tree before calling optimizer.
-	 *
-	 * Constant folding will add dependencies to functions or relations in
-	 * glob->invalItems, for any functions that are inlined or eliminated
-	 * away. (We will find dependencies to other objects later, after planning).
-	 */
-	pqueryCopy = fold_constants(root, pqueryCopy, params, GPOPT_MAX_FOLDED_CONSTANT_SIZE);
-
-	/*
-	 * If any Query in the tree mixes window functions and aggregates, we need to
-	 * transform it such that the grouped query appears as a subquery
-	 */
-	pqueryCopy = (Query *) transformGroupedWindows((Node *) pqueryCopy, NULL);
-
-
-	/* optimize query using optimizer and get generated plan in DXL format */
-	dxl = SerializeDXLPlan(pqueryCopy);
-
-	/* restore old value of enumerate plans GUC */
-	optimizer_enumerate_plans = save_enumerate;
-
-	if (dxl == NULL)
-		elog(NOTICE, "Optimizer failed to produce plan");
-	else
-	{
-		appendStringInfoString(es->str, dxl);
-		appendStringInfoChar(es->str, '\n'); /* separator line */
-		pfree(dxl);
-	}
-
-	/* Free the memory we used. */
-	MemoryContextSwitchTo(oldcxt);
-}
-#endif
 
 /*
  * ExplainOneQuery -
@@ -476,14 +377,6 @@ ExplainOneQuery(Query *query, int cursorOptions,
 				const char *queryString, ParamListInfo params,
 				QueryEnvironment *queryEnv)
 {
-#ifdef USE_ORCA
-	if (es->dxl)
-	{
-		ExplainDXL(query, es, queryString, params);
-		return;
-	}
-#endif
-
 	/* planner will not cope with utility statements */
 	if (query->commandType == CMD_UTILITY)
 	{
@@ -497,30 +390,42 @@ ExplainOneQuery(Query *query, int cursorOptions,
 		(*ExplainOneQuery_hook) (query, cursorOptions, into, es,
 								 queryString, params, queryEnv);
 	else
-	{
-		PlannedStmt *plan;
-		instr_time	planstart,
-					planduration;
+		standard_ExplainOneQuery(query, cursorOptions, into, es,
+								 queryString, params, queryEnv);
+}
+
+/*
+ * standard_ExplainOneQuery -
+ *	  print out the execution plan for one Query, without calling a hook.
+ */
+void
+standard_ExplainOneQuery(Query *query, int cursorOptions,
+				IntoClause *into, ExplainState *es,
+				const char *queryString, ParamListInfo params,
+				QueryEnvironment *queryEnv)
+{
+	PlannedStmt *plan;
+	instr_time	planstart,
+				planduration;
 
-		INSTR_TIME_SET_CURRENT(planstart);
+	INSTR_TIME_SET_CURRENT(planstart);
 
-		/* plan the query */
-		plan = pg_plan_query(query, cursorOptions, params);
+	/* plan the query */
+	plan = pg_plan_query(query, cursorOptions, params);
 
-		INSTR_TIME_SET_CURRENT(planduration);
-		INSTR_TIME_SUBTRACT(planduration, planstart);
+	INSTR_TIME_SET_CURRENT(planduration);
+	INSTR_TIME_SUBTRACT(planduration, planstart);
 
-		/*
-		 * GPDB_92_MERGE_FIXME: it really should be an optimizer's responsibility
-		 * to correctly set the into-clause and into-policy of the PlannedStmt.
-		 */
-		if (into != NULL)
-			plan->intoClause = copyObject(into);
+	/*
+	 * GPDB_92_MERGE_FIXME: it really should be an optimizer's responsibility
+	 * to correctly set the into-clause and into-policy of the PlannedStmt.
+	 */
+	if (into != NULL)
+		plan->intoClause = copyObject(into);
 
-		/* run it (if needed) and produce output */
-		ExplainOnePlan(plan, into, es, queryString, params, queryEnv,
-					   &planduration, cursorOptions);
-	}
+	/* run it (if needed) and produce output */
+	ExplainOnePlan(plan, into, es, queryString, params, queryEnv,
+				   &planduration, cursorOptions);
 }
 
 /*
@@ -981,12 +886,10 @@ ExplainPrintPlan(ExplainState *es, QueryDesc *queryDesc)
 	 * If requested, include information about GUC parameters with values that
 	 * don't match the built-in defaults.
 	 */
-	if (queryDesc->plannedstmt->planGen == PLANGEN_PLANNER)
+	if (queryDesc->plannedstmt->plannerName == NULL)
 		ExplainPropertyStringInfo("Optimizer", es, "Postgres-based planner");
-#ifdef USE_ORCA
 	else
-		ExplainPropertyStringInfo("Optimizer", es, "GPORCA");
-#endif
+		ExplainPropertyStringInfo("Optimizer", es, "%s", queryDesc->plannedstmt->plannerName);
 
 	ExplainPrintSettings(es);
 }
diff --git a/src/backend/gpopt/translate/CTranslatorDXLToPlStmt.cpp b/src/backend/gpopt/translate/CTranslatorDXLToPlStmt.cpp
index 736ba0d04031..9209ea71446f 100644
--- a/src/backend/gpopt/translate/CTranslatorDXLToPlStmt.cpp
+++ b/src/backend/gpopt/translate/CTranslatorDXLToPlStmt.cpp
@@ -219,7 +219,7 @@ CTranslatorDXLToPlStmt::GetPlannedStmtFromDXL(const CDXLNode *dxlnode,
 
 	// assemble planned stmt
 	PlannedStmt *planned_stmt = MakeNode(PlannedStmt);
-	planned_stmt->planGen = PLANGEN_OPTIMIZER;
+	planned_stmt->plannerName = "GPORCA";
 
 	planned_stmt->rtable = m_dxl_to_plstmt_context->GetRTableEntriesList();
 	planned_stmt->subplans = m_dxl_to_plstmt_context->GetSubplanEntriesList();
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index 795a93e89a10..fd52b2037526 100644
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -103,7 +103,6 @@ _copyPlannedStmt(const PlannedStmt *from)
 	PlannedStmt *newnode = makeNode(PlannedStmt);
 
 	COPY_SCALAR_FIELD(commandType);
-	COPY_SCALAR_FIELD(planGen);
 	COPY_SCALAR_FIELD(queryId);
 	COPY_SCALAR_FIELD(hasReturning);
 	COPY_SCALAR_FIELD(hasModifyingCTE);
@@ -151,6 +150,7 @@ _copyPlannedStmt(const PlannedStmt *from)
 	COPY_NODE_FIELD(copyIntoClause);
 	COPY_NODE_FIELD(refreshClause);
 	COPY_SCALAR_FIELD(metricsQueryType);
+	COPY_STRING_FIELD(plannerName);
 
 	return newnode;
 }
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 7b242b35bbe5..88e2b9629b5c 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -338,7 +338,6 @@ _outPlannedStmt(StringInfo str, const PlannedStmt *node)
 	WRITE_NODE_TYPE("PLANNEDSTMT");
 
 	WRITE_ENUM_FIELD(commandType, CmdType);
-	WRITE_ENUM_FIELD(planGen, PlanGenerator);
 	WRITE_UINT64_FIELD(queryId);
 	WRITE_BOOL_FIELD(hasReturning);
 	WRITE_BOOL_FIELD(hasModifyingCTE);
@@ -393,6 +392,7 @@ _outPlannedStmt(StringInfo str, const PlannedStmt *node)
 	WRITE_NODE_FIELD(copyIntoClause);
 	WRITE_NODE_FIELD(refreshClause);
 	WRITE_INT_FIELD(metricsQueryType);
+	WRITE_STRING_FIELD(plannerName);
 }
 
 
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index 109155faff9b..3a44cc7080a0 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -2408,7 +2408,6 @@ _readPlannedStmt(void)
 	READ_LOCALS(PlannedStmt);
 
 	READ_ENUM_FIELD(commandType, CmdType);
-	READ_ENUM_FIELD(planGen, PlanGenerator);
 	READ_UINT64_FIELD(queryId);
 	READ_BOOL_FIELD(hasReturning);
 	READ_BOOL_FIELD(hasModifyingCTE);
@@ -2461,6 +2460,7 @@ _readPlannedStmt(void)
 	READ_NODE_FIELD(copyIntoClause);
 	READ_NODE_FIELD(refreshClause);
 	READ_INT_FIELD(metricsQueryType);
+	READ_STRING_FIELD(plannerName);
 
 	READ_DONE();
 }
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 716afe3f7ea6..ec3684734eaf 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);
 
-void compute_jit_flags(PlannedStmt* pstmt);
+static void standard_planner_compute_jit_flags(PlannedStmt* pstmt);
 
 /*****************************************************************************
  *
@@ -707,7 +706,7 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 	result->stmt_len = parse->stmt_len;
 
 	/* GPDB: JIT flags are set in wrapper function */
-	compute_jit_flags(result);
+	standard_planner_compute_jit_flags(result);
 
 	if (glob->partition_directory != NULL)
 		DestroyPartitionDirectory(glob->partition_directory);
@@ -8695,53 +8694,16 @@ make_new_rollups_for_hash_grouping_set(PlannerInfo        *root,
 
 /*
  * GPDB: This is moved from standard_planner(), so that it can be used by both
- * planner and ORCA. Please move any future code added to standard_planner() too.
+ * Postgres planner and an external planner. Please move any future code added to
+ * standard_planner() too.
  *
  * Decide JIT settings for the given plan and record them in PlannedStmt.jitFlags.
- *
- * Since the costing model of ORCA and Planner are different
- * (Planner cost usually higher), setting the JIT flags based on the
- * common JIT costing GUCs could lead to false triggering of JIT.
- *
- * To prevent this situation, separate  costing GUCs are created
- * for Optimizer and used here for setting the JIT flags.
- *
  */
-void compute_jit_flags(PlannedStmt* pstmt)
+void compute_jit_flags(PlannedStmt* pstmt, double above_cost, double inline_above_cost, double optimize_above_cost)
 {
 	Plan* top_plan = pstmt->planTree;
 	pstmt->jitFlags = PGJIT_NONE;
 
-	/*
-	 * Common variables to hold values for optimizer or planner
-	 * based on function call.
-	 */
-	double above_cost;
-	double inline_above_cost;
-	double optimize_above_cost;
-
-	if (pstmt->planGen == PLANGEN_OPTIMIZER)
-	{
-
-		/*
-		 * Setting values for ORCA.
-		 */
-		above_cost = optimizer_jit_above_cost;
-		inline_above_cost = optimizer_jit_inline_above_cost;
-		optimize_above_cost = optimizer_jit_optimize_above_cost;
-	}
-	else
-	{
-
-		/*
-		 * Setting values for Planner.
-		 */
-		above_cost = jit_above_cost;
-		inline_above_cost = jit_inline_above_cost;
-		optimize_above_cost = jit_optimize_above_cost;
-
-	}
-
 	if (jit_enabled && above_cost >= 0 &&
 		top_plan->total_cost > above_cost)
 	{
@@ -8766,3 +8728,9 @@ void compute_jit_flags(PlannedStmt* pstmt)
 			pstmt->jitFlags |= PGJIT_DEFORM;
 	}
 }
+
+static void standard_planner_compute_jit_flags(PlannedStmt* pstmt)
+{
+	compute_jit_flags(pstmt, jit_above_cost, jit_inline_above_cost, jit_optimize_above_cost);
+}
+
diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h
index 6ef6a2e87dfb..3c3e22fd589a 100644
--- a/src/include/commands/explain.h
+++ b/src/include/commands/explain.h
@@ -76,6 +76,10 @@ extern PGDLLIMPORT explain_get_index_name_hook_type explain_get_index_name_hook;
 extern void ExplainQuery(ParseState *pstate, ExplainStmt *stmt, const char *queryString,
 						 ParamListInfo params, QueryEnvironment *queryEnv, DestReceiver *dest);
 
+extern void standard_ExplainOneQuery(Query *query, int cursorOptions,
+				IntoClause *into, ExplainState *es, const char *queryString,
+				ParamListInfo params, QueryEnvironment *queryEnv);
+
 extern ExplainState *NewExplainState(void);
 
 extern TupleDesc ExplainResultDesc(ExplainStmt *stmt);
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index 073c29cd363e..bd016fac263a 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -40,12 +40,6 @@ typedef struct DirectDispatchInfo
 	bool		haveProcessedAnyCalculations;
 } DirectDispatchInfo;
 
-typedef enum PlanGenerator
-{
-	PLANGEN_PLANNER,			/* plan produced by the planner*/
-	PLANGEN_OPTIMIZER,			/* plan produced by the optimizer*/
-} PlanGenerator;
-
 /* DML Actions */
 typedef enum DMLAction
 {
@@ -76,8 +70,6 @@ typedef struct PlannedStmt
 
 	CmdType		commandType;	/* select|insert|update|delete|utility */
 
-	PlanGenerator	planGen;		/* optimizer generation */
-
 	uint64		queryId;		/* query identifier (copied from Query) */
 
 	bool		hasReturning;	/* is it insert|update|delete RETURNING? */
@@ -156,6 +148,13 @@ typedef struct PlannedStmt
  	 * GPDB: whether a query is a SPI inner query for extension usage 
  	 */
 	int8		metricsQueryType;
+
+	/*
+	 * If the plan is done by an extension, the field below should contain
+	 * the name of the extension planner. Should be NULL if planning is done
+	 * by Postgres planner.
+	 */
+	const char	*plannerName;
 } PlannedStmt;
 
 /*
diff --git a/src/include/optimizer/orca.h b/src/include/optimizer/orca.h
index d26903fc0856..ad3ecdbce8c8 100644
--- a/src/include/optimizer/orca.h
+++ b/src/include/optimizer/orca.h
@@ -28,6 +28,11 @@ extern Node *transformGroupedWindows(Node *node, void *context);
 typedef void *(*plan_hint_hook_type) (Query *parse);
 extern PGDLLIMPORT plan_hint_hook_type plan_hint_hook;
 
+extern void InitGPOPT();
+extern void TerminateGPOPT();
+
+extern char *SerializeDXLPlan(Query *parse);
+
 #endif
 
 #endif /* ORCA_H */
diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h
index 305cea087d53..2d6a6db88bc9 100644
--- a/src/include/optimizer/planner.h
+++ b/src/include/optimizer/planner.h
@@ -58,4 +58,9 @@ extern Path *get_cheapest_fractional_path(RelOptInfo *rel,
 
 extern Expr *preprocess_phv_expression(PlannerInfo *root, Expr *expr);
 
+extern void compute_jit_flags(PlannedStmt* pstmt,
+							double above_cost,
+							double inline_above_cost,
+							double optimize_above_cost);
+
 #endif							/* PLANNER_H */

From 927afa01ce9d832e267fcac4433d9bdebb6107c4 Mon Sep 17 00:00:00 2001
From: Roman Eskin <r.eskin@arenadata.io>
Date: Mon, 25 Nov 2024 16:18:08 +1000
Subject: [PATCH 05/17] Rework gp_optimizer_functions.c to use runtime check of
 Orca's presence (#1126)

Problem:
Functions in gp_optimizer_functions.c had a compile-time dependency on Orca.
It introduced difficulties for moving Orca's functionality into a shared lib.

This patch:
1. Moves implementation of 'DisableXform()', 'EnableXform()',
'LibraryVersion()' into gp_orca shared lib.
2. Updates implementation of wrapper functions 'enable_xform()',
'disable_xform()', 'gp_opt_version()'. Now they try to load the underlying
functions from a shared lib. Attempt to load a symbol from a shared lib is
wrapped into PG_TRY & PG_CATCH (with all necessary shenanigans), as the lib may
be missing. In this case we catch the error, and show an appropriate message.
3. Updates tests due to change of the message if Orca is not enabled.

Note: we do not move the wrapper's implementation into gp_orca extension, as
they are already a part of the system catalog. And we'd like to avoid changing
the system catalog.
---
 gpcontrib/gp_orca/Makefile                    |  7 ++
 .../utils => gpcontrib/gp_orca}/funcs.cpp     |  0
 src/backend/gpopt/utils/Makefile              |  2 +-
 .../utils/adt/gp_optimizer_functions.c        | 72 +++++++++++++------
 src/test/regress/expected/gp_metadata.out     |  2 +-
 src/test/regress/sql/gp_metadata.sql          |  2 +-
 6 files changed, 61 insertions(+), 24 deletions(-)
 rename {src/backend/gpopt/utils => gpcontrib/gp_orca}/funcs.cpp (100%)

diff --git a/gpcontrib/gp_orca/Makefile b/gpcontrib/gp_orca/Makefile
index 040e43fe2234..d00b183c87c7 100644
--- a/gpcontrib/gp_orca/Makefile
+++ b/gpcontrib/gp_orca/Makefile
@@ -1,6 +1,13 @@
 MODULE_big = gp_orca
 
 OBJS = gporca.o \
+	funcs.o \
+
+PG_CPPFLAGS = \
+	-I$(top_srcdir)/src/backend/gporca/libgpos/include $(CPPFLAGS) \
+	-I$(top_srcdir)/src/backend/gporca/libgpopt/include $(CPPFLAGS) \
+	-I$(top_srcdir)/src/backend/gporca/libnaucrates/include $(CPPFLAGS) \
+	-I$(top_srcdir)/src/backend/gporca/libgpdbcost/include $(CPPFLAGS) \
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/src/backend/gpopt/utils/funcs.cpp b/gpcontrib/gp_orca/funcs.cpp
similarity index 100%
rename from src/backend/gpopt/utils/funcs.cpp
rename to gpcontrib/gp_orca/funcs.cpp
diff --git a/src/backend/gpopt/utils/Makefile b/src/backend/gpopt/utils/Makefile
index 2d21f083ad97..9701ee563d53 100644
--- a/src/backend/gpopt/utils/Makefile
+++ b/src/backend/gpopt/utils/Makefile
@@ -11,6 +11,6 @@ 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
+OBJS = COptTasks.o CConstExprEvaluatorProxy.o CMemoryPoolPalloc.o CMemoryPoolPallocManager.o RelationWrapper.o
 
 include $(top_srcdir)/src/backend/common.mk
diff --git a/src/backend/utils/adt/gp_optimizer_functions.c b/src/backend/utils/adt/gp_optimizer_functions.c
index 79e60db9f6b1..6b64c362264f 100644
--- a/src/backend/utils/adt/gp_optimizer_functions.c
+++ b/src/backend/utils/adt/gp_optimizer_functions.c
@@ -16,7 +16,46 @@
 #include "funcapi.h"
 #include "utils/builtins.h"
 
-extern Datum EnableXform(PG_FUNCTION_ARGS);
+typedef Datum (*gp_opt_version_func) (void);
+
+/*
+ * A stub function to call if no optimizer function is found.
+ */
+static Datum
+gp_optimizer_function_stub(PG_FUNCTION_ARGS)
+{
+	return CStringGetTextDatum("gp_orca is not added to 'shared_preload_libraries'");
+}
+
+/*
+ * Loads optimizer function from a shared library. If library is not presented
+ * or doesn't contain the requested function or any of its dependencies,
+ * returns the stub function.
+ */
+static PGFunction
+gp_optimizer_load_function(char *funcname)
+{
+	volatile PGFunction func = NULL;
+	int32		savedInterruptHoldoffCount = InterruptHoldoffCount;
+	MemoryContext oldcontext = CurrentMemoryContext;
+
+	PG_TRY();
+	{
+		func = load_external_function("$libdir/gp_orca", funcname, false, NULL);
+	}
+	PG_CATCH();
+	{
+		MemoryContextSwitchTo(oldcontext);
+		InterruptHoldoffCount = savedInterruptHoldoffCount;
+		FlushErrorState();
+	}
+	PG_END_TRY();
+
+	if (NULL == func)
+		func = gp_optimizer_function_stub;
+
+	return func;
+}
 
 /*
 * Enables transformations in the optimizer.
@@ -24,39 +63,30 @@ extern Datum EnableXform(PG_FUNCTION_ARGS);
 Datum
 enable_xform(PG_FUNCTION_ARGS)
 {
-#ifdef USE_ORCA
-	return EnableXform(fcinfo);
-#else
-	return CStringGetTextDatum("Server has been compiled without ORCA");
-#endif
-}
+	PGFunction	func = gp_optimizer_load_function("EnableXform");
 
-extern Datum DisableXform(PG_FUNCTION_ARGS);
+	return func(fcinfo);
+}
 
-/* 
+/*
 * Disables transformations in the optimizer.
 */
 Datum
 disable_xform(PG_FUNCTION_ARGS)
 {
-#ifdef USE_ORCA
-	return DisableXform(fcinfo);
-#else
-	return CStringGetTextDatum("Server has been compiled without ORCA");
-#endif
+	PGFunction	func = gp_optimizer_load_function("DisableXform");
+
+	return func(fcinfo);
 }
 
-extern Datum LibraryVersion();
-	
 /*
 * Returns the optimizer and gpos library versions.
 */
 Datum
 gp_opt_version(PG_FUNCTION_ARGS pg_attribute_unused())
 {
-#ifdef USE_ORCA
-	return LibraryVersion();
-#else
-	return CStringGetTextDatum("Server has been compiled without ORCA");
-#endif
+	gp_opt_version_func func =
+		(gp_opt_version_func) gp_optimizer_load_function("LibraryVersion");
+
+	return func();
 }
diff --git a/src/test/regress/expected/gp_metadata.out b/src/test/regress/expected/gp_metadata.out
index 51d39d24ece4..4157bbb45835 100644
--- a/src/test/regress/expected/gp_metadata.out
+++ b/src/test/regress/expected/gp_metadata.out
@@ -4,7 +4,7 @@ select version() ~ '^PostgreSQL (1[0-9]+)(\.[0-9]+)?(devel)?(beta[0-9])? \(Green
  t
 (1 row)
 
-select gp_opt_version() ~ '^(GPOPT version: 4.0.0, Xerces version: ([0-9]+\.){2}[0-9]+|Server has been compiled without ORCA)$' as version;
+select gp_opt_version() ~ '^(GPOPT version: 4.0.0, Xerces version: ([0-9]+\.){2}[0-9]+|gp_orca is not added to ''shared_preload_libraries'')$' as version;
  version 
 ---------
  t
diff --git a/src/test/regress/sql/gp_metadata.sql b/src/test/regress/sql/gp_metadata.sql
index bd75560597b5..684cdf8f7671 100644
--- a/src/test/regress/sql/gp_metadata.sql
+++ b/src/test/regress/sql/gp_metadata.sql
@@ -1,2 +1,2 @@
 select version() ~ '^PostgreSQL (1[0-9]+)(\.[0-9]+)?(devel)?(beta[0-9])? \(Greenplum Database ([0-9]+\.){2}[0-9]+.+' as version;
-select gp_opt_version() ~ '^(GPOPT version: 4.0.0, Xerces version: ([0-9]+\.){2}[0-9]+|Server has been compiled without ORCA)$' as version;
+select gp_opt_version() ~ '^(GPOPT version: 4.0.0, Xerces version: ([0-9]+\.){2}[0-9]+|gp_orca is not added to ''shared_preload_libraries'')$' as version;

From 5fada0abd05b43cb67bc137c80ea2ed2ea06331d Mon Sep 17 00:00:00 2001
From: Roman Eskin <r.eskin@arenadata.io>
Date: Mon, 25 Nov 2024 21:42:27 +1000
Subject: [PATCH 06/17] Move setting of 'optimizer' GUC to the extension
 (#1128)

Problem:
File 'guc_gp.c' contained a compile-time dependency on Orca, related to
'optimizer' GUC. It prevented moving of all Orca's code into a shared lib and
making its work transparent to the GPDB core.

This patch:
1. Sets the default value for 'optimizer' GUC to 'false'.
2. Adds enabling of 'optimizer' GUC in gp_orca extension shared lib.
3. Updates check in 'check_optimizer()' function. Now it utilizes runtime check
of planner_hook presence to distinguish if an external planner is available or
not.

Note: the semantic of 'optimizer' GUC has changed. Previously it was used
solely to enable & disable Orca. Now it is used to enable & disable any general
external planner. The name of GUC hasn't been changed, because too many places
in code and infrastructure rely on it, and we aim not to blow up the size of
the patch.
---
 gpcontrib/gp_orca/gporca.c      |  2 ++
 src/backend/utils/misc/guc_gp.c | 31 ++++++++++++++++++++++---------
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/gpcontrib/gp_orca/gporca.c b/gpcontrib/gp_orca/gporca.c
index cb1cbd12ba7d..b1b37640c636 100644
--- a/gpcontrib/gp_orca/gporca.c
+++ b/gpcontrib/gp_orca/gporca.c
@@ -265,6 +265,8 @@ _PG_init(void)
 
 	prev_explain = ExplainOneQuery_hook;
 	ExplainOneQuery_hook = gp_orca_explain;
+
+	SetConfigOption("optimizer", "on", PGC_POSTMASTER, PGC_S_DYNAMIC_DEFAULT);
 }
 
 void
diff --git a/src/backend/utils/misc/guc_gp.c b/src/backend/utils/misc/guc_gp.c
index fd9c3969165a..1850364c89e0 100644
--- a/src/backend/utils/misc/guc_gp.c
+++ b/src/backend/utils/misc/guc_gp.c
@@ -37,6 +37,7 @@
 #include "miscadmin.h"
 #include "optimizer/cost.h"
 #include "optimizer/planmain.h"
+#include "optimizer/planner.h"
 #include "pgstat.h"
 #include "parser/scansup.h"
 #include "postmaster/autovacuum.h"
@@ -1865,15 +1866,11 @@ struct config_bool ConfigureNamesBool_gp[] =
 
 	{
 		{"optimizer", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enable GPORCA."),
+			gettext_noop("Enable external planner."),
 			NULL
 		},
 		&optimizer,
-#ifdef USE_ORCA
-		true,
-#else
 		false,
-#endif
 		check_optimizer, NULL, NULL
 	},
 
@@ -5158,13 +5155,29 @@ check_gp_resource_group_bypass(bool *newval, void **extra, GucSource source)
 static bool
 check_optimizer(bool *newval, void **extra, GucSource source)
 {
-#ifndef USE_ORCA
 	if (*newval)
 	{
-		GUC_check_errmsg("ORCA is not supported by this build");
-		return false;
+		/*
+		 * Use external planner only on dispatcher.
+		 * Others do not have information if external planner is used or not,
+		 * so always disable 'optimizer' if we are not at dispatcher.
+		 * We can't return false here, as it will break SET command, when it is
+		 * dispatched across segments, if external planner is registered for
+		 * the dispatcher.
+		 */
+		if (GP_ROLE_DISPATCH != Gp_role)
+			*newval = false;
+		else if (NULL == planner_hook)
+		{
+			/*
+			 * Assume that, if no planner_hook is registered for the
+			 * coordinator, we can use only standard Postgres planner.
+			 * Thus, forbid setting the GUC.
+			 */
+			GUC_check_errmsg("External planner is not registered");
+			return false;
+		}
 	}
-#endif
 
 	if (!optimizer_control)
 	{

From 1761f83aee52706dbc7041a295482d4f242eb08c Mon Sep 17 00:00:00 2001
From: Denis Kovalev <d.kovalev@arenadata.io>
Date: Tue, 26 Nov 2024 14:47:35 +0500
Subject: [PATCH 07/17] ADBDEV-6625 Decouple ORCA from the pg_hint_plan
 extension (#1127)

Decouple ORCA from the pg_hint_plan extension.

This change moves the definition of plan_hint_hook from ORCA, which is going to
be an extension to the planner. Although this hook is currently used only in
ORCA, it makes it possible to use it with any planner that needs to get a hint
list from an extension, such as pg_hint_plan.

Additionally, we make this hook, plan_hint_hook, typed and return a pointer to
HintState, as it actually does. There is no reason to keep it generic and
returning void *.
---
 gpcontrib/pg_hint_plan/pg_hint_plan.c | 17 ++++-------------
 src/backend/gpopt/utils/COptTasks.cpp |  6 +++---
 src/backend/optimizer/plan/planner.c  |  4 +++-
 src/include/optimizer/orca.h          |  4 ----
 src/include/optimizer/planner.h       |  7 +++++++
 5 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/gpcontrib/pg_hint_plan/pg_hint_plan.c b/gpcontrib/pg_hint_plan/pg_hint_plan.c
index d5e919248dbd..548a010126f2 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,9 +411,9 @@ static void pg_hint_plan_ProcessUtility(PlannedStmt *pstmt,
 					ProcessUtilityContext context,
 					ParamListInfo params, QueryEnvironment *queryEnv,
 					DestReceiver *dest, char *completionTag);
-#ifdef USE_ORCA
-static void *external_plan_hint_hook(Query *parse);
-#endif
+
+static HintState *external_plan_hint_hook(Query *parse);
+
 static PlannedStmt *pg_hint_plan_planner(Query *parse, int cursorOptions,
 										 ParamListInfo boundParams);
 static RelOptInfo *pg_hint_plan_join_search(PlannerInfo *root,
@@ -575,9 +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
 static plan_hint_hook_type prev_plan_hint_hook = NULL;
-#endif
 
 /* Hold reference to currently active hint */
 static HintState *current_hint_state = NULL;
@@ -733,10 +730,8 @@ _PG_init(void)
 	ProcessUtility_hook = pg_hint_plan_ProcessUtility;
 	prev_ExecutorEnd = ExecutorEnd_hook;
 	ExecutorEnd_hook = pg_hint_ExecutorEnd;
-#ifdef USE_ORCA
 	prev_plan_hint_hook = plan_hint_hook;
 	plan_hint_hook = external_plan_hint_hook;
-#endif
 
 	/* setup PL/pgSQL plugin hook */
 	var_ptr = (PLpgSQL_plugin **) find_rendezvous_variable("PLpgSQL_plugin");
@@ -761,9 +756,7 @@ _PG_fini(void)
 	set_rel_pathlist_hook = prev_set_rel_pathlist;
 	ProcessUtility_hook = prev_ProcessUtility_hook;
 	ExecutorEnd_hook = prev_ExecutorEnd;
-#ifdef USE_ORCA
 	plan_hint_hook = prev_plan_hint_hook;
-#endif
 
 	/* uninstall PL/pgSQL plugin hook */
 	var_ptr = (PLpgSQL_plugin **) find_rendezvous_variable("PLpgSQL_plugin");
@@ -5038,12 +5031,11 @@ void plpgsql_query_erase_callback(ResourceReleasePhase phase,
 #include "pg_stat_statements.c"
 
 
-#ifdef USE_ORCA
 /*
  * This function hook allows external code (i.e. backend) to parse a query into
  * hint structures.
  */
-static void *
+static HintState *
 external_plan_hint_hook(Query *parse)
 {
 	HintState *hstate;
@@ -5060,4 +5052,3 @@ external_plan_hint_hook(Query *parse)
 	hstate = create_hintstate(parse, pstrdup(current_hint_str));
 	return hstate;
 }
-#endif
diff --git a/src/backend/gpopt/utils/COptTasks.cpp b/src/backend/gpopt/utils/COptTasks.cpp
index 5e04b942cbda..5e09e901bea4 100644
--- a/src/backend/gpopt/utils/COptTasks.cpp
+++ b/src/backend/gpopt/utils/COptTasks.cpp
@@ -65,6 +65,8 @@
 #include "naucrates/md/IMDRelStats.h"
 #include "naucrates/traceflags/traceflags.h"
 
+#include "optimizer/planner.h"
+
 using namespace gpos;
 using namespace gpopt;
 using namespace gpdxl;
@@ -79,8 +81,6 @@ using namespace gpdbcost;
 // default id for the source system
 const CSystemId default_sysid(IMDId::EmdidGeneral, GPOS_WSZ_STR_LENGTH("GPDB"));
 
-plan_hint_hook_type plan_hint_hook = nullptr;
-
 // Check one-to-one mapping of row hint types
 GPOS_CPL_ASSERT(CRowHint::RVT_ABSOLUTE ==
 					(CRowHint::RowsValueType) RVT_ABSOLUTE,
@@ -570,7 +570,7 @@ COptTasks::GetPlanHints(CMemoryPool *mp, Query *query)
 	{
 		// Calling plan_hint_hook creates pg_hint_plan hint structures
 		// (see optimizer/hints.h).
-		hintstate = (HintState *) plan_hint_hook(query);
+		hintstate = plan_hint_hook(query);
 	}
 
 	if (nullptr == hintstate)
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index ec3684734eaf..99c24b3c146c 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -91,8 +91,10 @@ double		cursor_tuple_fraction = DEFAULT_CURSOR_TUPLE_FRACTION;
 int			force_parallel_mode = FORCE_PARALLEL_OFF;
 bool		parallel_leader_participation = true;
 
-/* Hook for plugins to get control in planner() */
+/* Hooks for plugins to get control in planner() */
 planner_hook_type planner_hook = NULL;
+plan_hint_hook_type plan_hint_hook = NULL;
+
 
 /* Hook for plugins to get control when grouping_planner() plans upper rels */
 create_upper_paths_hook_type create_upper_paths_hook = NULL;
diff --git a/src/include/optimizer/orca.h b/src/include/optimizer/orca.h
index ad3ecdbce8c8..e6507977bcac 100644
--- a/src/include/optimizer/orca.h
+++ b/src/include/optimizer/orca.h
@@ -24,10 +24,6 @@
 extern PlannedStmt * optimize_query(Query *parse, int cursorOptions, ParamListInfo boundParams);
 extern Node *transformGroupedWindows(Node *node, void *context);
 
-// plan_hint_hook generates HintState by parsing a Query.
-typedef void *(*plan_hint_hook_type) (Query *parse);
-extern PGDLLIMPORT plan_hint_hook_type plan_hint_hook;
-
 extern void InitGPOPT();
 extern void TerminateGPOPT();
 
diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h
index 2d6a6db88bc9..b33bcd816aa1 100644
--- a/src/include/optimizer/planner.h
+++ b/src/include/optimizer/planner.h
@@ -29,6 +29,13 @@ typedef PlannedStmt *(*planner_hook_type) (Query *parse,
 										   ParamListInfo boundParams);
 extern PGDLLIMPORT planner_hook_type planner_hook;
 
+typedef struct HintState HintState;
+
+/* plan_hint_hook generates HintState by parsing a Query. */
+typedef HintState *(*plan_hint_hook_type) (Query *parse);
+extern PGDLLIMPORT plan_hint_hook_type plan_hint_hook;
+
+
 /* Hook for plugins to get control when grouping_planner() plans upper rels */
 typedef void (*create_upper_paths_hook_type) (PlannerInfo *root,
 											  UpperRelationKind stage,

From e8158ef134a0cb941f55b6921ceabe18faadc73d Mon Sep 17 00:00:00 2001
From: Roman Eskin <r.eskin@arenadata.io>
Date: Fri, 29 Nov 2024 15:24:23 +1000
Subject: [PATCH 08/17] Fix EnableXform() & DisableXform() functions when
 optimizer is off (#1135)

Problem:
If a session was started with disabled 'optimizer' GUC, and EnableXform() or
DisableXform() was called from a query, the query failed with a crash. The issue
was found on 'rowhints' test.

Cause:
The functions mentioned above tried to access internal Orca's structures, that
were not initialized, as the init was done during first planning only if
'optimizer' was on.

Fix:
Init Orca when planner is invoked first time regardless the value of
'optimizer'.

Note:
One can think that it is better to perform Orca init somewhen at the backend
init. But we'd like to keep Orca init after GPMemoryProtect_Init() (as it was
before Orca moved to an extension). And there is no existing standard hook to
call after GPMemoryProtect_Init() and before PostgresMain() enters its main
loop. Thus it is where it is.

No new tests are added, as existing 'rowhints' test can catch this issue.
---
 gpcontrib/gp_orca/funcs.cpp |  4 +++
 gpcontrib/gp_orca/gporca.c  | 64 +++++++++++++++++++++----------------
 2 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/gpcontrib/gp_orca/funcs.cpp b/gpcontrib/gp_orca/funcs.cpp
index 1c387a524160..072d4a90d211 100644
--- a/gpcontrib/gp_orca/funcs.cpp
+++ b/gpcontrib/gp_orca/funcs.cpp
@@ -36,6 +36,8 @@
 extern "C" {
 Datum DisableXform(PG_FUNCTION_ARGS)
 {
+	Assert(NULL != OptimizerMemoryContext);
+
 	char *szXform = text_to_cstring(PG_GETARG_TEXT_P(0));
 	bool is_result = COptTasks::SetXform(szXform, true /*fDisable*/);
 
@@ -68,6 +70,8 @@ Datum DisableXform(PG_FUNCTION_ARGS)
 extern "C" {
 Datum EnableXform(PG_FUNCTION_ARGS)
 {
+	Assert(NULL != OptimizerMemoryContext);
+
 	char *szXform = text_to_cstring(PG_GETARG_TEXT_P(0));
 	bool is_result = COptTasks::SetXform(szXform, false /*fDisable*/);
 
diff --git a/gpcontrib/gp_orca/gporca.c b/gpcontrib/gp_orca/gporca.c
index b1b37640c636..5ee146d0c7f5 100644
--- a/gpcontrib/gp_orca/gporca.c
+++ b/gpcontrib/gp_orca/gporca.c
@@ -84,40 +84,48 @@ gp_orca_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 	 *
 	 * 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_ROLE_DISPATCH == Gp_role && IS_QUERY_DISPATCHER())
 	{
-		instr_time starttime;
-		instr_time endtime;
-
+		/*
+		 * Init Orca even if GUC is disabled, as the query might involve
+		 * functions that update internal Orca's state (for example affecting
+		 * available transformations).
+		 */
 		if (NULL == OptimizerMemoryContext)
 			gp_orca_init();
 
-		if (gp_log_optimization_time)
-			INSTR_TIME_SET_CURRENT(starttime);
-
-		result = optimize_query(parse, cursorOptions, boundParams);
-
-		/* decide jit state */
-		if (result)
+		if (optimizer &&
+			(cursorOptions & CURSOR_OPT_SKIP_FOREIGN_PARTITIONS) == 0 &&
+			(cursorOptions & CURSOR_OPT_PARALLEL_RETRIEVE) == 0)
 		{
-			/*
-			 * Setting Jit flags for Optimizer
-			 */
-			gp_orca_compute_jit_flags(result);
+			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
+				 */
+				gp_orca_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;
 		}
-
-		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;
 	}
 
 	if (prev_planner)

From 5ff3de4a4a75099c09b4c798f9b57c63c30b93fd Mon Sep 17 00:00:00 2001
From: Roman Eskin <r.eskin@arenadata.io>
Date: Mon, 9 Dec 2024 09:03:05 +1000
Subject: [PATCH 09/17] Rename shared lib gp_orca into orca (#1137)

This patch renames gp_orca shared lib into orca, as we'd like to avoid using
any 'gp' prefix now. Also it updates file names and internal namings to avoid
the prefix.
---
 gpcontrib/Makefile                            |  2 +-
 gpcontrib/{gp_orca => orca}/.clang-format     |  0
 gpcontrib/{gp_orca => orca}/Makefile          | 12 +++----
 gpcontrib/{gp_orca => orca}/funcs.cpp         |  0
 gpcontrib/{gp_orca/gporca.c => orca/orca.c}   | 32 +++++++++----------
 .../utils/adt/gp_optimizer_functions.c        |  4 +--
 src/test/regress/expected/gp_metadata.out     |  2 +-
 src/test/regress/sql/gp_metadata.sql          |  2 +-
 8 files changed, 27 insertions(+), 27 deletions(-)
 rename gpcontrib/{gp_orca => orca}/.clang-format (100%)
 rename gpcontrib/{gp_orca => orca}/Makefile (73%)
 rename gpcontrib/{gp_orca => orca}/funcs.cpp (100%)
 rename gpcontrib/{gp_orca/gporca.c => orca/orca.c} (91%)

diff --git a/gpcontrib/Makefile b/gpcontrib/Makefile
index 150bb56f2291..431dd8ec43ed 100644
--- a/gpcontrib/Makefile
+++ b/gpcontrib/Makefile
@@ -37,7 +37,7 @@ ifeq "$(with_zstd)" "yes"
 	recurse_targets += zstd
 endif
 ifeq "$(enable_orca)" "yes"
-	recurse_targets += gp_orca
+	recurse_targets += orca
 endif
 $(call recurse,all install clean distclean, $(recurse_targets))
 
diff --git a/gpcontrib/gp_orca/.clang-format b/gpcontrib/orca/.clang-format
similarity index 100%
rename from gpcontrib/gp_orca/.clang-format
rename to gpcontrib/orca/.clang-format
diff --git a/gpcontrib/gp_orca/Makefile b/gpcontrib/orca/Makefile
similarity index 73%
rename from gpcontrib/gp_orca/Makefile
rename to gpcontrib/orca/Makefile
index d00b183c87c7..b3074f6afd63 100644
--- a/gpcontrib/gp_orca/Makefile
+++ b/gpcontrib/orca/Makefile
@@ -1,6 +1,6 @@
-MODULE_big = gp_orca
+MODULE_big = orca
 
-OBJS = gporca.o \
+OBJS = orca.o \
 	funcs.o \
 
 PG_CPPFLAGS = \
@@ -14,13 +14,13 @@ PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
 include $(PGXS)
 else
-subdir = gpcontrib/gp_orca
+subdir = gpcontrib/orca
 top_builddir = ../..
 include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
 
-install: install-gp-orca
+install: install-orca
 
-install-gp-orca: $(DESTDIR)$(datadir)/postgresql.conf.sample
-	sed -i "s/#shared_preload_libraries = ''/shared_preload_libraries = 'gp_orca'/g" $(DESTDIR)$(datadir)/postgresql.conf.sample
+install-orca: $(DESTDIR)$(datadir)/postgresql.conf.sample
+	sed -i "s/#shared_preload_libraries = ''/shared_preload_libraries = 'orca'/g" $(DESTDIR)$(datadir)/postgresql.conf.sample
diff --git a/gpcontrib/gp_orca/funcs.cpp b/gpcontrib/orca/funcs.cpp
similarity index 100%
rename from gpcontrib/gp_orca/funcs.cpp
rename to gpcontrib/orca/funcs.cpp
diff --git a/gpcontrib/gp_orca/gporca.c b/gpcontrib/orca/orca.c
similarity index 91%
rename from gpcontrib/gp_orca/gporca.c
rename to gpcontrib/orca/orca.c
index 5ee146d0c7f5..786d0a585f23 100644
--- a/gpcontrib/gp_orca/gporca.c
+++ b/gpcontrib/orca/orca.c
@@ -32,7 +32,7 @@ static ExplainOneQuery_hook_type prev_explain = NULL;
  * for Orca and used here for setting the JIT flags.
  */
 static void
-gp_orca_compute_jit_flags(PlannedStmt *pstmt)
+orca_compute_jit_flags(PlannedStmt *pstmt)
 {
 	compute_jit_flags(pstmt, optimizer_jit_above_cost,
 					  optimizer_jit_inline_above_cost,
@@ -40,7 +40,7 @@ gp_orca_compute_jit_flags(PlannedStmt *pstmt)
 }
 
 static void
-gp_orca_shutdown(int code, Datum arg)
+orca_shutdown(int code, Datum arg)
 {
 	(void) code;
 	(void) arg;
@@ -52,7 +52,7 @@ gp_orca_shutdown(int code, Datum arg)
 }
 
 static void
-gp_orca_init()
+orca_init()
 {
 	/* Initialize GPOPT */
 	OptimizerMemoryContext = AllocSetContextCreate(
@@ -62,11 +62,11 @@ gp_orca_init()
 
 	InitGPOPT();
 
-	before_shmem_exit(gp_orca_shutdown, 0);
+	before_shmem_exit(orca_shutdown, 0);
 }
 
 static PlannedStmt *
-gp_orca_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
+orca_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 {
 	PlannedStmt *result = NULL;
 
@@ -92,7 +92,7 @@ gp_orca_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 		 * available transformations).
 		 */
 		if (NULL == OptimizerMemoryContext)
-			gp_orca_init();
+			orca_init();
 
 		if (optimizer &&
 			(cursorOptions & CURSOR_OPT_SKIP_FOREIGN_PARTITIONS) == 0 &&
@@ -112,7 +112,7 @@ gp_orca_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 				/*
 				 * Setting Jit flags for Optimizer
 				 */
-				gp_orca_compute_jit_flags(result);
+				orca_compute_jit_flags(result);
 			}
 
 			if (gp_log_optimization_time)
@@ -137,12 +137,12 @@ gp_orca_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 }
 
 /*
- * gp_orca_explain_dxl -
+ * orca_explain_dxl -
  *	  print out the execution plan for one Query in DXL format
  *	  this function implicitly uses optimizer
  */
 static void
-gp_orca_explain_dxl(Query *query, ExplainState *es, ParamListInfo params)
+orca_explain_dxl(Query *query, ExplainState *es, ParamListInfo params)
 {
 	MemoryContext oldcxt = CurrentMemoryContext;
 	bool save_enumerate;
@@ -224,16 +224,16 @@ gp_orca_explain_dxl(Query *query, ExplainState *es, ParamListInfo params)
 }
 
 static void
-gp_orca_explain(Query *query, int cursorOptions, IntoClause *into,
-				ExplainState *es, const char *queryString, ParamListInfo params,
-				QueryEnvironment *queryEnv)
+orca_explain(Query *query, int cursorOptions, IntoClause *into,
+			 ExplainState *es, const char *queryString, ParamListInfo params,
+			 QueryEnvironment *queryEnv)
 {
 	if (es->dxl)
 	{
 		if (NULL == OptimizerMemoryContext)
-			gp_orca_init();
+			orca_init();
 
-		gp_orca_explain_dxl(query, es, params);
+		orca_explain_dxl(query, es, params);
 	}
 	else if (prev_explain)
 		(*prev_explain)(query, cursorOptions, into, es, queryString, params,
@@ -269,10 +269,10 @@ _PG_init(void)
 	GPMemoryProtect_RequestAddinStartupMemory(orca_mem);
 
 	prev_planner = planner_hook;
-	planner_hook = gp_orca_planner;
+	planner_hook = orca_planner;
 
 	prev_explain = ExplainOneQuery_hook;
-	ExplainOneQuery_hook = gp_orca_explain;
+	ExplainOneQuery_hook = orca_explain;
 
 	SetConfigOption("optimizer", "on", PGC_POSTMASTER, PGC_S_DYNAMIC_DEFAULT);
 }
diff --git a/src/backend/utils/adt/gp_optimizer_functions.c b/src/backend/utils/adt/gp_optimizer_functions.c
index 6b64c362264f..b2900789be26 100644
--- a/src/backend/utils/adt/gp_optimizer_functions.c
+++ b/src/backend/utils/adt/gp_optimizer_functions.c
@@ -24,7 +24,7 @@ typedef Datum (*gp_opt_version_func) (void);
 static Datum
 gp_optimizer_function_stub(PG_FUNCTION_ARGS)
 {
-	return CStringGetTextDatum("gp_orca is not added to 'shared_preload_libraries'");
+	return CStringGetTextDatum("orca is not added to 'shared_preload_libraries'");
 }
 
 /*
@@ -41,7 +41,7 @@ gp_optimizer_load_function(char *funcname)
 
 	PG_TRY();
 	{
-		func = load_external_function("$libdir/gp_orca", funcname, false, NULL);
+		func = load_external_function("$libdir/orca", funcname, false, NULL);
 	}
 	PG_CATCH();
 	{
diff --git a/src/test/regress/expected/gp_metadata.out b/src/test/regress/expected/gp_metadata.out
index 4157bbb45835..0561519d1e48 100644
--- a/src/test/regress/expected/gp_metadata.out
+++ b/src/test/regress/expected/gp_metadata.out
@@ -4,7 +4,7 @@ select version() ~ '^PostgreSQL (1[0-9]+)(\.[0-9]+)?(devel)?(beta[0-9])? \(Green
  t
 (1 row)
 
-select gp_opt_version() ~ '^(GPOPT version: 4.0.0, Xerces version: ([0-9]+\.){2}[0-9]+|gp_orca is not added to ''shared_preload_libraries'')$' as version;
+select gp_opt_version() ~ '^(GPOPT version: 4.0.0, Xerces version: ([0-9]+\.){2}[0-9]+|orca is not added to ''shared_preload_libraries'')$' as version;
  version 
 ---------
  t
diff --git a/src/test/regress/sql/gp_metadata.sql b/src/test/regress/sql/gp_metadata.sql
index 684cdf8f7671..33a0dffc91fe 100644
--- a/src/test/regress/sql/gp_metadata.sql
+++ b/src/test/regress/sql/gp_metadata.sql
@@ -1,2 +1,2 @@
 select version() ~ '^PostgreSQL (1[0-9]+)(\.[0-9]+)?(devel)?(beta[0-9])? \(Greenplum Database ([0-9]+\.){2}[0-9]+.+' as version;
-select gp_opt_version() ~ '^(GPOPT version: 4.0.0, Xerces version: ([0-9]+\.){2}[0-9]+|gp_orca is not added to ''shared_preload_libraries'')$' as version;
+select gp_opt_version() ~ '^(GPOPT version: 4.0.0, Xerces version: ([0-9]+\.){2}[0-9]+|orca is not added to ''shared_preload_libraries'')$' as version;

From ffd38cd13ce616eda61ccdc265bf1431d4763a9f Mon Sep 17 00:00:00 2001
From: Roman Eskin <r.eskin@arenadata.io>
Date: Mon, 9 Dec 2024 17:20:30 +1000
Subject: [PATCH 10/17] Fix explain_format and auto_explain tests (#1136)

Problem:
'explain_format' test failed if 'optimizer' GUC was set to 'on'.
'auto_explain' test failed with any 'optimizer' GUC value.

Cause:
Explain command outputs values of GUCs that affect planning if their value
differ from the default. Default value for 'optimizer' GUC has been changed to
'off' recently. So, the output of the tests has been changed as well.

Fix:
The patch updates matchsubs in 'explain_format' test to exclude handling of
'optimizer' GUC value and introduces respective updates in the files with
expected output. For 'auto_explain' test, it just updates the files with
expected output.
---
 contrib/auto_explain/expected/auto_explain.out           | 2 +-
 contrib/auto_explain/expected/auto_explain_optimizer.out | 2 +-
 src/test/regress/expected/explain_format.out             | 9 ++-------
 src/test/regress/expected/explain_format_optimizer.out   | 9 ++++-----
 src/test/regress/sql/explain_format.sql                  | 5 +----
 5 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/contrib/auto_explain/expected/auto_explain.out b/contrib/auto_explain/expected/auto_explain.out
index 1f326da4e537..566834f4f4e3 100644
--- a/contrib/auto_explain/expected/auto_explain.out
+++ b/contrib/auto_explain/expected/auto_explain.out
@@ -101,7 +101,7 @@ Finalize Aggregate  (cost=35148.64..35148.65 rows=1 width=8) (actual rows=1 loop
                           ->  Broadcast Motion 3:3  (slice2; segments: 3)  (cost=0.00..53.05 rows=1001 width=0) (actual rows=1001 loops=1)
                                 ->  Seq Scan on auto_explain_test.t2  (cost=0.00..13.01 rows=334 width=0) (actual rows=340 loops=1)
 Optimizer: Postgres-based planner
-Settings: enable_nestloop = 'on', optimizer = 'off'
+Settings: enable_nestloop = 'on'
   (slice0)    Executor memory: 131K bytes.
   (slice1)    Executor memory: 152K bytes avg x 3 workers, 152K bytes max (seg0).
   (slice2)    Executor memory: 42K bytes avg x 3 workers, 42K bytes max (seg0).
diff --git a/contrib/auto_explain/expected/auto_explain_optimizer.out b/contrib/auto_explain/expected/auto_explain_optimizer.out
index c0b7d7463a4f..bbd87bc080f3 100644
--- a/contrib/auto_explain/expected/auto_explain_optimizer.out
+++ b/contrib/auto_explain/expected/auto_explain_optimizer.out
@@ -101,7 +101,7 @@ Finalize Aggregate  (cost=0.00..1326086.34 rows=1 width=8) (actual rows=1 loops=
                           ->  Seq Scan on auto_explain_test.t1  (cost=0.00..431.01 rows=334 width=1) (actual rows=340 loops=1)
                     ->  Seq Scan on auto_explain_test.t2  (cost=0.00..431.01 rows=334 width=1) (actual rows=340 loops=1002)
 Optimizer: GPORCA
-Settings: enable_nestloop = 'on'
+Settings: enable_nestloop = 'on', optimizer = 'on'
   (slice0)    Executor memory: 67K bytes.
   (slice1)    Executor memory: 119K bytes avg x 3 workers, 119K bytes max (seg0).
   (slice2)    Executor memory: 42K bytes avg x 3 workers, 42K bytes max (seg0).
diff --git a/src/test/regress/expected/explain_format.out b/src/test/regress/expected/explain_format.out
index aeec78c03f47..473d093bc9a5 100644
--- a/src/test/regress/expected/explain_format.out
+++ b/src/test/regress/expected/explain_format.out
@@ -1,5 +1,5 @@
 -- Tests EXPLAIN format output
--- ignore the variable JIT gucs and "optimizer = 'off'" in Settings (unaligned mode + text format)
+-- ignore the variable JIT gucs in Settings (unaligned mode + text format)
 -- start_matchsubs
 -- m/^Settings:.*/
 -- s/,?\s*optimizer_jit\w*\s*=\s*[^,\n]+//g
@@ -7,13 +7,10 @@
 -- s/,?\s*jit\w*\s*=\s*[^,\n]+//g
 -- m/^Settings:.*/
 -- s/^Settings:[,\s]*/Settings: /
--- m/^Settings:.*/
--- s/,?\s*optimizer\w*\s*=\s*'off'//g
 -- end_matchsubs
 -- ignore variable JIT gucs which can be shown when SETTINGS=ON
 -- start_matchignore
 -- m/^\s+jit\w*:/
--- m/\s*optimizer:\s*"off"/
 -- m/^\s+optimizer_jit\w*:/
 -- end_matchignore
 -- To produce stable regression test output, it's usually necessary to
@@ -299,7 +296,6 @@ explain_filter
   Optimizer: "Postgres-based planner"
   Settings: 
     cpu_index_tuple_cost: "N.N"
-    optimizer: "off"
     random_page_cost: "N"
 (1 row)
 select explain_filter('EXPLAIN (FORMAT YAML, VERBOSE, SETTINGS ON) SELECT * from boxes;');
@@ -342,7 +338,6 @@ explain_filter
   Settings: 
     cpu_index_tuple_cost: "N.N"
     random_page_cost: "N"
-    optimizer: "off"
 (1 row)
 --- Check Explain Analyze YAML output that include the slices information
 select explain_filter('EXPLAIN (ANALYZE, FORMAT YAML) SELECT * from boxes LEFT JOIN apples ON apples.id = boxes.apple_id LEFT JOIN box_locations ON box_locations.id = boxes.location_id;');
@@ -566,7 +561,7 @@ Gather Motion N:N  (sliceN; segments: N)  (cost=N.N..N.N rows=N width=N) (actual
         ->  Seq Scan on public.boxes  (cost=N.N..N.N rows=N width=N) (actual time=N.N..N.N rows=N loops=N)
               Output: id, apple_id, location_id
 Optimizer: Postgres-based planner
-Settings: cpu_index_tuple_cost = 'N.N', optimizer = 'off', random_page_cost = 'N'
+Settings: cpu_index_tuple_cost = 'N.N', random_page_cost = 'N'
 Planning Time: N.N ms
   (sliceN)    Executor memory: NK bytes.
   (sliceN)    Executor memory: NK bytes avg x N workers, NK bytes max (segN).  Work_mem: NK bytes max.
diff --git a/src/test/regress/expected/explain_format_optimizer.out b/src/test/regress/expected/explain_format_optimizer.out
index 34ddbd88a87c..93bca35a094e 100644
--- a/src/test/regress/expected/explain_format_optimizer.out
+++ b/src/test/regress/expected/explain_format_optimizer.out
@@ -1,5 +1,5 @@
 -- Tests EXPLAIN format output
--- ignore the variable JIT gucs and "optimizer = 'off'" in Settings (unaligned mode + text format)
+-- ignore the variable JIT gucs in Settings (unaligned mode + text format)
 -- start_matchsubs
 -- m/^Settings:.*/
 -- s/,?\s*optimizer_jit\w*\s*=\s*[^,\n]+//g
@@ -7,13 +7,10 @@
 -- s/,?\s*jit\w*\s*=\s*[^,\n]+//g
 -- m/^Settings:.*/
 -- s/^Settings:[,\s]*/Settings: /
--- m/^Settings:.*/
--- s/,?\s*optimizer\w*\s*=\s*'off'//g
 -- end_matchsubs
 -- ignore variable JIT gucs which can be shown when SETTINGS=ON
 -- start_matchignore
 -- m/^\s+jit\w*:/
--- m/\s*optimizer:\s*"off"/
 -- m/^\s+optimizer_jit\w*:/
 -- end_matchignore
 -- To produce stable regression test output, it's usually necessary to
@@ -281,6 +278,7 @@ explain_filter
   Optimizer: "GPORCA"
   Settings: 
     cpu_index_tuple_cost: "N.N"
+    optimizer: "on"
     random_page_cost: "N"
 (1 row)
 select explain_filter('EXPLAIN (FORMAT YAML, VERBOSE, SETTINGS ON) SELECT * from boxes;');
@@ -323,6 +321,7 @@ explain_filter
   Settings: 
     cpu_index_tuple_cost: "N.N"
     random_page_cost: "N"
+    optimizer: "on"
 (1 row)
 --- Check Explain Analyze YAML output that include the slices information
 select explain_filter('EXPLAIN (ANALYZE, FORMAT YAML) SELECT * from boxes LEFT JOIN apples ON apples.id = boxes.apple_id LEFT JOIN box_locations ON box_locations.id = boxes.location_id;');
@@ -514,7 +513,7 @@ Gather Motion N:N  (sliceN; segments: N)  (cost=N.N..N.N rows=N width=N) (actual
         ->  Seq Scan on public.boxes  (cost=N.N..N.N rows=N width=N) (actual time=N.N..N.N rows=N loops=N)
               Output: id, apple_id, location_id
 Optimizer: GPORCA
-Settings: cpu_index_tuple_cost = 'N.N', random_page_cost = 'N'
+Settings: cpu_index_tuple_cost = 'N.N', optimizer = 'on', random_page_cost = 'N'
 Planning Time: N.N ms
   (sliceN)    Executor memory: NK bytes.
   (sliceN)    Executor memory: NK bytes avg x N workers, NK bytes max (segN).  Work_mem: NK bytes max.
diff --git a/src/test/regress/sql/explain_format.sql b/src/test/regress/sql/explain_format.sql
index 3f1df33e24f6..2cba6180f679 100644
--- a/src/test/regress/sql/explain_format.sql
+++ b/src/test/regress/sql/explain_format.sql
@@ -1,6 +1,6 @@
 -- Tests EXPLAIN format output
 
--- ignore the variable JIT gucs and "optimizer = 'off'" in Settings (unaligned mode + text format)
+-- ignore the variable JIT gucs in Settings (unaligned mode + text format)
 -- start_matchsubs
 -- m/^Settings:.*/
 -- s/,?\s*optimizer_jit\w*\s*=\s*[^,\n]+//g
@@ -8,14 +8,11 @@
 -- s/,?\s*jit\w*\s*=\s*[^,\n]+//g
 -- m/^Settings:.*/
 -- s/^Settings:[,\s]*/Settings: /
--- m/^Settings:.*/
--- s/,?\s*optimizer\w*\s*=\s*'off'//g
 -- end_matchsubs
 
 -- ignore variable JIT gucs which can be shown when SETTINGS=ON
 -- start_matchignore
 -- m/^\s+jit\w*:/
--- m/\s*optimizer:\s*"off"/
 -- m/^\s+optimizer_jit\w*:/
 -- end_matchignore
 

From 7444a17a201685dbb4c90e4b6e7c1a23d90d6a2a Mon Sep 17 00:00:00 2001
From: Roman Eskin <r.eskin@arenadata.io>
Date: Thu, 12 Dec 2024 20:13:59 +1000
Subject: [PATCH 11/17] Fix error "External planner is not registered" (#1154)

Problem description:
Tests for 'pg_stat_statements', launched with 'optimizer=on', failed with error:
"FATAL: External planner is not registered".

Root cause:
Setup and teardown steps of 'pg_stat_statements' configured values of
'shared_preload_libraries' without taking into account its previous value. Thus,
it was set to 'pg_stat_statements' at test start, and to empty string after the
tests. And 'orca' lib was lost. It caused the error.

Fix:
Now setup and teardown steps take into account previous value of
'shared_preload_libraries'.
---
 contrib/pg_stat_statements/sql/disable_pg_stat_statements.sql | 2 +-
 contrib/pg_stat_statements/sql/enable_pg_stat_statements.sql  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/pg_stat_statements/sql/disable_pg_stat_statements.sql b/contrib/pg_stat_statements/sql/disable_pg_stat_statements.sql
index 2416cbf7b920..f8a992a4b983 100644
--- a/contrib/pg_stat_statements/sql/disable_pg_stat_statements.sql
+++ b/contrib/pg_stat_statements/sql/disable_pg_stat_statements.sql
@@ -1,4 +1,4 @@
 -- start_ignore
-\! gpconfig -r shared_preload_libraries;
+\! gpconfig -c shared_preload_libraries -v "$(psql -At -c "SELECT array_to_string(array_remove(string_to_array(current_setting('shared_preload_libraries'), ','), 'pg_stat_statements'), ',')" postgres)"
 \! gpstop -raq -M fast;
 -- end_ignore
diff --git a/contrib/pg_stat_statements/sql/enable_pg_stat_statements.sql b/contrib/pg_stat_statements/sql/enable_pg_stat_statements.sql
index 1ca67da95530..eb79d685a10c 100644
--- a/contrib/pg_stat_statements/sql/enable_pg_stat_statements.sql
+++ b/contrib/pg_stat_statements/sql/enable_pg_stat_statements.sql
@@ -1,4 +1,4 @@
 -- start_ignore
-\! gpconfig -c shared_preload_libraries -v 'pg_stat_statements';
+\! gpconfig -c shared_preload_libraries -v "$(psql -At -c "SELECT array_to_string(array_append(string_to_array(current_setting('shared_preload_libraries'), ','), 'pg_stat_statements'), ',')" postgres)"
 \! gpstop -raq -M fast;
 -- end_ignore

From 1dcc5b92c177602cbf7823c49b2b5e3ef1c7ec1c Mon Sep 17 00:00:00 2001
From: Roman Eskin <r.eskin@arenadata.io>
Date: Fri, 13 Dec 2024 20:19:31 +1000
Subject: [PATCH 12/17] Move Orca src files into the extension (#1151)

As a part of the bigger task of separating Orca into a Postgres extension, this
patch:
1. Moves 'src/backend/gporca/' and 'src/backend/gpopt/' folders with source
files into the extension.
2. Moves related headers into the extension.
3. Moves 'src/backend/optimizer/plan/orca.c' into the extension. As the
extension already contains 'orca.c' file with hooks implementation, old 'orca.c'
is renamed to 'orca_entry.c'.
4. All obj file names of newly added files are added into OBJS of
'gpcontrib/orca/Makefile'. It is mandated by the build infrastructure for
extensions (called PGXS). Old makefiles in 'gporca' and 'gpopt' are removed, as
no more needed. But CMake files are preserved, allowing to launch 'gporca' unit
tests.
5. Updates ABI ignore files, as some symbols are now missing in the core.
6. Moves OptimizerMemoryContext into the extension, as now it is referenced only
by the code in the extension.
7. Updates 'fmt' and 'tidy' tools and moves them into the extension, as they
were used only for Orca code.
Note: 'src/tools/vagrant' also contains some references to Orca code, but it
looks too obsolete to be workable (as it references the old gporca git repo,
when Orca wasn't a part of the core). So it is left unchanged.
8. Updates Readme and infrastructure files due to all changes above.
---
 .../7.2.0_arenadata7/postgres.symbols.ignore  |   5 +
 .../postgres.types.ignore                     |   1 -
 .travis.yml                                   |  20 +-
 arenadata/Dockerfile.linter                   |   2 +-
 concourse/scripts/unit_tests_gporca.bash      |   4 +-
 concourse/tasks/check_format.yml              |   2 +-
 concourse/tasks/clang_tidy.yml                |  16 +-
 gpcontrib/orca/Makefile                       |  52 ++++-
 .../orca}/gpopt/.clang-format                 |   0
 .../orca}/gpopt/CGPOptimizer.cpp              |   0
 {src/backend => gpcontrib/orca}/gpopt/README  |   0
 .../gpopt/config/CConfigParamMapping.cpp      |   0
 .../orca}/gpopt/gpdbwrappers.cpp              |   0
 .../gpopt/relcache/CMDProviderRelcache.cpp    |   0
 .../orca}/gpopt/translate/CCTEListEntry.cpp   |   0
 .../gpopt/translate/CContextDXLToPlStmt.cpp   |   0
 .../gpopt/translate/CContextQueryToDXL.cpp    |   0
 .../gpopt/translate/CDXLTranslateContext.cpp  |   0
 .../CDXLTranslateContextBaseTable.cpp         |   0
 .../gpopt/translate/CMappingColIdVar.cpp      |   0
 .../translate/CMappingColIdVarPlStmt.cpp      |   0
 .../translate/CMappingElementColIdParamId.cpp |   0
 .../gpopt/translate/CMappingVarColId.cpp      |   0
 .../translate/CPartPruneStepsBuilder.cpp      |   0
 .../orca}/gpopt/translate/CQueryMutators.cpp  |   0
 .../translate/CTranslatorDXLToPlStmt.cpp      |   0
 .../translate/CTranslatorDXLToScalar.cpp      |   0
 .../gpopt/translate/CTranslatorQueryToDXL.cpp |   0
 .../translate/CTranslatorRelcacheToDXL.cpp    |   0
 .../translate/CTranslatorScalarToDXL.cpp      |   0
 .../gpopt/translate/CTranslatorUtils.cpp      |   0
 .../orca}/gpopt/translate/README              |   0
 .../gpopt/utils/CConstExprEvaluatorProxy.cpp  |   0
 .../orca}/gpopt/utils/CMemoryPoolPalloc.cpp   |   0
 .../gpopt/utils/CMemoryPoolPallocManager.cpp  |   0
 .../orca}/gpopt/utils/COptTasks.cpp           |   2 +-
 .../orca}/gpopt/utils/RelationWrapper.cpp     |   0
 .../orca}/gporca/.clang-format                |   0
 .../orca}/gporca/.gitignore                   |   0
 .../orca}/gporca/CMakeLists.txt               |   0
 .../orca}/gporca/COPYRIGHT                    |   0
 .../orca}/gporca/README.format.md             |  12 +-
 .../orca}/gporca/README.md                    |   4 +-
 .../orca}/gporca/README.memo.md               |   0
 .../orca}/gporca/README.tidy.md               |  22 +-
 .../orca}/gporca/StyleGuide.md                |   0
 .../orca}/gporca/clang-format.intent.yaml     |   0
 .../orca}/gporca/cmake/FindXerces.cmake       |   0
 .../orca}/gporca/concourse/README.md          |   0
 .../orca}/gporca/concourse/build_and_test.py  |   0
 .../concourse/test_explain_pipeline.yml       |   0
 .../gporca/concourse/test_orca_pipeline.yml   |   0
 .../orca}/gporca/concourse/vars_example.yml   |   0
 .../gporca/concourse/xerces-c/build_xerces.py |   0
 .../xerces-c/xerces-c-3.1.2.tar.gz.sha256     |   0
 .../orca}/gporca/data/dxl/cost/cost0.xml      |   0
 .../orca}/gporca/data/dxl/cost/wrong-cost.xml |   0
 .../gporca/data/dxl/csq_tests/dxl-q1.xml      |   0
 .../gporca/data/dxl/csq_tests/dxl-q10.xml     |   0
 .../gporca/data/dxl/csq_tests/dxl-q11.xml     |   0
 .../gporca/data/dxl/csq_tests/dxl-q12.xml     |   0
 .../gporca/data/dxl/csq_tests/dxl-q13.xml     |   0
 .../gporca/data/dxl/csq_tests/dxl-q14.xml     |   0
 .../gporca/data/dxl/csq_tests/dxl-q15.xml     |   0
 .../gporca/data/dxl/csq_tests/dxl-q16.xml     |   0
 .../gporca/data/dxl/csq_tests/dxl-q2.xml      |   0
 .../gporca/data/dxl/csq_tests/dxl-q3.xml      |   0
 .../gporca/data/dxl/csq_tests/dxl-q4.xml      |   0
 .../gporca/data/dxl/csq_tests/dxl-q5.xml      |   0
 .../gporca/data/dxl/csq_tests/dxl-q6.xml      |   0
 .../gporca/data/dxl/csq_tests/dxl-q7.xml      |   0
 .../gporca/data/dxl/csq_tests/dxl-q8.xml      |   0
 .../gporca/data/dxl/csq_tests/dxl-q9.xml      |   0
 .../dxl/expressiontests/AggNoGroupByPlan.xml  | Bin
 .../dxl/expressiontests/AggNoGroupByQuery.xml |   0
 .../data/dxl/expressiontests/ArrayCmpPlan.xml |   0
 .../dxl/expressiontests/ArrayCmpQuery.xml     |   0
 .../data/dxl/expressiontests/ArrayPlan.xml    |   0
 .../data/dxl/expressiontests/ArrayQuery.xml   |   0
 .../dxl/expressiontests/BroadcastPlan.xml     |   0
 .../dxl/expressiontests/BroadcastQuery.xml    |   0
 .../dxl/expressiontests/CScalarConstArray.xml |   0
 .../data/dxl/expressiontests/CoalescePlan.xml |   0
 .../dxl/expressiontests/CoalesceQuery.xml     |   0
 .../data/dxl/expressiontests/ConstPlan.xml    |   0
 .../data/dxl/expressiontests/ConstQuery.xml   |   0
 .../dxl/expressiontests/ConstTableGetPlan.xml |   0
 .../expressiontests/ConstTableGetQuery.xml    |   0
 .../dxl/expressiontests/ContradictionPlan.xml |   0
 .../expressiontests/ContradictionQuery.xml    |   0
 .../CorrelatedSubqueryBooleanPlan.xml         |   0
 .../CorrelatedSubqueryBooleanQuery.xml        |   0
 .../CorrelatedSubqueryFilterPlan.xml          |   0
 .../CorrelatedSubqueryFilterQuery.xml         |   0
 .../CorrelatedSubqueryOuterPlan.xml           |   0
 .../CorrelatedSubqueryOuterQuery.xml          |   0
 .../CorrelatedSubqueryPlan.xml                |   0
 .../CorrelatedSubqueryQuery.xml               |   0
 .../CorrelatedSubqueryResultPlan.xml          |   0
 .../CorrelatedSubqueryResultQuery.xml         |   0
 .../dxl/expressiontests/DifferencePlan.xml    |   0
 .../dxl/expressiontests/DifferenceQuery.xml   |   0
 .../dxl/expressiontests/DoubleSortPlan.xml    |   0
 .../dxl/expressiontests/DoubleSortQuery.xml   |   0
 .../DynamicGetBooleanNotPlan.xml              |   0
 .../DynamicGetBooleanNotQuery.xml             |   0
 .../expressiontests/DynamicGetBooleanPlan.xml |   0
 .../DynamicGetBooleanQuery.xml                |   0
 .../DynamicGetCountStarPlan.xml               |   0
 .../DynamicGetCountStarQuery.xml              |   0
 .../DynamicGetHashJoinOtherKeyPlan.xml        |   0
 .../DynamicGetHashJoinOtherKeyQuery.xml       |   0
 .../DynamicGetHashJoinPartKeyPlan.xml         |   0
 .../DynamicGetHashJoinPartKeyQuery.xml        |   0
 .../DynamicGetMultiJoinPlan.xml               |   0
 .../DynamicGetMultiJoinQuery.xml              |   0
 .../DynamicGetNLJoinOtherKeyPlan.xml          |   0
 .../DynamicGetNLJoinOtherKeyQuery.xml         |   0
 .../DynamicGetNLJoinPartKeyPlan.xml           |   0
 .../DynamicGetNLJoinPartKeyQuery.xml          |   0
 .../dxl/expressiontests/DynamicGetPlan.xml    |   0
 .../expressiontests/DynamicGetPointPlan.xml   |   0
 .../expressiontests/DynamicGetPointQuery.xml  |   0
 .../dxl/expressiontests/DynamicGetQuery.xml   |   0
 .../DynamicGetRangeSelectPlan1.xml            |   0
 .../DynamicGetRangeSelectPlan2.xml            |   0
 .../DynamicGetRangeSelectQuery1.xml           |   0
 .../DynamicGetRangeSelectQuery2.xml           |   0
 .../DynamicGetUnionAllOuterJoinPlan.xml       |   0
 .../DynamicGetUnionAllOuterJoinQuery.xml      |   0
 .../dxl/expressiontests/FilterLogOpPlan.xml   |   0
 .../dxl/expressiontests/FilterLogOpQuery.xml  |   0
 .../FilterOnTableWithIndexPlan.xml            |   0
 .../FilterOnTableWithIndexQuery.xml           |   0
 .../data/dxl/expressiontests/FilterPlan.xml   |   0
 .../data/dxl/expressiontests/FilterQuery.xml  |   0
 .../data/dxl/expressiontests/FuncExprPlan.xml |   0
 .../dxl/expressiontests/FuncExprQuery.xml     |   0
 .../dxl/expressiontests/GatherMergePlan.xml   |   0
 .../dxl/expressiontests/GatherMergeQuery.xml  |   0
 .../data/dxl/expressiontests/GatherPlan.xml   |   0
 .../data/dxl/expressiontests/GatherQuery.xml  |   0
 .../dxl/expressiontests/GroupByNoAggPlan.xml  |   0
 .../dxl/expressiontests/GroupByNoAggQuery.xml |   0
 .../data/dxl/expressiontests/GroupByPlan.xml  |   0
 .../data/dxl/expressiontests/GroupByQuery.xml |   0
 .../expressiontests/HashDistributePlan.xml    |   0
 .../expressiontests/HashDistributeQuery.xml   |   0
 .../data/dxl/expressiontests/HashJoinPlan.xml |   0
 .../dxl/expressiontests/HashJoinQuery.xml     |   0
 .../dxl/expressiontests/InnerJoinPlan.xml     |   0
 .../dxl/expressiontests/InnerJoinQuery.xml    |   0
 .../expressiontests/InsertPartitionedPlan.xml |   0
 .../InsertPartitionedQuery.xml                |   0
 .../dxl/expressiontests/IntersectAllPlan.xml  |   0
 .../dxl/expressiontests/IntersectAllQuery.xml |   0
 .../dxl/expressiontests/IntersectPlan.xml     |   0
 .../dxl/expressiontests/IntersectQuery.xml    |   0
 .../expressiontests/LOJ-TO-InnerJoin-Q1.xml   |   0
 .../expressiontests/LOJ-TO-InnerJoin-Q10.xml  |   0
 .../expressiontests/LOJ-TO-InnerJoin-Q11.xml  |   0
 .../expressiontests/LOJ-TO-InnerJoin-Q12.xml  |   0
 .../expressiontests/LOJ-TO-InnerJoin-Q13.xml  |   0
 .../expressiontests/LOJ-TO-InnerJoin-Q14.xml  |   0
 .../expressiontests/LOJ-TO-InnerJoin-Q15.xml  |   0
 .../expressiontests/LOJ-TO-InnerJoin-Q16.xml  |   0
 .../expressiontests/LOJ-TO-InnerJoin-Q2.xml   |   0
 .../expressiontests/LOJ-TO-InnerJoin-Q3.xml   |   0
 .../expressiontests/LOJ-TO-InnerJoin-Q4.xml   |   0
 .../expressiontests/LOJ-TO-InnerJoin-Q5.xml   |   0
 .../expressiontests/LOJ-TO-InnerJoin-Q6.xml   |   0
 .../expressiontests/LOJ-TO-InnerJoin-Q7.xml   |   0
 .../expressiontests/LOJ-TO-InnerJoin-Q8.xml   |   0
 .../expressiontests/LOJ-TO-InnerJoin-Q9.xml   |   0
 .../expressiontests/LeftOuterJoinHJPlan.xml   |   0
 .../expressiontests/LeftOuterJoinHJQuery.xml  |   0
 .../expressiontests/LeftOuterJoinNLPlan.xml   |   0
 .../expressiontests/LeftOuterJoinNLQuery.xml  |   0
 .../data/dxl/expressiontests/LimitQuery.xml   |   0
 .../expressiontests/LimitQueryNoOffset.xml    |   0
 .../MultipleWindowFuncPlan.xml                |   0
 .../MultipleWindowFuncQuery.xml               |   0
 .../data/dxl/expressiontests/NAryJoinPlan.xml |   0
 .../dxl/expressiontests/NAryJoinQuery.xml     |   0
 .../dxl/expressiontests/NLLASJoinPlan.xml     |   0
 .../dxl/expressiontests/NLLASJoinQuery.xml    |   0
 .../data/dxl/expressiontests/NLLSJoinPlan.xml |   0
 .../dxl/expressiontests/NLLSJoinQuery.xml     |   0
 .../data/dxl/expressiontests/NullIfPlan.xml   |   0
 .../data/dxl/expressiontests/NullIfQuery.xml  |   0
 .../expressiontests/NullableDroppedColumn.xml |   0
 .../data/dxl/expressiontests/ProjectPlan.xml  |   0
 .../data/dxl/expressiontests/ProjectQuery.xml |   0
 .../dxl/expressiontests/RedundantSortPlan.xml |   0
 .../expressiontests/RedundantSortQuery.xml    |   0
 .../expressiontests/RightOuterJoinPlan.xml    |   0
 .../expressiontests/RightOuterJoinQuery.xml   |   0
 .../expressiontests/ScalarCaseTestPlan.xml    |   0
 .../expressiontests/ScalarCaseTestQuery.xml   |   0
 .../dxl/expressiontests/ScalarCastPlan.xml    |   0
 .../dxl/expressiontests/ScalarCastQuery.xml   |   0
 .../expressiontests/ScalarDistFromPlan.xml    |   0
 .../expressiontests/ScalarDistFromQuery.xml   |   0
 .../data/dxl/expressiontests/ScalarIfPlan.xml |   0
 .../dxl/expressiontests/ScalarIfQuery.xml     |   0
 .../expressiontests/ScalarNullTestPlan.xml    |   0
 .../expressiontests/ScalarNullTestQuery.xml   |   0
 .../dxl/expressiontests/ScalarOpAddPlan.xml   |   0
 .../dxl/expressiontests/ScalarOpAddQuery.xml  |   0
 .../ScalarSubqueryAnyAllPlan.xml              |   0
 .../ScalarSubqueryAnyAllQuery.xml             |   0
 .../ScalarSubqueryExistentialPlan.xml         |   0
 .../ScalarSubqueryExistentialQuery.xml        |   0
 .../expressiontests/ScalarSubqueryPlan.xml    |   0
 .../expressiontests/ScalarSubqueryQuery.xml   |   0
 .../dxl/expressiontests/ScalarSwitchPlan.xml  |   0
 .../dxl/expressiontests/ScalarSwitchQuery.xml |   0
 .../data/dxl/expressiontests/SortPlan.xml     |   0
 .../data/dxl/expressiontests/SortQuery.xml    |   0
 .../data/dxl/expressiontests/SpoolPlan.xml    |   0
 .../data/dxl/expressiontests/SpoolQuery.xml   |   0
 .../data/dxl/expressiontests/TableScan.xml    |   0
 .../dxl/expressiontests/TableScanPlan.xml     |   0
 .../dxl/expressiontests/TableScanQuery.xml    |   0
 .../TableScanWithFilterPlan.xml               |   0
 .../TableScanWithFilterQuery.xml              |   0
 .../TableValuedFunctionJoinPlan.xml           |   0
 .../TableValuedFunctionJoinQuery.xml          |   0
 .../TableValuedFunctionPlan.xml               |   0
 .../TableValuedFunctionQuery.xml              |   0
 .../data/dxl/expressiontests/UnionAllPlan.xml |   0
 .../dxl/expressiontests/UnionAllQuery.xml     |   0
 .../expressiontests/UnionAllRemappedPlan.xml  |   0
 .../expressiontests/UnionAllRemappedQuery.xml |   0
 .../data/dxl/expressiontests/UnionPlan.xml    |   0
 .../data/dxl/expressiontests/UnionQuery.xml   |   0
 .../dxl/expressiontests/VolatileCSQPlan.xml   |   0
 .../dxl/expressiontests/VolatileCSQQuery.xml  |   0
 .../dxl/expressiontests/VolatileFuncPlan.xml  |   0
 .../dxl/expressiontests/VolatileFuncQuery.xml |   0
 .../expressiontests/VolatileHashJoinPlan.xml  |   0
 .../expressiontests/VolatileHashJoinQuery.xml |   0
 .../expressiontests/VolatileNLJoinPlan.xml    |   0
 .../expressiontests/VolatileNLJoinQuery.xml   |   0
 .../dxl/expressiontests/VolatileTVFPlan.xml   |   0
 .../dxl/expressiontests/VolatileTVFQuery.xml  |   0
 .../VolatileWithPartTablePlan.xml             |   0
 .../VolatileWithPartTableQuery.xml            |   0
 ...-OuterRef-Partition-Order-Frames-Query.xml |   0
 ...WinFunc-OuterRef-Partition-Order-Query.xml |   0
 .../WinFunc-OuterRef-Partition-Query.xml      |   0
 .../dxl/expressiontests/WinFunc-Tests-MD.xml  |   0
 .../data/dxl/expressiontests/WindowPlan.xml   |   0
 .../WindowPlanEmptyPartitionBy.xml            |   0
 .../data/dxl/expressiontests/WindowQuery.xml  |   0
 .../WindowQueryEmptyPartitionBy.xml           |   0
 .../expressiontests/WindowWithFramePlan.xml   |   0
 .../expressiontests/WindowWithFrameQuery.xml  |   0
 .../WindowWithNoLeadingEdgePlan.xml           |   0
 .../WindowWithNoLeadingEdgeQuery.xml          |   0
 .../orca}/gporca/data/dxl/formatxml.sh        |   0
 .../gporca/data/dxl/indexjoin/positive_04.mdp |   0
 .../orca}/gporca/data/dxl/metadata/md.xml     |   0
 ...ayJoinOnMultiDistributionColumnsTables.mdp |   0
 ...MultiDistributionColumnsTablesNoMotion.mdp |   0
 ...JoinUsingOperatorsOfNonDefaultOpfamily.mdp |   0
 ...WayJoinInferredPredsRemovedWith2Motion.mdp |   0
 .../dxl/minidump/AddEqualityPredicates.mdp    |   0
 .../dxl/minidump/AddPredsInSubqueries.mdp     |   0
 .../AddRedistributeBeforeInsert-1.mdp         |   0
 .../AddRedistributeBeforeInsert-2.mdp         |   0
 .../AddRedistributeBeforeInsert-3.mdp         |   0
 .../AddRedistributeBeforeInsert-4.mdp         |   0
 .../AddRedistributeBeforeInsert-5.mdp         |   0
 .../gporca/data/dxl/minidump/Agg-Limit.mdp    |   0
 .../data/dxl/minidump/Agg-NonSplittable.mdp   |   0
 .../minidump/AggSubqCollapseFalseFilter.mdp   |   0
 .../data/dxl/minidump/AggWithSubqArgs.mdp     |   0
 .../data/dxl/minidump/AggWithVolatileFunc.mdp |   0
 .../minidump/AggonExternalTableNoMotion.mdp   |   0
 .../data/dxl/minidump/AggregateWithSkew.mdp   |   0
 .../AggregatesConstraintDeriveNegation.mdp    |   0
 .../AllSubqueryWithSubqueryInScalar.mdp       |   0
 .../AllowIndexOnlyScanOnAppendOnlyTable.mdp   |   0
 ...yScanOnMixedAppendOnlyPartitionedTable.mdp |   0
 ...owIndexOnlyScanOnMixedPartitionedTable.mdp |   0
 .../dxl/minidump/AntiSemiJoin2Select-1.mdp    |   0
 .../dxl/minidump/AntiSemiJoin2Select-2.mdp    |   0
 .../AnyPredicate-Over-UnionOfConsts.mdp       |   0
 .../AnySubq-With-NonScalarSubqueryChild-1.mdp |   0
 .../AnySubq-With-NonScalarSubqueryChild-2.mdp |   0
 .../AnySubq-With-NonScalarSubqueryChild-3.mdp |   0
 .../AnySubqueryWithAllSubqueryInScalar.mdp    |   0
 .../AnySubqueryWithSubqueryInScalar.mdp       |   0
 .../minidump/AnySubqueryWithVolatileComp.mdp  |   0
 .../minidump/AnySubqueryWithVolatileFunc.mdp  |   0
 .../dxl/minidump/ArrayCmp-IN-ManyElements.mdp |   0
 .../dxl/minidump/ArrayCmpAll-Disjunct.mdp     |   0
 .../gporca/data/dxl/minidump/ArrayCmpAll.mdp  |   0
 .../data/dxl/minidump/ArrayCmpAllEmpty.mdp    |   0
 .../data/dxl/minidump/ArrayCmpAnyEmpty.mdp    |   0
 .../dxl/minidump/ArrayCmpAnyEmptyLessThan.mdp |   0
 .../data/dxl/minidump/ArrayCmpInList.mdp      |   0
 .../data/dxl/minidump/ArrayCoerceCast.mdp     |   0
 .../data/dxl/minidump/ArrayCoerceExpr.mdp     |   0
 .../dxl/minidump/ArrayCoerceImplicitCast.mdp  |   0
 .../gporca/data/dxl/minidump/ArrayConcat.mdp  |   0
 .../gporca/data/dxl/minidump/ArrayRef.mdp     |   0
 .../data/dxl/minidump/AssertMaxOneRow.mdp     |   0
 .../minidump/AssertOneRowWithCorrelation.mdp  |   0
 .../AvoidConstraintDerivationForLike.mdp      |   0
 .../gporca/data/dxl/minidump/BRINScan-Or.mdp  |   0
 .../minidump/BTreeIndex-Against-InList.mdp    |   0
 .../BTreeIndex-Against-InListLarge.mdp        |   0
 .../BTreeIndex-Against-ScalarSubquery.mdp     |   0
 ...ndexOnlyScan-OrderBy-on-MultiCol-Index.mdp |   0
 ...rd-IndexScan-OrderBy-on-MultiCol-Index.mdp |   0
 ...d-IndexScan-OrderBy-on-SingleCol-Index.mdp |   0
 .../data/dxl/minidump/BasicQueryParam.mdp     |   0
 .../data/dxl/minidump/BitmapBoolAnd.mdp       |   0
 .../dxl/minidump/BitmapBoolOp-DeepTree.mdp    |   0
 .../dxl/minidump/BitmapBoolOp-DeepTree2.mdp   |   0
 .../dxl/minidump/BitmapBoolOp-DeepTree3.mdp   |   0
 .../dxl/minidump/BitmapBoolOr-BoolColumn.mdp  |   0
 .../gporca/data/dxl/minidump/BitmapBoolOr.mdp |   0
 .../minidump/BitmapIndex-Against-InList.mdp   |   0
 .../minidump/BitmapIndex-ChooseHashJoin.mdp   |   0
 .../BitmapIndexApply-Basic-SelfJoin.mdp       |   0
 .../BitmapIndexApply-Basic-TwoTables.mdp      |   0
 .../BitmapIndexApply-Complex-Condition.mdp    |   0
 .../BitmapIndexApply-InnerSelect-Basic.mdp    |   0
 ...BitmapIndexApply-InnerSelect-PartTable.mdp |   0
 .../minidump/BitmapIndexApply-PartTable.mdp   |   0
 .../minidump/BitmapIndexNLJWithProject.mdp    |   0
 .../BitmapIndexNLJWithProjectNoFilt.mdp       |   0
 .../minidump/BitmapIndexNLOJWithProject.mdp   |   0
 .../BitmapIndexNLOJWithProjectNonPart.mdp     |   0
 ...ndexScan-WithUnsupportedOperatorFilter.mdp |   0
 .../data/dxl/minidump/BitmapIndexScan.mdp     |   0
 .../minidump/BitmapIndexScanChooseIndex.mdp   |   0
 .../data/dxl/minidump/BitmapIndexScanCost.mdp |   0
 .../BitmapIndexUnsupportedOperator.mdp        |   0
 .../BitmapScan-Hetrogeneous-Partitioned.mdp   |   0
 ...pTableScan-AO-Btree-PickIndexWithNoGap.mdp |   0
 ...tmapTableScan-AO-Btree-PickOnlyHighNDV.mdp |   0
 .../dxl/minidump/BitmapTableScan-AO-Btree.mdp |   0
 .../data/dxl/minidump/BitmapTableScan-AO.mdp  |   0
 .../minidump/BitmapTableScan-AndCondition.mdp |   0
 .../dxl/minidump/BitmapTableScan-Basic.mdp    |   0
 .../BitmapTableScan-ColumnOnRightSide.mdp     |   0
 .../BitmapTableScan-ComplexConjDisj.mdp       |   0
 .../BitmapTableScan-ConjDisjWithOuterRefs.mdp |   0
 .../Blocking-Spool-Parallel-Union-All.mdp     |   0
 .../minidump/BpCharMCVCardinalityEquals.mdp   |   0
 .../BpCharMCVCardinalityGreaterThan.mdp       |   0
 .../dxl/minidump/BroadcastSkewedHashjoin.mdp  |   0
 .../BtreeIndexNLJWithProjectNoPart.mdp        |   0
 .../minidump/BtreeIndexNLOJWithProject.mdp    |   0
 .../JoinWithInListExpand.mdp                  |   0
 .../JoinWithInListNoExpand.mdp                |   0
 .../CJoinOrderDPTest/JoinOrderWithDP.mdp      |   0
 .../CJoinOrderDPTest/JoinOrderWithOutDP.mdp   |   0
 .../FallBackToSerialAppend.mdp                |   0
 .../NoOpMotionUsesOnlyGroupOutputColumns.mdp  |   0
 .../ParallelAppend-ConstTable.mdp             |   0
 .../ParallelAppend-Insert.mdp                 |   0
 .../ParallelAppend-Select.mdp                 |   0
 ...elUnionAllWithNoRedistributableColumns.mdp |   0
 ...lUnionAllWithNotEqualNumOfDistrColumns.mdp |   0
 ...nAllWithSingleNotRedistributableColumn.mdp |   0
 ...omDistributedChildrenUnhashableColumns.mdp |   0
 .../RedundantMotionParallelUnionAll.mdp       |   0
 .../TwoHashedTables.mdp                       |   0
 .../AggTopOfMultipleSetRetFuncs.mdp           |   0
 ...opOfMultipleSetRetFuncsAndUnusedScalar.mdp |   0
 .../AggTopOfSetRefFuncsOnTopTbl.mdp           |   0
 .../AggTopOfSetRetFuncsAndUnusedScalar.mdp    |   0
 .../AggTopOfSingleSetRetFuncs.mdp             |   0
 .../CPruneColumnsTest/AllColsUsed.mdp         |   0
 .../MultiLevelSubqueryWithSetRetFuncs.mdp     |   0
 ...lSubqueryWithSetRetFuncsAndScalarFuncs.mdp |   0
 .../PruneIntermediateUnusedColumns.mdp        |   0
 .../UnusedSetRetFuncAndUsedScalarFunc.mdp     |   0
 .../UsedSetRetFuncAndUnusedScalarFunc.mdp     |   0
 .../data/dxl/minidump/CSQ-VolatileTVF.mdp     |   0
 .../gporca/data/dxl/minidump/CTAS-Random.mdp  |   0
 .../minidump/CTAS-With-Global-Local-Agg.mdp   |   0
 .../data/dxl/minidump/CTAS-random-distr.mdp   |   0
 ...uted-from-replicated-distributed-table.mdp |   0
 .../data/dxl/minidump/CTAS-with-Limit.mdp     |   0
 ...with-hashed-distributed-external-table.mdp |   0
 ...th-randomly-distributed-external-table.mdp |   0
 .../orca}/gporca/data/dxl/minidump/CTAS.mdp   |   0
 .../CTAS_OrderedAgg_multiple_cols.mdp         |   0
 .../orca}/gporca/data/dxl/minidump/CTE-1.mdp  |   0
 .../orca}/gporca/data/dxl/minidump/CTE-10.mdp |   0
 .../orca}/gporca/data/dxl/minidump/CTE-11.mdp |   0
 .../orca}/gporca/data/dxl/minidump/CTE-2.mdp  |   0
 .../orca}/gporca/data/dxl/minidump/CTE-3.mdp  |   0
 .../orca}/gporca/data/dxl/minidump/CTE-4.mdp  |   0
 .../orca}/gporca/data/dxl/minidump/CTE-5.mdp  |   0
 .../orca}/gporca/data/dxl/minidump/CTE-6.mdp  |   0
 .../orca}/gporca/data/dxl/minidump/CTE-7.mdp  |   0
 .../orca}/gporca/data/dxl/minidump/CTE-8.mdp  |   0
 .../orca}/gporca/data/dxl/minidump/CTE-9.mdp  |   0
 .../CTE-Join-Redistribute-Producer.mdp        |   0
 .../minidump/CTE-NestedWithPrunedProducer.mdp |   0
 .../dxl/minidump/CTE-NoPushProperties.mdp     |   0
 .../gporca/data/dxl/minidump/CTE-PartTbl.mdp  |   0
 .../gporca/data/dxl/minidump/CTE-Preds1.mdp   |   0
 .../gporca/data/dxl/minidump/CTE-Preds2.mdp   |   0
 .../data/dxl/minidump/CTE-PushProperties.mdp  |   0
 .../gporca/data/dxl/minidump/CTE-SetOp.mdp    |   0
 .../dxl/minidump/CTE-ValuesScan-ProjList.mdp  |   0
 .../gporca/data/dxl/minidump/CTE-volatile.mdp |   0
 .../dxl/minidump/CTE-with-random-filter.mdp   |   0
 .../data/dxl/minidump/CTE15HAReplicated.mdp   |   0
 .../data/dxl/minidump/CTE15Replicated.mdp     |   0
 .../data/dxl/minidump/CTE2HAReplicated.mdp    |   0
 .../data/dxl/minidump/CTE2Replicated.mdp      |   0
 .../minidump/CTEConstraintDeriveNegation.mdp  |   0
 .../CTEMergeGroupsCircularDeriveStats.mdp     |   0
 .../CTEMisAlignedProducerConsumer.mdp         |   0
 .../data/dxl/minidump/CTEWithMergedGroup.mdp  |   0
 .../dxl/minidump/CTEWithOuterReferences.mdp   |   0
 .../dxl/minidump/CTEWithVolatileFunction.mdp  |   0
 .../gporca/data/dxl/minidump/CTEinlining.mdp  |   0
 .../gporca/data/dxl/minidump/CTG-Filter.mdp   |   0
 .../gporca/data/dxl/minidump/CTG-Join.mdp     |   0
 .../CannotCollapseCascadeProjects.mdp         |   0
 .../dxl/minidump/CannotPullGrpColAboveAgg.mdp |   0
 .../dxl/minidump/CapGbCardToSelectCard.mdp    |   0
 ...Cascaded-UnionAll-Differing-Cols-Order.mdp |   0
 .../Cascaded-UnionAll-Differing-Cols.mdp      |   0
 .../Cascaded-UnionAll-Same-Cols-Order.mdp     |   0
 .../data/dxl/minidump/CastOnSubquery.mdp      |   0
 .../dxl/minidump/CastedInClauseWithMCV.mdp    |   0
 .../minidump/CastedScalarIf-On-Index-Key.mdp  |   0
 .../data/dxl/minidump/Char-Cardinality.mdp    |   0
 .../gporca/data/dxl/minidump/CheckAsUser.mdp  |   0
 .../data/dxl/minidump/Citext-Cardinality.mdp  |   0
 .../dxl/minidump/Coalesce-With-Subquery.mdp   |   0
 .../data/dxl/minidump/CoerceToDomain.mdp      |   0
 .../gporca/data/dxl/minidump/CoerceViaIO.mdp  |   0
 .../minidump/CollapseCascadeProjects2of2.mdp  |   0
 .../minidump/CollapseCascadeProjects2of3.mdp  |   0
 .../minidump/CollapseGb-MultipleColumn.mdp    |   0
 .../data/dxl/minidump/CollapseGb-Nested.mdp   |   0
 .../dxl/minidump/CollapseGb-SingleColumn.mdp  |   0
 .../minidump/CollapseGb-With-Agg-Funcs.mdp    |   0
 .../minidump/CollapseGb-Without-Agg-Funcs.mdp |   0
 .../gporca/data/dxl/minidump/CollapseNot.mdp  |   0
 .../CollapseProject-SetReturning-CTE.mdp      |   0
 .../minidump/CollapseProject-SetReturning.mdp |   0
 .../dxl/minidump/CompositeTypeRelMdId.mdp     |   0
 .../data/dxl/minidump/ComputedGroupByCol.mdp  |   0
 .../ConstScalarFuncNotPushedBelowGather.mdp   |   0
 ...tTblGetUnderSubqUnderProjectNoOuterRef.mdp |   0
 ...blGetUnderSubqUnderProjectWithOuterRef.mdp |   0
 .../ConstTblGetUnderSubqWithNoOuterRef.mdp    |   0
 .../ConstTblGetUnderSubqWithOuterRef.mdp      |   0
 .../ConstraintIntervalIncludesNull.mdp        |   0
 .../ConstraintIntervalNotIncludesNull.mdp     |   0
 ...ConstraintIntervalWithBoolIncludesNull.mdp |   0
 ...straintIntervalWithBoolNotIncludesNull.mdp |   0
 .../ConstraintIntervalWithInIncludesNull.mdp  |   0
 ...straintIntervalWithInIncludesNullArray.mdp |   0
 ...onstraintIntervalWithInNotIncludesNull.mdp |   0
 ...intIntervalWithMultiColumnsIncludeNull.mdp |   0
 ...IntervalWithMultiColumnsNotIncludeNull.mdp |   0
 .../ConstraintIntervalWithNotIncludesNull.mdp |   0
 ...rtBoolConstNullToConstTableFalseFilter.mdp |   0
 .../minidump/ConvertHashToRandomInsert.mdp    |   0
 .../minidump/ConvertHashToRandomSelect.mdp    |   0
 .../dxl/minidump/Correlated-AntiSemiJoin.mdp  |   0
 .../Correlated-LASJ-With-Outer-Col.mdp        |   0
 .../Correlated-LASJ-With-Outer-Const.mdp      |   0
 .../Correlated-LASJ-With-Outer-Expr.mdp       |   0
 .../data/dxl/minidump/Correlated-SemiJoin.mdp |   0
 .../Correlated-Stat-Function-Dependency-2.mdp |   0
 .../Correlated-Stat-Function-Dependency-3.mdp |   0
 .../Correlated-Stat-Function-Dependency.mdp   |   0
 .../minidump/Correlated-Stat-NDistinct-2.mdp  |   0
 .../minidump/Correlated-Stat-NDistinct-3.mdp  |   0
 .../minidump/Correlated-Stat-NDistinct-4.mdp  |   0
 .../minidump/Correlated-Stat-NDistinct-5.mdp  |   0
 .../minidump/Correlated-Stat-NDistinct.mdp    |   0
 .../minidump/CorrelatedAntiSemiJoin-True.mdp  |   0
 .../CorrelatedIN-LeftSemiJoin-Limit.mdp       |   0
 .../CorrelatedIN-LeftSemiJoin-True.mdp        |   0
 .../CorrelatedIN-LeftSemiNotIn-True.mdp       |   0
 .../CorrelatedLeftSemiNLJoinWithLimit.mdp     |   0
 .../CorrelatedNLJ-PartSelector-Subplan.mdp    |   0
 .../CorrelatedNLJWithStreamingSpool.mdp       |   0
 .../CorrelatedNLJWithTrueCondition.mdp        |   0
 .../dxl/minidump/CorrelatedSemiJoin-True.mdp  |   0
 .../CorrelatedSubqueryWithAggWindowFunc.mdp   |   0
 .../minidump/Correlation-With-Casting-1.mdp   |   0
 .../minidump/Correlation-With-Casting-2.mdp   |   0
 .../gporca/data/dxl/minidump/CountAny.mdp     |   0
 .../gporca/data/dxl/minidump/CountStar.mdp    |   0
 .../data/dxl/minidump/CoveringIndex-1.mdp     |   0
 .../data/dxl/minidump/CoveringIndex-2.mdp     |   0
 .../data/dxl/minidump/CoveringIndex-3.mdp     |   0
 .../dxl/minidump/CoveringIndex-Cost-1.mdp     |   0
 .../dxl/minidump/CoveringIndex-Cost-2.mdp     |   0
 .../CoveringIndex-DoesNotSupport-Gin.mdp      |   0
 .../CoveringIndex-DoesSupport-Gist.mdp        |   0
 .../DML-ComputeScalar-With-Outerref.mdp       |   0
 .../dxl/minidump/DML-Filter-With-OuterRef.mdp |   0
 .../dxl/minidump/DML-Replicated-Input.mdp     |   0
 .../minidump/DML-UnionAll-With-OuterRef.mdp   |   0
 .../DML-UnionAll-With-Universal-Child.mdp     |   0
 .../dxl/minidump/DML-Volatile-Function.mdp    |   0
 .../DML-With-CoordinatorOnlyTable-1.mdp       |   0
 ...ith-CorrelatedNLJ-With-Universal-Child.mdp |   0
 .../DML-With-HJ-And-UniversalChild.mdp        |   0
 .../DML-With-Join-With-Universal-Child.mdp    |   0
 .../minidump/DML-With-WindowFunc-OuterRef.mdp |   0
 .../data/dxl/minidump/DMLCollapseProject.mdp  |   0
 .../orca}/gporca/data/dxl/minidump/DPE-IN.mdp |   0
 .../gporca/data/dxl/minidump/DPE-NOT-IN.mdp   |   0
 .../gporca/data/dxl/minidump/DPE-SemiJoin.mdp |   0
 .../minidump/DPE-with-unsupported-pred.mdp    |   0
 .../data/dxl/minidump/DPv2GreedyOnly.mdp      |   0
 .../data/dxl/minidump/DPv2MinCardOnly.mdp     |   0
 .../data/dxl/minidump/DPv2QueryOnly.mdp       |   0
 .../data/dxl/minidump/DQA-1-RegularAgg.mdp    |   0
 .../data/dxl/minidump/DQA-2-RegularAgg.mdp    |   0
 .../minidump/DQA-GroupBy-HashAggregate1.mdp   |   0
 .../minidump/DQA-GroupBy-HashAggregate2.mdp   |   0
 .../DQA-InnerJoin-GroupBy-HashAggregate.mdp   |   0
 .../dxl/minidump/DQA-KeepOuterReference.mdp   |   0
 .../minidump/DQA-NonRedistributableCol.mdp    |   0
 .../data/dxl/minidump/DQA-SplitScalar.mdp     |   0
 .../dxl/minidump/DQA-SplitScalarOnDistCol.mdp |   0
 .../minidump/DQA-SplitScalarWithAggAndGuc.mdp |   0
 .../dxl/minidump/DQA-SplitScalarWithGuc.mdp   |   0
 .../minidump/DTS-Hetrogeneous-Partitioned.mdp |   0
 .../dxl/minidump/Date-TimeStamp-HashJoin.mdp  |   0
 .../dxl/minidump/DeduplicatePredicates.mdp    |   0
 ...lete-Check-AssignedQueryIdForTargetRel.mdp |   0
 .../Delete-With-Limit-In-Subquery.mdp         |   0
 .../minidump/DeleteMismatchedDistribution.mdp |   0
 .../data/dxl/minidump/DeleteRandomDistr.mdp   |   0
 .../DeleteRandomlyDistributedTable.mdp        |   0
 .../DeleteRandomlyDistributedTableJoin.mdp    |   0
 .../DirectDispatch-DynamicIndexScan.mdp       |   0
 ...patch-GpSegmentId-MultiCol-Conjunction.mdp |   0
 ...atch-GpSegmentId-SingleCol-Conjunction.mdp |   0
 .../minidump/DirectDispatch-GpSegmentId.mdp   |   0
 .../dxl/minidump/DirectDispatch-IndexScan.mdp |   0
 .../DirectDispatch-MultiCol-Disjunction.mdp   |   0
 .../DirectDispatch-MultiCol-Negative.mdp      |   0
 .../dxl/minidump/DirectDispatch-MultiCol.mdp  |   0
 ...rectDispatch-RandDistTable-Disjunction.mdp |   0
 .../minidump/DirectDispatch-RandDistTable.mdp |   0
 ...tDispatch-SingleCol-Disjunction-IsNull.mdp |   0
 ...ispatch-SingleCol-Disjunction-Negative.mdp |   0
 .../DirectDispatch-SingleCol-Disjunction.mdp  |   0
 .../dxl/minidump/DirectDispatch-SingleCol.mdp |   0
 .../minidump/DisableBroadcastThreshold.mdp    |   0
 .../minidump/DiscardRedistributeHashJoin.mdp  |   0
 .../dxl/minidump/Distinct-LegacyOpfamily.mdp  |   0
 .../minidump/DistinctAgg-NonSplittable.mdp    |   0
 .../dxl/minidump/DistinctQueryWithMotions.mdp |   0
 .../minidump/DonotPushPartConstThruLimit.mdp  |   0
 .../DontAddRedistributeBeforeInsert-1.mdp     |   0
 .../DontAddRedistributeBeforeInsert-2.mdp     |   0
 .../minidump/DoubleNDVCardinalityEquals.mdp   |   0
 .../gporca/data/dxl/minidump/DqaHavingMax.mdp |   0
 .../orca}/gporca/data/dxl/minidump/DqaMax.mdp |   0
 .../orca}/gporca/data/dxl/minidump/DqaMin.mdp |   0
 .../data/dxl/minidump/DqaNoRedistribute.mdp   |   0
 .../data/dxl/minidump/DqaSubqueryMax.mdp      |   0
 .../data/dxl/minidump/DuplicateGrpCol.mdp     |   0
 .../data/dxl/minidump/DynamicBitmapBoolOp.mdp |   0
 .../dxl/minidump/DynamicBitmapIndexScan.mdp   |   0
 .../minidump/DynamicBitmapTableScan-Basic.mdp |   0
 .../DynamicBitmapTableScan-Heterogeneous.mdp  |   0
 .../minidump/DynamicBitmapTableScan-UUID.mdp  |   0
 .../minidump/DynamicIndexGet-OuterRefs.mdp    |   0
 .../minidump/DynamicIndexGetDroppedCols.mdp   |   0
 .../DynamicIndexOnlyScan-Homogenous.mdp       |   0
 .../DynamicIndexOnlyScan-InnerJoin.mdp        |   0
 .../DynamicIndexOnlyScan-LeftJoin.mdp         |   0
 .../minidump/DynamicIndexOnlyScanCosting.mdp  |   0
 .../minidump/DynamicIndexScan-BoolFalse.mdp   |   0
 .../minidump/DynamicIndexScan-BoolTrue.mdp    |   0
 .../DynamicIndexScan-DefaultPartition-2.mdp   |   0
 .../DynamicIndexScan-DefaultPartition.mdp     |   0
 .../minidump/DynamicIndexScan-DroppedCols.mdp |   0
 .../DynamicIndexScan-DroppedColumns.mdp       |   0
 ...can-Heterogenous-EnabledDateConstraint.mdp |   0
 .../DynamicIndexScan-Heterogenous-NoDTS.mdp   |   0
 ...amicIndexScan-Heterogenous-Overlapping.mdp |   0
 ...exScan-Heterogenous-PartSelectEquality.mdp |   0
 ...IndexScan-Heterogenous-PartSelectRange.mdp |   0
 .../DynamicIndexScan-Heterogenous-Union.mdp   |   0
 ...can-Heterogenous-UnsupportedConstraint.mdp |   0
 ...Scan-Heterogenous-UnsupportedPredicate.mdp |   0
 .../DynamicIndexScan-Heterogenous.mdp         |   0
 ...xScan-Homogenous-EnabledDateConstraint.mdp |   0
 ...xScan-Homogenous-UnsupportedConstraint.mdp |   0
 .../minidump/DynamicIndexScan-Homogenous.mdp  |   0
 .../DynamicIndexScan-OpenEndedPartitions.mdp  |   0
 .../dxl/minidump/DynamicIndexScan-Relabel.mdp |   0
 .../dxl/minidump/DynamicIndexScanCosting.mdp  |   0
 .../data/dxl/minidump/EagerAggEmptyInput.mdp  |   0
 .../data/dxl/minidump/EagerAggExpression.mdp  |   0
 .../minidump/EagerAggGroupColumnInJoin.mdp    |   0
 .../gporca/data/dxl/minidump/EagerAggMax.mdp  |   0
 .../minidump/EagerAggMaxWithNestedLoop.mdp    |   0
 .../data/dxl/minidump/EagerAggMinMax.mdp      |   0
 .../data/dxl/minidump/EagerAggSubquery.mdp    |   0
 .../dxl/minidump/EagerAggUnsupportedAgg.mdp   |   0
 .../dxl/minidump/EffectOfLocalPredOnJoin.mdp  |   0
 .../dxl/minidump/EffectOfLocalPredOnJoin3.mdp |   0
 .../data/dxl/minidump/EffectsOfJoinFilter.mdp |   0
 .../gporca/data/dxl/minidump/EqualityJoin.mdp |   0
 .../minidump/EqualityPredicateOverDate.mdp    |   0
 .../dxl/minidump/EquiJoinOnExpr-Supported.mdp |   0
 .../minidump/EquiJoinOnExpr-Unsupported.mdp   |   0
 .../data/dxl/minidump/Equiv-HashedDistr-1.mdp |   0
 .../data/dxl/minidump/Equiv-HashedDistr-2.mdp |   0
 .../data/dxl/minidump/EquivClassesAndOr.mdp   |   0
 .../dxl/minidump/EquivClassesIntersect.mdp    |   0
 .../data/dxl/minidump/EquivClassesLimit.mdp   |   0
 .../data/dxl/minidump/EquivClassesUnion.mdp   |   0
 .../Equivalence-class-project-over-LOJ.mdp    |   0
 .../EstimateJoinRowsForCastPredicates.mdp     |   0
 .../dxl/minidump/Except-Volatile-Func.mdp     |   0
 .../orca}/gporca/data/dxl/minidump/Except.mdp |   0
 .../minidump/ExceptAllCompatibleDataType.mdp  |   0
 .../minidump/ExceptHashCompatibleRange.mdp    |   0
 .../minidump/ExceptHashIncompatibleRange.mdp  |   0
 ...tentialSubquriesInsideScalarExpression.mdp |   0
 .../minidump/Exists-SuperfluousEquality.mdp   |   0
 .../dxl/minidump/ExistsSubqInsideExpr.mdp     |   0
 .../data/dxl/minidump/ExpandJoinOrder.mdp     |   0
 .../ExpandNAryJoinGreedyWithLOJOnly.mdp       |   0
 .../minidump/ExprOnScSubqueryWithOuterRef.mdp |   0
 .../data/dxl/minidump/ExternalTable1.mdp      |   0
 .../data/dxl/minidump/ExternalTable2.mdp      |   0
 .../data/dxl/minidump/ExternalTable3.mdp      |   0
 .../data/dxl/minidump/ExternalTable4.mdp      |   0
 .../dxl/minidump/ExternalTableWithFilter.mdp  |   0
 .../ExtractOneBindingFromScalarGroups.mdp     |   0
 ...ctPredicateFromDisjWithComputedColumns.mdp |   0
 .../data/dxl/minidump/FOJ-Condition-False.mdp |   0
 .../data/dxl/minidump/Factorized-Preds.mdp    |   0
 .../gporca/data/dxl/minidump/FieldSelect.mdp  |   0
 .../data/dxl/minidump/FilterScalarCast.mdp    |   0
 .../data/dxl/minidump/FoldedArrayCmp.mdp      |   0
 .../minidump/ForeignPartOneTimeFilterDPE.mdp  |   0
 .../data/dxl/minidump/ForeignPartUniform.mdp  |   0
 .../minidump/ForeignScanExecLocAnyJoin.mdp    |   0
 .../ForeignScanExecLocAnySimpleScan.mdp       |   0
 ...ndexOnlyScan-OrderBy-on-MultiCol-Index.mdp |   0
 ...rd-IndexScan-OrderBy-on-MultiCol-Index.mdp |   0
 ...d-IndexScan-OrderBy-on-SingleCol-Index.mdp |   0
 .../FullJoin-2PredicateOnDistColumns.mdp      |   0
 .../data/dxl/minidump/FullJoin-Caps.mdp       |   0
 .../FullJoin-InnerNotOnDistributionColumn.mdp |   0
 .../minidump/FullJoin-NonDefaultOpfamily.mdp  |   0
 .../FullJoin-NotOnDistributionColumn.mdp      |   0
 .../dxl/minidump/FullJoin-NullPredicate.mdp   |   0
 .../FullJoin-OnDistributionColumn.mdp         |   0
 .../FullJoin-PredicateOnSameTable.mdp         |   0
 .../data/dxl/minidump/FullJoin-Replicated.mdp |   0
 .../FullJoin-Subquery-CastedPredicates.mdp    |   0
 .../minidump/FullJoin-SubquerySingleton.mdp   |   0
 .../FullJoin-SubqueryWithRedistribute.mdp     |   0
 .../minidump/FullJoin-SwappedPredicates.mdp   |   0
 .../FullOuterJoin-NullRejectingLHS1.mdp       |   0
 .../FullOuterJoin-NullRejectingLHS2.mdp       |   0
 .../FullOuterJoinLeftMultiplyRightMaxCard.mdp |   0
 .../FullOuterJoinMaxCardLeftChild.mdp         |   0
 .../FullOuterJoinMaxCardRightChild.mdp        |   0
 .../dxl/minidump/FullOuterJoinZeroMaxCard.mdp |   0
 .../dxl/minidump/FunctionWithQueryParam.mdp   |   0
 .../gporca/data/dxl/minidump/Gb-on-keys.mdp   |   0
 .../gporca/data/dxl/minidump/GinIndex.mdp     |   0
 .../dxl/minidump/GinIndexPathOpfamily.mdp     |   0
 .../dxl/minidump/GinIndexSearchModeAll.mdp    |   0
 ...ist-AOCOTable-NonLossy-BitmapIndexPlan.mdp |   0
 .../Gist-NestedLoopJoin-Lossy-IndexPlan.mdp   |   0
 .../Gist-NestedLoopJoin-Postgis-IndexPlan.mdp |   0
 .../Gist-NonPart-Lossy-BitmapIndexPlan.mdp    |   0
 .../minidump/Gist-NonPart-Lossy-IndexPlan.mdp |   0
 .../dxl/minidump/Gist-OrderBy-BitmapPlan.mdp  |   0
 .../dxl/minidump/Gist-OrderBy-IndexPlan.mdp   |   0
 .../Gist-PartTable-Lossy-IndexPlan.mdp        |   0
 ...ist-PartTable-NonLossy-BitmapIndexPlan.mdp |   0
 .../minidump/Gist-PartialIndex-TableScan.mdp  |   0
 .../dxl/minidump/GreedyNAryDelayCrossJoin.mdp |   0
 .../data/dxl/minidump/GreedyNAryJoin.mdp      |   0
 .../GreedyNAryJoinWithDisconnectedEdges.mdp   |   0
 .../dxl/minidump/GreedyNAryOnlyCrossJoins.mdp |   0
 .../dxl/minidump/GroupByEmptySetNoAgg.mdp     |   0
 .../data/dxl/minidump/GroupByOuterRef.mdp     |   0
 .../dxl/minidump/GroupingOnSameTblCol-1.mdp   |   0
 .../dxl/minidump/GroupingOnSameTblCol-2.mdp   |   0
 .../gporca/data/dxl/minidump/GroupingSets.mdp |   0
 .../minidump/HAWQ-TPCH-Stat-Derivation.mdp    |   0
 .../minidump/HJN-DPE-Bitmap-Outer-Child.mdp   |   0
 .../data/dxl/minidump/HJN-DeeperOuter.mdp     |   0
 .../minidump/HJN-Redistribute-One-Side.mdp    |   0
 .../dxl/minidump/Hash-BitmapScan-InArray.mdp  |   0
 .../data/dxl/minidump/Hash-BitmapScan.mdp     |   0
 .../data/dxl/minidump/Hash-IndexScan.mdp      |   0
 .../dxl/minidump/Hash-TableScan-AllArray.mdp  |   0
 .../minidump/HashJoinOnRelabeledColumns.mdp   |   0
 .../minidump/Hint-AbsoluteRows-Over-Join.mdp  |   0
 .../dxl/minidump/Hint-AddRows-Over-Join.mdp   |   0
 .../minidump/Hint-BitmapScan-Over-Table.mdp   |   0
 .../Hint-IndexOnlyScan-Over-Table.mdp         |   0
 .../dxl/minidump/Hint-IndexScan-Over-Join.mdp |   0
 .../minidump/Hint-IndexScan-Over-Table.mdp    |   0
 .../dxl/minidump/Hint-Leading-Directed.mdp    |   0
 .../dxl/minidump/Hint-Leading-Multiple.mdp    |   0
 .../dxl/minidump/Hint-Leading-NonDirected.mdp |   0
 .../minidump/Hint-MultiplyRows-Over-Join.mdp  |   0
 .../minidump/Hint-NoBitmapScan-Over-Table.mdp |   0
 .../Hint-NoIndexOnlyScan-Over-Table.mdp       |   0
 .../minidump/Hint-NoIndexScan-Over-Table.mdp  |   0
 .../dxl/minidump/Hint-SeqScan-Over-Join.mdp   |   0
 .../dxl/minidump/Hint-SeqScan-Over-Table.mdp  |   0
 .../minidump/Hint-SubtractRows-Over-Join.mdp  |   0
 .../data/dxl/minidump/IDF-NotNullConstant.mdp |   0
 .../data/dxl/minidump/IDF-NullConstant.mdp    |   0
 .../gporca/data/dxl/minidump/IN-ArrayCmp.mdp  |   0
 .../dxl/minidump/IN-Nulls-ArrayCmpAny.mdp     |   0
 .../gporca/data/dxl/minidump/IN-Numeric.mdp   |   0
 .../orca}/gporca/data/dxl/minidump/IN.mdp     |   0
 .../dxl/minidump/INDF-NotNullConstant.mdp     |   0
 .../data/dxl/minidump/INDF-NullConstant.mdp   |   0
 .../data/dxl/minidump/InClauseWithMCV.mdp     |   0
 .../data/dxl/minidump/InEqualityJoin.mdp      |   0
 ...qWithPrjListOuterRefNoInnerRefColumnIn.mdp |   0
 ...istOuterRefNoInnerRefColumnPlusConstIn.mdp |   0
 ...bqWithPrjListOuterRefNoInnerRefConstIn.mdp |   0
 .../minidump/InSubqWithPrjListReturnSet.mdp   |   0
 .../dxl/minidump/InSubqueryWithNotNullCol.mdp |   0
 .../Index-Join-With-Subquery-In-Pred.mdp      |   0
 ...ply-Heterogeneous-BothSidesPartitioned.mdp |   0
 .../minidump/IndexApply-Heterogeneous-DTS.mdp |   0
 .../IndexApply-Heterogeneous-NoDTS.mdp        |   0
 ...Apply-IndexCondDisjointWithHashedDistr.mdp |   0
 ...pply-IndexCondIntersectWithHashedDistr.mdp |   0
 .../IndexApply-IndexCondMatchHashedDistr.mdp  |   0
 ...ndexApply-IndexCondSubsetOfHashedDistr.mdp |   0
 ...exApply-IndexCondSupersetOfHashedDistr.mdp |   0
 ...IndexApply-IndexOnCoordinatorOnlyTable.mdp |   0
 .../minidump/IndexApply-InnerSelect-Basic.mdp |   0
 ...dexApply-InnerSelect-Heterogeneous-DTS.mdp |   0
 .../IndexApply-InnerSelect-PartTable.mdp      |   0
 .../IndexApply-InnerSelect-PartTable2.mdp     |   0
 .../minidump/IndexApply-LeftOuter-NLJoin.mdp  |   0
 ...dexApply-MultiDistKey-WithComplexPreds.mdp |   0
 ...-MultiDistKeys-Bitmap-WithComplexPreds.mdp |   0
 .../IndexApply-MultiDistKeys-Bitmap.mdp       |   0
 ...MultiDistKeys-IncompletePDS-3-DistCols.mdp |   0
 .../IndexApply-No-Motion-Below-Join.mdp       |   0
 .../IndexApply-PartKey-Is-IndexKey.mdp        |   0
 .../IndexApply-PartResolverExpand.mdp         |   0
 .../dxl/minidump/IndexApply-PartTable.mdp     |   0
 .../IndexApply-Redistribute-Const-Table.mdp   |   0
 .../IndexApply1-CalibratedCostModel.mdp       |   0
 .../gporca/data/dxl/minidump/IndexApply1.mdp  |   0
 .../gporca/data/dxl/minidump/IndexApply2.mdp  |   0
 .../gporca/data/dxl/minidump/IndexApply3.mdp  |   0
 .../gporca/data/dxl/minidump/IndexApply4.mdp  |   0
 .../IndexApply_NestLoopWithNestParamTrue.mdp  |   0
 .../minidump/IndexConstraintsMDidCache.mdp    |   0
 .../data/dxl/minidump/IndexGet-OuterRefs.mdp  |   0
 .../minidump/IndexNLJ-IndexGet-OuterRef.mdp   |   0
 .../minidump/IndexNLJoin_Cast_NoMotion.mdp    |   0
 ...ToRootTableContainingHeterogenousIndex.mdp |   0
 ...-AddPartitionToRootWithHomogenousIndex.mdp |   0
 ...xOnPartitionsWithDifferentStorageTypes.mdp |   0
 ...ppingHeterogenousIndex-ANDPredicate-AO.mdp |   0
 ...ingHeterogenousIndex-ANDPredicate-HEAP.mdp |   0
 ...omogenousIndexesOnRoot-ANDPredicate-AO.mdp |   0
 ...HomogenousIndexesOnRoot-ORPredicate-AO.mdp |   0
 ...ppingHeterogenousIndex-ANDPredicate-AO.mdp |   0
 ...ingHeterogenousIndex-ANDPredicate-HEAP.mdp |   0
 ...appingHeterogenousIndex-ORPredicate-AO.mdp |   0
 ...omogenousIndexesOnRoot-ANDPredicate-AO.mdp |   0
 ...-OverlappingHomogenousIndexesOnRoot-AO.mdp |   0
 ...HomogenousIndexesOnRoot-ORPredicate-AO.mdp |   0
 ...ngleColumnHeterogenousIndexOnRoot-1-AO.mdp |   0
 ...leColumnHeterogenousIndexOnRoot-1-HEAP.mdp |   0
 ...ngleColumnHeterogenousIndexOnRoot-2-AO.mdp |   0
 ...leColumnHeterogenousIndexOnRoot-2-HEAP.mdp |   0
 .../data/dxl/minidump/IndexOnlyScan-CTE.mdp   |   0
 .../IndexOnlyScan-NoDistKeyInIndex.mdp        |   0
 ...xOnlyScan-OrderBy-on-MultiCol-NonIndex.mdp |   0
 .../dxl/minidump/IndexOnlyScanCosting.mdp     |   0
 .../data/dxl/minidump/IndexScan-AOTable.mdp   |   0
 .../data/dxl/minidump/IndexScan-AndedIn.mdp   |   0
 .../data/dxl/minidump/IndexScan-BoolFalse.mdp |   0
 .../data/dxl/minidump/IndexScan-BoolTrue.mdp  |   0
 .../dxl/minidump/IndexScan-DroppedColumns.mdp |   0
 .../dxl/minidump/IndexScan-IsNotNullPred.mdp  |   0
 .../dxl/minidump/IndexScan-IsNullPred.mdp     |   0
 .../dxl/minidump/IndexScan-ORPredsAOPart.mdp  |   0
 .../dxl/minidump/IndexScan-ORPredsNonPart.mdp |   0
 ...IndexScan-OrderBy-on-MultiCol-NonIndex.mdp |   0
 ...ndexScan-OrderBy-on-Multiple-IndexCols.mdp |   0
 .../IndexScan-OrderBy-on-NonIndexCol.mdp      |   0
 .../IndexScan-OrderBy-on-Single-IndexCol.mdp  |   0
 .../data/dxl/minidump/IndexScan-Relabel.mdp   |   0
 .../data/dxl/minidump/IndexScanCosting.mdp    |   0
 .../IndexScanWithNestedCTEAndSetOp.mdp        |   0
 .../data/dxl/minidump/IndexedNLJBitmap.mdp    |   0
 .../data/dxl/minidump/InferPredicates.mdp     |   0
 .../minidump/InferPredicatesBCC-oid-oid.mdp   |   0
 .../minidump/InferPredicatesBCC-txt-txt.mdp   |   0
 .../minidump/InferPredicatesBCC-vc-txt.mdp    |   0
 .../dxl/minidump/InferPredicatesBCC-vc-vc.mdp |   0
 .../InferPredicatesBCC-vcpart-txt.mdp         |   0
 .../dxl/minidump/InferPredicatesForLimit.mdp  |   0
 .../dxl/minidump/InferPredicatesForPartSQ.mdp |   0
 .../InferPredicatesForProcessedColumn.mdp     |   0
 .../InferPredicatesForQuantifiedSQ.mdp        |   0
 .../InferPredicatesFromExistsSubquery.mdp     |   0
 .../InferPredicatesFromMultiSubquery.mdp      |   0
 .../minidump/InferPredicatesInnerOfLOJ.mdp    |   0
 .../InferPredicatesIntFromExistsSubquery.mdp  |   0
 .../InferPredicatesIntFromSubquery.mdp        |   0
 .../minidump/InferPredicatesJoinSubquery.mdp  |   0
 .../minidump/InferPredicatesMultiColumns.mdp  |   0
 ...rredPredicatesConstraintSimplification.mdp |   0
 .../dxl/minidump/InnerJoin-With-OuterRefs.mdp |   0
 .../InnerJoinBroadcastTableHashSpec.mdp       |   0
 .../dxl/minidump/InnerJoinOverJoinExcept.mdp  |   0
 .../minidump/InnerJoinOverJoinExceptAll.mdp   |   0
 .../InnerJoinReplicatedTableHashSpec.mdp      |   0
 .../Insert-AO-Partitioned-SortDisabled.mdp    |   0
 .../dxl/minidump/Insert-AO-Partitioned.mdp    |   0
 .../gporca/data/dxl/minidump/Insert-AO.mdp    |   0
 .../dxl/minidump/Insert-With-HJ-CTE-Agg.mdp   |   0
 .../orca}/gporca/data/dxl/minidump/Insert.mdp |   0
 .../data/dxl/minidump/InsertAssertSort.mdp    |   0
 .../dxl/minidump/InsertCheckConstraint.mdp    |   0
 .../data/dxl/minidump/InsertConstTuple.mdp    |   0
 .../InsertConstTupleRandomDistribution.mdp    |   0
 .../InsertConstTupleVolatileFunction.mdp      |   0
 ...nsertConstTupleVolatileFunctionMOTable.mdp |   0
 .../minidump/InsertCoordinatorOnlyTable.mdp   |   0
 .../InsertCoordinatorOnlyTableConstTuple.mdp  |   0
 .../InsertDirectedDispatchNullValue.mdp       |   0
 .../InsertIntoNonNullAfterDroppingColumn.mdp  |   0
 .../InsertMismatchedDistrubution-2.mdp        |   0
 .../minidump/InsertMismatchedDistrubution.mdp |   0
 .../minidump/InsertNULLNotNULLConstraint.mdp  |   0
 .../minidump/InsertNoEnforceConstraints.mdp   |   0
 .../data/dxl/minidump/InsertNonSingleton.mdp  |   0
 .../data/dxl/minidump/InsertNotNullCols.mdp   |   0
 .../minidump/InsertPrimaryKeyFromMOTable.mdp  |   0
 .../data/dxl/minidump/InsertProjectSort.mdp   |   0
 .../data/dxl/minidump/InsertRandomDistr.mdp   |   0
 ...plicatedIntoSerialHashDistributedTable.mdp |   0
 .../gporca/data/dxl/minidump/InsertSort.mdp   |   0
 .../InsertSortDistributed2CoordinatorOnly.mdp |   0
 .../dxl/minidump/InsertWithDroppedCol.mdp     |   0
 .../data/dxl/minidump/Int2Predicate.mdp       |   0
 .../data/dxl/minidump/Intersect-OuterRefs.mdp |   0
 .../dxl/minidump/Intersect-Volatile-Func.mdp  |   0
 .../data/dxl/minidump/InvalidDeleteGather.mdp |   0
 .../minidump/InvalidPlan_CTE-2-all-plans.mdp  |   0
 ...IncompatibleDistributionOnJoinBranches.mdp |   0
 ...FromCoordinatorToCoordinator-ScalarDQA.mdp |   0
 ...tionGatherFromCoordinatorToCoordinator.mdp |   0
 .../data/dxl/minidump/InvalidUpdatePlan.mdp   |   0
 .../dxl/minidump/IsNullUnionAllIsNotNull.mdp  |   0
 .../minidump/JOIN-NonRedistributableCol.mdp   |   0
 .../data/dxl/minidump/JOIN-Pred-Cast-Int4.mdp |   0
 .../dxl/minidump/JOIN-Pred-Cast-Varchar.mdp   |   0
 ...OIN-cast2text-int4-Eq-cast2text-double.mdp |   0
 .../data/dxl/minidump/JOIN-int4-Eq-double.mdp |   0
 .../data/dxl/minidump/JOIN-int4-Eq-int2.mdp   |   0
 .../data/dxl/minidump/Join-Disj-Subqs.mdp     |   0
 .../gporca/data/dxl/minidump/Join-IDF.mdp     |   0
 .../dxl/minidump/Join-INDF-NoBroadcast.mdp    |   0
 .../Join-INDF-Nulls-Not-Collocated.mdp        |   0
 .../gporca/data/dxl/minidump/Join-INDF.mdp    |   0
 .../dxl/minidump/Join-Varchar-Equality.mdp    |   0
 .../data/dxl/minidump/Join-WinFunc-Preds.mdp  |   0
 .../dxl/minidump/Join-With-Subq-Preds-1.mdp   |   0
 .../dxl/minidump/Join-With-Subq-Preds-2.mdp   |   0
 .../minidump/JoinAbsEqWithoutOpfamilies.mdp   |   0
 ...tyAssociativityCommutativityAboveLimit.mdp |   0
 ...ArityAssociativityCommutativityAtLimit.mdp |   0
 ...tyAssociativityCommutativityBelowLimit.mdp |   0
 .../data/dxl/minidump/JoinBelowUnionAll.mdp   |   0
 .../data/dxl/minidump/JoinCitextVarchar.mdp   |   0
 .../data/dxl/minidump/JoinColWithOnlyNDV.mdp  |   0
 .../JoinCombinedHashSpecNullsNotColocated.mdp |   0
 ...ultOpfamiliesUsingNonDefaultOpfamilyOp.mdp |   0
 .../data/dxl/minidump/JoinNDVRemain.mdp       |   0
 .../minidump/JoinOnReplicatedUniversal.mdp    |   0
 .../minidump/JoinOnViewWithCastedColumn.mdp   |   0
 ...WithCastedColumnAndSubqueryInPredicate.mdp |   0
 ...hMixOfPushableAndNonpushablePredicates.mdp |   0
 .../JoinOnViewWithSetReturningColumn.mdp      |   0
 .../minidump/JoinOnViewWithVolatileColumn.mdp |   0
 ...mizationLevelGreedyNonPartTblInnerJoin.mdp |   0
 ...imizationLevelQuery3WayHashJoinPartTbl.mdp |   0
 ...imizationLevelQueryNonPartTblInnerJoin.mdp |   0
 .../gporca/data/dxl/minidump/JoinOrderDPE.mdp |   0
 .../gporca/data/dxl/minidump/JoinPlan.mdp     |   0
 .../dxl/minidump/JoinPlanWithRedistribute.mdp |   0
 .../data/dxl/minidump/JoinPredFalseFilter.mdp |   0
 .../data/dxl/minidump/JoinTinterval.mdp       |   0
 .../JoinWithSingletonAndSingletonBranches.mdp |   0
 .../JoinWithSingletonAndUniversalBranches.mdp |   0
 .../JoinWithSubqueryProjectColumn.mdp         |   0
 .../Join_OuterChild_DistUniversal.mdp         |   0
 .../minidump/LASJ-Not-In-Force-Broadcast.mdp  |   0
 .../data/dxl/minidump/LIKE-Pattern-Empty.mdp  |   0
 .../dxl/minidump/LIKE-Pattern-green-2.mdp     |   0
 .../data/dxl/minidump/LIKE-Pattern-green.mdp  |   0
 .../data/dxl/minidump/LOJ-Condition-False.mdp |   0
 .../data/dxl/minidump/LOJ-DynBitmapIndex.mdp  |   0
 .../minidump/LOJ-DynBitmapIndexWithSelect.mdp |   0
 .../data/dxl/minidump/LOJ-DynBtreeIndex.mdp   |   0
 .../minidump/LOJ-DynBtreeIndexWithSelect.mdp  |   0
 ...ashJoin-MultiDistKeys-WithComplexPreds.mdp |   0
 .../LOJ-IndexApply-CompsiteKey-Equiv.mdp      |   0
 .../LOJ-IndexApply-CompsiteKey-NoMotion.mdp   |   0
 .../LOJ-IndexApply-CoordinatorOnly-Table.mdp  |   0
 ...IndexApply-DistKey-Multiple-Predicates.mdp |   0
 ...ltiDistKey-MultiIndexKey-NoExtraFilter.mdp |   0
 ...-IndexApply-MultiDistKey-MultiIndexKey.mdp |   0
 ...-MultiDistKeys-Bitmap-WithComplexPreds.mdp |   0
 .../LOJ-IndexApply-MultiDistKeys-Bitmap.mdp   |   0
 ...LOJ-IndexApply-MultiDistKeys-IndexKeys.mdp |   0
 ...exApply-MultiDistKeys-WithComplexPreds.mdp |   0
 .../minidump/LOJ-IndexApply-MultiIndexes.mdp  |   0
 ...IndexApply-Negative-NonEqual-Predicate.mdp |   0
 .../minidump/LOJ-IndexApply-NonDistKey.mdp    |   0
 .../LOJ-IndexApply-WithComplexPredicates.mdp  |   0
 .../data/dxl/minidump/LOJ-IsNullPred.mdp      |   0
 .../gporca/data/dxl/minidump/LOJ-PushDown.mdp |   0
 .../gporca/data/dxl/minidump/LOJ-With-Agg.mdp |   0
 .../LOJ-With-Single-Pred-On-Outer.mdp         |   0
 .../LOJNonNullRejectingPredicates.mdp         |   0
 .../minidump/LOJNullRejectingPredicates.mdp   |   0
 .../LOJNullRejectingZeroPlacePredicates.mdp   |   0
 .../minidump/LOJReorderComplexNestedLOJs.mdp  |   0
 .../LOJReorderWithComplexPredicate.mdp        |   0
 .../data/dxl/minidump/LOJReorderWithIDF.mdp   |   0
 .../LOJReorderWithNestedLOJAndFilter.mdp      |   0
 .../minidump/LOJReorderWithOneSidedFilter.mdp |   0
 .../LOJReorderWithSimplePredicate.mdp         |   0
 .../data/dxl/minidump/LOJWithFalsePred.mdp    |   0
 ..._convert_outer_ref_predicate_with_NULL.mdp |   0
 ...ert_outer_ref_predicate_with_inner_ref.mdp |   0
 .../LOJ_NULLTEST-On-SelfCheck-Pred.mdp        |   0
 .../gporca/data/dxl/minidump/LOJ_bb_mpph.mdp  |   0
 ...OJ_convert_to_inner_with_and_predicate.mdp |   0
 ...vert_to_inner_with_inner_predicate_IDF.mdp |   0
 ...LOJ_convert_to_inner_with_or_predicate.mdp |   0
 ...o_inner_with_inner_predicate_IDF_const.mdp |   0
 ...ert_to_inner_with_outer_predicate_INDF.mdp |   0
 ..._inner_with_outer_predicate_INDF_const.mdp |   0
 .../gporca/data/dxl/minidump/LargeJoins.mdp   |   0
 .../dxl/minidump/LargeMultiColumnInList.mdp   |   0
 .../data/dxl/minidump/Lead-Lag-WinFuncs.mdp   |   0
 .../dxl/minidump/Least-Greatest-Subselect.mdp |   0
 .../data/dxl/minidump/Least-Greatest.mdp      |   0
 .../minidump/LeftJoin-DPv2-With-Select.mdp    |   0
 ...LeftJoin-UnsupportedFilter-Cardinality.mdp |   0
 .../dxl/minidump/LeftJoin-With-Coalesce.mdp   |   0
 .../minidump/LeftJoin-With-Col-Const-Pred.mdp |   0
 .../minidump/LeftJoin-With-Pred-On-Inner.mdp  |   0
 .../minidump/LeftJoin-With-Pred-On-Inner2.mdp |   0
 .../LeftJoinBroadcastTableHashSpec.mdp        |   0
 .../dxl/minidump/LeftJoinDPv2JoinOrder.mdp    |   0
 .../minidump/LeftJoinNullsNotColocated.mdp    |   0
 .../data/dxl/minidump/LeftJoinPruning.mdp     |   0
 .../LeftJoinPruningInOuterInnerQuery.mdp      |   0
 .../minidump/LeftJoinPruningInnerQuery.mdp    |   0
 .../minidump/LeftJoinPruningOuterQuery.mdp    |   0
 ...tOuter2InnerUnionAllAntiSemiJoin-Tpcds.mdp |   0
 .../LeftOuter2InnerUnionAllAntiSemiJoin.mdp   |   0
 .../data/dxl/minidump/LeftSemiJoinCE.mdp      |   0
 .../minidump/LeftSemiJoinWithRepOuterTab.mdp  |   0
 .../minidump/LikePredStatsNotComparable.mdp   |   0
 .../data/dxl/minidump/ListPartLossyCastEq.mdp |   0
 .../data/dxl/minidump/ListPartLossyCastLT.mdp |   0
 .../dxl/minidump/ListPartLossyCastNEq.mdp     |   0
 .../minidump/LogicalIndexGetDroppedCols.mdp   |   0
 .../data/dxl/minidump/MDQA-SameDQAColumn.mdp  |   0
 .../dxl/minidump/MDQAs-Grouping-OrderBy.mdp   |   0
 .../data/dxl/minidump/MDQAs-Grouping.mdp      |   0
 .../gporca/data/dxl/minidump/MDQAs-Union.mdp  |   0
 .../orca}/gporca/data/dxl/minidump/MDQAs1.mdp |   0
 .../dxl/minidump/ManyTextUnionsInSubquery.mdp |   0
 ...Max-Aggregate-uses-IndexScan-and-Limit.mdp |   0
 ...Min-Aggregate-uses-IndexScan-and-Limit.mdp |   0
 .../gporca/data/dxl/minidump/Minidump.xml     |   0
 .../data/dxl/minidump/MissingBoolColStats.mdp |   0
 .../gporca/data/dxl/minidump/MissingStats.mdp |   0
 .../MotionHazard-MaterializeUnderResult.mdp   |   0
 ...nHazard-NoMaterializeGatherUnderResult.mdp |   0
 ...Hazard-NoMaterializeHashAggUnderResult.mdp |   0
 ...ionHazard-NoMaterializeSortUnderResult.mdp |   0
 .../MultiColumnAggWithDefaultOpfamilies.mdp   |   0
 ...umnDQA-InnerJoin-GroupBy-HashAggregate.mdp |   0
 .../minidump/MultiDistKeyJoinCardinality.mdp  |   0
 ...tiDistKeyWithOtherPredsJoinCardinality.mdp |   0
 .../minidump/MultiLevel-CorrelatedExec.mdp    |   0
 .../dxl/minidump/MultiLevel-IN-Subquery.mdp   |   0
 .../minidump/MultiLevel-NOT-IN-Subquery.mdp   |   0
 .../MultiLevelDecorrelationWithSemiJoins.mdp  |   0
 .../minidump/MultiLevelPartLossyCastNEq.mdp   |   0
 .../MultipleDampedPredJoinCardinality.mdp     |   0
 ...MultipleIndependentPredJoinCardinality.mdp |   0
 .../dxl/minidump/MultipleIndexPredicate.mdp   |   0
 .../MultipleSetReturningFunction-1.mdp        |   0
 .../MultipleSetReturningFunction-2.mdp        |   0
 .../MultipleSetReturningFunction-3.mdp        |   0
 .../MultipleSubqueriesInSelectClause.mdp      |   0
 .../MultipleUpdateWithJoinOnDistCol.mdp       |   0
 .../dxl/minidump/NLJ-BC-Outer-Spool-Inner.mdp |   0
 .../NLJ-Broadcast-DPE-Outer-Child.mdp         |   0
 .../dxl/minidump/NLJ-DistCol-No-Broadcast.mdp |   0
 .../minidump/NLJ-EqAllCol-No-Broadcast.mdp    |   0
 ...-EqDistCol-InEqNonDistCol-No-Broadcast.mdp |   0
 ...-InEqDistCol-EqNonDistCol-Redistribute.mdp |   0
 .../dxl/minidump/NLJ-Rewindability-CTAS.mdp   |   0
 .../data/dxl/minidump/NLJ-Rewindability.mdp   |   0
 .../data/dxl/minidump/NOT-IN-ArrayCmp.mdp     |   0
 .../data/dxl/minidump/NOT-IN-NotNullBoth.mdp  |   0
 .../data/dxl/minidump/NOT-IN-NullInner.mdp    |   0
 .../data/dxl/minidump/NOT-IN-NullOuter.mdp    |   0
 .../data/dxl/minidump/Name-Cardinality.mdp    |   0
 .../minidump/NaryWithLojAndNonLojChilds.mdp   |   0
 .../NdvPreservingExprProjectionEquiJoin.mdp   |   0
 ...NdvPreservingExprProjectionNonEquiJoin.mdp |   0
 .../dxl/minidump/Negative-IndexApply1.mdp     |   0
 .../dxl/minidump/Negative-IndexApply2.mdp     |   0
 .../dxl/minidump/Nested-Or-Predicates.mdp     |   0
 .../data/dxl/minidump/Nested-Setops-2.mdp     |   0
 .../data/dxl/minidump/Nested-Setops.mdp       |   0
 ...tedInSubqWithPrjListOuterRefNoInnerRef.mdp |   0
 .../minidump/NestedJoinWithCastedColumn.mdp   |   0
 .../minidump/NestedNLJWithBlockingSpool.mdp   |   0
 .../NestedProjectCountStarWithOuterRefs.mdp   |   0
 .../dxl/minidump/NestedSubqLimitBindings.mdp  |   0
 .../dxl/minidump/NewBtreeIndexScanCost.mdp    |   0
 ...oBroadcastUnderGatherForWindowFunction.mdp |   0
 .../NoDistKeyMultiPredJoinCardinality.mdp     |   0
 .../minidump/NoHashAggWithoutPrelimFunc.mdp   |   0
 .../data/dxl/minidump/NoMissingStats.mdp      |   0
 .../NoMissingStatsAfterDroppedCol.mdp         |   0
 .../NoMissingStatsAskingForSystemColFOJ.mdp   |   0
 .../minidump/NoMissingStatsForEmptyTable.mdp  |   0
 .../data/dxl/minidump/NoMotionsPlan.mdp       |   0
 ...onstraint-WhenNoDefaultPartsAndIndices.mdp |   0
 .../dxl/minidump/NoPartPropagationPlan.mdp    |   0
 .../NoPushdownPredicateWithCTEAnchor.mdp      |   0
 .../dxl/minidump/NoRedistributeOnAppend.mdp   |   0
 .../gporca/data/dxl/minidump/NoSortPlan.mdp   |   0
 .../dxl/minidump/Non-Hashjoinable-Pred-2.mdp  |   0
 .../dxl/minidump/Non-Hashjoinable-Pred.mdp    |   0
 ...ogenousIndexesOnRoot-ANDPredicate-HEAP.mdp |   0
 .../gporca/data/dxl/minidump/NonSingleton.mdp |   0
 .../data/dxl/minidump/NonSplittableAgg.mdp    |   0
 .../NotExists-SuperflousOuterRefWithGbAgg.mdp |   0
 .../NotExists-SuperfluousEquality.mdp         |   0
 .../gporca/data/dxl/minidump/NotInToLASJ.mdp  |   0
 ...tWellDefinedDisjunctConjunctPredicates.mdp |   0
 .../dxl/minidump/NullConstant-INDF-Col.mdp    |   0
 .../dxl/minidump/NullIf-With-Subquery.mdp     |   0
 .../data/dxl/minidump/OR-WithIsNullPred.mdp   |   0
 .../orca}/gporca/data/dxl/minidump/OR.mdp     |   0
 .../OneDistKeyMultiPredJoinCardinality.mdp    |   0
 .../dxl/minidump/OneLevel-CorrelatedExec.mdp  |   0
 .../data/dxl/minidump/OneSegmentGather.mdp    |   0
 .../OptimizerConfigWithSegmentsForCosting.mdp |   0
 .../dxl/minidump/OrderByNoRedundantSort.mdp   |   0
 .../data/dxl/minidump/OrderByNullsFirst.mdp   |   0
 .../data/dxl/minidump/OrderByOuterRef.mdp     |   0
 .../OrderedAggUsingGroupColumnInDirectArg.mdp |   0
 .../minidump/OrderedAgg_array_fraction.mdp    |   0
 .../dxl/minidump/OrderedAgg_computed_col.mdp  |   0
 .../minidump/OrderedAgg_multiple_diffcol.mdp  |   0
 .../minidump/OrderedAgg_multiple_samecol.mdp  |   0
 ...redAgg_multiple_samecol_difforderespec.mdp |   0
 .../data/dxl/minidump/OrderedAgg_single.mdp   |   0
 .../dxl/minidump/OrderedAgg_skewed_data.mdp   |   0
 .../dxl/minidump/OrderedAgg_with_groupby.mdp  |   0
 .../OrderedAgg_with_nonOrderedAgg.mdp         |   0
 .../OrderedAgg_with_nonconst_fraction.mdp     |   0
 .../dxl/minidump/OuterJoin-With-OuterRefs.mdp |   0
 .../OuterJoinOnViewWithCastedColumn.mdp       |   0
 ...ogenousIndexesOnRoot-ANDPredicate-HEAP.mdp |   0
 ...verlappingHomogenousIndexesOnRoot-HEAP.mdp |   0
 .../dxl/minidump/ParallelUnionAllWithJson.mdp |   0
 .../minidump/Part-Selection-ConstArray-1.mdp  |   0
 .../minidump/Part-Selection-ConstArray-2.mdp  |   0
 .../data/dxl/minidump/Part-Selection-IN.mdp   |   0
 .../dxl/minidump/Part-Selection-NOT-IN.mdp    |   0
 ...tConstraint-WhenDefaultPartsAndIndices.mdp |   0
 ...onstraint-WhenIndicesAndNoDefaultParts.mdp |   0
 ...PartConstraint-WithOnlyDefaultPartInfo.mdp |   0
 .../PartForeignDifferentExecLocation.mdp      |   0
 .../minidump/PartForeignDifferentServer.mdp   |   0
 .../data/dxl/minidump/PartForeignMixed.mdp    |   0
 .../data/dxl/minidump/PartForeignMixedDPE.mdp |   0
 .../data/dxl/minidump/PartForeignMixedSPE.mdp |   0
 .../dxl/minidump/PartForeignUniformSPE.mdp    |   0
 .../data/dxl/minidump/PartPredsWithRandom.mdp |   0
 .../dxl/minidump/PartSelectorOnJoinSide.mdp   |   0
 .../dxl/minidump/PartSelectorOnJoinSide2.mdp  |   0
 .../PartTbl-AggWithExistentialSubquery.mdp    |   0
 .../data/dxl/minidump/PartTbl-ArrayCoerce.mdp |   0
 .../data/dxl/minidump/PartTbl-ArrayIn.mdp     |   0
 .../PartTbl-AsymmetricRangePredicate.mdp      |   0
 .../minidump/PartTbl-AvoidRangePred-DPE.mdp   |   0
 .../dxl/minidump/PartTbl-CSQ-NonPartKey.mdp   |   0
 .../data/dxl/minidump/PartTbl-CSQ-PartKey.mdp |   0
 .../minidump/PartTbl-ComplexPredicate1.mdp    |   0
 .../minidump/PartTbl-ComplexPredicate2.mdp    |   0
 .../minidump/PartTbl-ComplexPredicate3.mdp    |   0
 .../minidump/PartTbl-ComplexPredicate4.mdp    |   0
 .../minidump/PartTbl-ComplexPredicate5.mdp    |   0
 ...tTbl-ComplexRangePredicate-DefaultPart.mdp |   0
 ...bl-ComplexRangePredicate-NoDefaultPart.mdp |   0
 .../PartTbl-DPE-Correlated-NLOuter.mdp        |   0
 ...PartTbl-DPE-DynamicIndexOnlyScan-Range.mdp |   0
 .../data/dxl/minidump/PartTbl-DPE-GroupBy.mdp |   0
 .../data/dxl/minidump/PartTbl-DPE-Limit.mdp   |   0
 .../dxl/minidump/PartTbl-DPE-Opfamily.mdp     |   0
 .../minidump/PartTbl-DPE-WindowFunction.mdp   |   0
 .../gporca/data/dxl/minidump/PartTbl-DPE.mdp  |   0
 .../gporca/data/dxl/minidump/PartTbl-DTS.mdp  |   0
 .../data/dxl/minidump/PartTbl-DTSEq.mdp       |   0
 .../data/dxl/minidump/PartTbl-DTSLessThan.mdp |   0
 .../data/dxl/minidump/PartTbl-DateTime.mdp    |   0
 .../minidump/PartTbl-DisablePartSelection.mdp |   0
 .../PartTbl-DisablePartSelectionJoin.mdp      |   0
 .../data/dxl/minidump/PartTbl-Disjunction.mdp |   0
 .../PartTbl-EqPredicateWithCastRange.mdp      |   0
 .../gporca/data/dxl/minidump/PartTbl-HJ1.mdp  |   0
 .../gporca/data/dxl/minidump/PartTbl-HJ2.mdp  |   0
 .../gporca/data/dxl/minidump/PartTbl-HJ3.mdp  |   0
 .../gporca/data/dxl/minidump/PartTbl-HJ4.mdp  |   0
 .../gporca/data/dxl/minidump/PartTbl-HJ5.mdp  |   0
 .../data/dxl/minidump/PartTbl-IDFList.mdp     |   0
 .../data/dxl/minidump/PartTbl-IDFNull.mdp     |   0
 .../data/dxl/minidump/PartTbl-IDFWithCast.mdp |   0
 .../minidump/PartTbl-IndexOnDefPartOnly.mdp   |   0
 .../minidump/PartTbl-IsNotNullPredicate.mdp   |   0
 .../dxl/minidump/PartTbl-IsNullPredicate.mdp  |   0
 .../dxl/minidump/PartTbl-JoinOverExcept.mdp   |   0
 .../dxl/minidump/PartTbl-JoinOverGbAgg-2.mdp  |   0
 .../dxl/minidump/PartTbl-JoinOverGbAgg.mdp    |   0
 .../minidump/PartTbl-JoinOverIntersect.mdp    |   0
 .../dxl/minidump/PartTbl-JoinOverUnion-1.mdp  |   0
 .../dxl/minidump/PartTbl-JoinOverUnion-2.mdp  |   0
 .../gporca/data/dxl/minidump/PartTbl-LASJ.mdp |   0
 .../PartTbl-LeftOuterHashJoin-DPE-IsNull.mdp  |   0
 .../PartTbl-LeftOuterNLJoin-DPE-IsNull.mdp    |   0
 .../PartTbl-List-DPE-Int-Predicates.mdp       |   0
 .../PartTbl-List-DPE-Varchar-Predicates.mdp   |   0
 .../dxl/minidump/PartTbl-MultiWayJoin.mdp     |   0
 .../PartTbl-MultiWayJoinWithDPE-2.mdp         |   0
 .../minidump/PartTbl-MultipleEqPredicates.mdp |   0
 .../dxl/minidump/PartTbl-NEqPredicate.mdp     |   0
 .../gporca/data/dxl/minidump/PartTbl-NLJ.mdp  |   0
 .../dxl/minidump/PartTbl-NonConstSelect.mdp   |   0
 .../minidump/PartTbl-PredicateWithCast.mdp    |   0
 .../PartTbl-PredicateWithCastList.mdp         |   0
 ...artTbl-PredicateWithCastMultiLevelList.mdp |   0
 .../dxl/minidump/PartTbl-RangeJoinPred.mdp    |   0
 .../dxl/minidump/PartTbl-Relabel-Equality.mdp |   0
 .../dxl/minidump/PartTbl-Relabel-Range.mdp    |   0
 ...rtTbl-RightOuterHashJoin-DPE-IsNull-V2.mdp |   0
 .../dxl/minidump/PartTbl-SPE-Boolean1.mdp     |   0
 .../dxl/minidump/PartTbl-SPE-Boolean2.mdp     |   0
 ...artTbl-SPE-DynamicTableScan-List-Cost1.mdp |   0
 ...artTbl-SPE-DynamicTableScan-List-Cost2.mdp |   0
 ...artTbl-SPE-DynamicTableScan-List-Cost3.mdp |   0
 ...artTbl-SPE-DynamicTableScan-List-Cost4.mdp |   0
 ...artTbl-SPE-DynamicTableScan-List-Cost5.mdp |   0
 ...rtTbl-SPE-DynamicTableScan-Range-Cost1.mdp |   0
 ...rtTbl-SPE-DynamicTableScan-Range-Cost2.mdp |   0
 ...rtTbl-SPE-DynamicTableScan-Range-Cost3.mdp |   0
 ...rtTbl-SPE-DynamicTableScan-Range-Cost4.mdp |   0
 ...rtTbl-SPE-DynamicTableScan-Range-Cost5.mdp |   0
 .../data/dxl/minidump/PartTbl-SQAll.mdp       |   0
 .../data/dxl/minidump/PartTbl-SQAny.mdp       |   0
 .../data/dxl/minidump/PartTbl-SQExists.mdp    |   0
 .../data/dxl/minidump/PartTbl-SQNotExists.mdp |   0
 .../data/dxl/minidump/PartTbl-SQScalar.mdp    |   0
 .../dxl/minidump/PartTbl-SubqueryOuterRef.mdp |   0
 .../dxl/minidump/PartTbl-VolatileFunc.mdp     |   0
 ...rtTbl-WindowFuncNoDisjunctPredPushDown.mdp |   0
 .../PartTbl-WindowFuncNoPredPushDown.mdp      |   0
 .../PartTbl-WindowFuncPartialPredPushDown.mdp |   0
 .../PartTbl-WindowFuncPredPushDown.mdp        |   0
 .../PartTbl-WindowFuncSinglePredPushDown.mdp  |   0
 .../dxl/minidump/PartTbl-WindowFunction.mdp   |   0
 .../dxl/minidump/PredStatsNotComparable.mdp   |   0
 .../PredicateWithConjunctsAndDisjuncts.mdp    |   0
 .../PredicateWithConjunctsOfDisjuncts.mdp     |   0
 .../minidump/PredicateWithLongConjunction.mdp |   0
 .../data/dxl/minidump/Preds-Over-WinFunc1.mdp |   0
 .../data/dxl/minidump/Preds-Over-WinFunc2.mdp |   0
 .../data/dxl/minidump/Preds-Over-WinFunc3.mdp |   0
 .../data/dxl/minidump/Preds-Over-WinFunc4.mdp |   0
 .../data/dxl/minidump/Preds-Over-WinFunc5.mdp |   0
 ...yScanOnAppendOnlyVersion6UpgradedTable.mdp |   0
 ...TableContainingAppendOnlyVersion6Child.mdp |   0
 ...TableContainingAppendOnlyVersion6Child.mdp |   0
 .../minidump/Project-With-NonScalar-Func.mdp  |   0
 .../data/dxl/minidump/ProjectCountStar.mdp    |   0
 .../ProjectCountStarWithOuterRefs.mdp         |   0
 .../dxl/minidump/ProjectOutsideCountStar.mdp  |   0
 .../dxl/minidump/ProjectRepeatedColumn1.mdp   |   0
 .../dxl/minidump/ProjectRepeatedColumn2.mdp   |   0
 .../data/dxl/minidump/ProjectSetFunction.mdp  |   0
 .../data/dxl/minidump/ProjectUnderSubq.mdp    |   0
 .../data/dxl/minidump/ProjectWithConstant.mdp |   0
 .../dxl/minidump/ProjectWithTextConstant.mdp  |   0
 .../dxl/minidump/Push-Subplan-Below-Union.mdp |   0
 .../PushConstantSelectPredicateThruJoin-1.mdp |   0
 ...PushConstantSelectPredicateThruJoin-10.mdp |   0
 ...PushConstantSelectPredicateThruJoin-11.mdp |   0
 ...PushConstantSelectPredicateThruJoin-12.mdp |   0
 ...PushConstantSelectPredicateThruJoin-13.mdp |   0
 ...PushConstantSelectPredicateThruJoin-14.mdp |   0
 ...PushConstantSelectPredicateThruJoin-15.mdp |   0
 ...PushConstantSelectPredicateThruJoin-16.mdp |   0
 ...PushConstantSelectPredicateThruJoin-17.mdp |   0
 .../PushConstantSelectPredicateThruJoin-2.mdp |   0
 .../PushConstantSelectPredicateThruJoin-3.mdp |   0
 .../PushConstantSelectPredicateThruJoin-4.mdp |   0
 .../PushConstantSelectPredicateThruJoin-5.mdp |   0
 .../PushConstantSelectPredicateThruJoin-6.mdp |   0
 .../PushConstantSelectPredicateThruJoin-7.mdp |   0
 .../PushConstantSelectPredicateThruJoin-8.mdp |   0
 .../PushConstantSelectPredicateThruJoin-9.mdp |   0
 .../PushFilterToSemiJoinLeftChild.mdp         |   0
 .../minidump/PushGbBelowJoin-NegativeCase.mdp |   0
 .../dxl/minidump/PushGbBelowNaryUnion-1.mdp   |   0
 .../dxl/minidump/PushGbBelowNaryUnion-2.mdp   |   0
 .../dxl/minidump/PushGbBelowNaryUnionAll.mdp  |   0
 .../data/dxl/minidump/PushGbBelowUnion.mdp    |   0
 .../data/dxl/minidump/PushGbBelowUnionAll.mdp |   0
 .../minidump/PushSelectDownUnionAllOfCTG.mdp  |   0
 .../PushSelectWithOuterRefBelowUnion.mdp      |   0
 .../orca}/gporca/data/dxl/minidump/Query.xml  |   0
 ...ismatchedDistribution-DynamicIndexScan.mdp |   0
 .../minidump/QueryMismatchedDistribution.mdp  |   0
 .../data/dxl/minidump/RTErequiredPerms.mdp    |   0
 .../RangePartLossyCastEqInPartitionRange.mdp  |   0
 ...angePartLossyCastEqOnEndPartitionRange.mdp |   0
 ...RangePartLossyCastLTEqInPartitionRange.mdp |   0
 ...gePartLossyCastLTEqOnEndPartitionRange.mdp |   0
 .../RangePartLossyCastLTInPartitionRange.mdp  |   0
 ...angePartLossyCastLTOnEndPartitionRange.mdp |   0
 .../Remove-Distinct-From-Subquery.mdp         |   0
 .../RemoveImpliedPredOnBCCPredicates.mdp      |   0
 .../dxl/minidump/RemoveUnusedProjElements.mdp |   0
 .../RemoveUnusedProjElementsInGbAgg.mdp       |   0
 .../minidump/ReplicatedHashJoinReplicated.mdp |   0
 .../ReplicatedJoinHashDistributedTable.mdp    |   0
 .../ReplicatedJoinPartitionedTable.mdp        |   0
 .../ReplicatedJoinRandomDistributedTable.mdp  |   0
 .../ReplicatedLOJHashDistributedTable.mdp     |   0
 .../ReplicatedLOJRandomDistributedTable.mdp   |   0
 .../dxl/minidump/ReplicatedLOJReplicated.mdp  |   0
 .../dxl/minidump/ReplicatedNLJReplicated.mdp  |   0
 .../dxl/minidump/ReplicatedTable-CTAS.mdp     |   0
 .../dxl/minidump/ReplicatedTableAggregate.mdp |   0
 .../data/dxl/minidump/ReplicatedTableCTE.mdp  |   0
 .../dxl/minidump/ReplicatedTableGroupBy.mdp   |   0
 .../dxl/minidump/ReplicatedTableInClause.mdp  |   0
 .../dxl/minidump/ReplicatedTableInsert.mdp    |   0
 .../dxl/minidump/ReplicatedTableSelect.mdp    |   0
 .../ReplicatedTableSequenceInsert.mdp         |   0
 .../ReplicatedTableWithAggNoMotion.mdp        |   0
 .../dxl/minidump/RightJoinBothReplicated.mdp  |   0
 .../gporca/data/dxl/minidump/RightJoinDPE.mdp |   0
 .../minidump/RightJoinDpeWithWhereClause.mdp  |   0
 .../data/dxl/minidump/RightJoinHashed.mdp     |   0
 .../dxl/minidump/RightJoinNoDPSNonDistKey.mdp |   0
 .../dxl/minidump/RightJoinRedistribute.mdp    |   0
 .../data/dxl/minidump/RightJoinReplicated.mdp |   0
 .../gporca/data/dxl/minidump/RightJoinTVF.mdp |   0
 .../gporca/data/dxl/minidump/RollupNoAgg.mdp  |   0
 .../dxl/minidump/ScSubqueryWithOuterRef.mdp   |   0
 .../ScalarCorrelatedSubqueryCountStar.mdp     |   0
 .../minidump/ScalarDQAWithNonScalarAgg.mdp    |   0
 .../minidump/ScalarFuncPushedBelowGather.mdp  |   0
 .../dxl/minidump/ScalarSubq-Eq-SubqAll-1.mdp  |   0
 .../dxl/minidump/ScalarSubq-Eq-SubqAll-2.mdp  |   0
 .../dxl/minidump/ScalarSubqueryCountStar.mdp  |   0
 .../ScalarSubqueryCountStarInJoin.mdp         |   0
 .../dxl/minidump/Select-Over-CTEAnchor.mdp    |   0
 .../data/dxl/minidump/Select-Over-PartTbl.mdp |   0
 .../dxl/minidump/Select-Proj-OuterJoin.mdp    |   0
 .../dxl/minidump/SelectCheckConstraint.mdp    |   0
 .../data/dxl/minidump/SelectOnBpchar.mdp      |   0
 .../data/dxl/minidump/SelectOnCastedCol.mdp   |   0
 .../dxl/minidump/Self-Comparison-Nullable.mdp |   0
 .../data/dxl/minidump/Self-Comparison.mdp     |   0
 .../SelfJoinDampedPredJoinCardinality.mdp     |   0
 .../gporca/data/dxl/minidump/SelfUpdate.mdp   |   0
 .../data/dxl/minidump/SemiJoin2InnerJoin.mdp  |   0
 .../data/dxl/minidump/SemiJoin2Select-1.mdp   |   0
 .../data/dxl/minidump/SemiJoin2Select-2.mdp   |   0
 .../SemiJoin2Select-EnforceSubplan.mdp        |   0
 .../gporca/data/dxl/minidump/SemiJoinDPE.mdp  |   0
 .../SemiJoinWithWindowsFuncInSubquery.mdp     |   0
 .../Sequence-With-Universal-Outer.mdp         |   0
 .../dxl/minidump/SimpleArrayCoerceCast.mdp    |   0
 .../minidump/SimplifyExistsSubquery2Limit.mdp |   0
 .../SingleColumnHomogenousIndexOnRoot-AO.mdp  |   0
 ...SingleColumnHomogenousIndexOnRoot-HEAP.mdp |   0
 .../gporca/data/dxl/minidump/SixWayDPv2.mdp   |   0
 .../data/dxl/minidump/SortOverStreamAgg.mdp   |   0
 ...ShouldInvalidateUnresolvedDynamicScans.mdp |   0
 .../data/dxl/minidump/SqlFuncDmlScalar.mdp    |   0
 .../data/dxl/minidump/SqlFuncDmlTvf.mdp       |   0
 .../data/dxl/minidump/SqlFuncNullReject.mdp   |   0
 .../dxl/minidump/SqlFuncPredFactorize.mdp     |   0
 .../minidump/Stat-Derivation-Leaf-Pattern.mdp |   0
 .../Stats-For-Select-With-Outer-Refs.mdp      |   0
 .../StatsFilter-AnyWithNewColStats.mdp        |   0
 .../dxl/minidump/Subq-JoinWithOuterRef.mdp    |   0
 .../data/dxl/minidump/Subq-NoParams.mdp       |   0
 .../data/dxl/minidump/Subq-On-OuterRef.mdp    |   0
 .../dxl/minidump/Subq-With-OuterRefCol.mdp    |   0
 .../data/dxl/minidump/Subq2CorrSQInLOJOn.mdp  |   0
 .../data/dxl/minidump/Subq2NotInWhereLOJ.mdp  |   0
 .../dxl/minidump/Subq2OuterRef2InJoin.mdp     |   0
 .../minidump/Subq2OuterRefMultiLevelInOn.mdp  |   0
 .../dxl/minidump/Subq2PartialDecorrelate.mdp  |   0
 .../SubqAll-InsideScalarExpression.mdp        |   0
 .../data/dxl/minidump/SubqAll-Limit1.mdp      |   0
 .../dxl/minidump/SubqAll-To-ScalarSubq.mdp    |   0
 .../SubqAny-InsideScalarExpression.mdp        |   0
 .../data/dxl/minidump/SubqEnforceSubplan.mdp  |   0
 .../SubqExists-With-External-Corrs.mdp        |   0
 .../SubqExists-Without-External-Corrs.mdp     |   0
 .../data/dxl/minidump/SubqInIndexPred.mdp     |   0
 .../minidump/SubqOuterReferenceInClause.mdp   |   0
 .../minidump/Subquery-AnyAllAggregates.mdp    |   0
 .../minidump/Subquery-ExistsAllAggregates.mdp |   0
 ...query-ExistsAllAggregatesWithDisjuncts.mdp |   0
 .../dxl/minidump/SubqueryInsideArrayRef.mdp   |   0
 .../SubqueryInsideArrayRefIndexList.mdp       |   0
 .../dxl/minidump/SubqueryInsideScalarIf.mdp   |   0
 .../SubqueryNoPullUpTableValueFunction.mdp    |   0
 .../data/dxl/minidump/SubqueryNullTest.mdp    |   0
 .../dxl/minidump/SubqueryOuterRefLimit.mdp    |   0
 .../data/dxl/minidump/SubqueryOuterRefTVF.mdp |   0
 .../dxl/minidump/Switch-With-Subquery.mdp     |   0
 .../data/dxl/minidump/SystemColCtidStats.mdp  |   0
 .../data/dxl/minidump/SystemColSegIdStats.mdp |   0
 .../TPCDS-39-InnerJoin-JoinEstimate.mdp       |   0
 .../dxl/minidump/TPCH-Partitioned-256GB.mdp   |   0
 .../dxl/minidump/TVF-With-Deep-Subq-Args.mdp  |   0
 .../orca}/gporca/data/dxl/minidump/TVF.mdp    |   0
 .../data/dxl/minidump/TVFAnyelement.mdp       |   0
 .../dxl/minidump/TVFCorrelatedExecution.mdp   |   0
 .../data/dxl/minidump/TVFGenerateSeries.mdp   |   0
 .../gporca/data/dxl/minidump/TVFRandom.mdp    |   0
 .../data/dxl/minidump/TVFVolatileJoin.mdp     |   0
 .../dxl/minidump/TaintedReplicatedAgg.mdp     |   0
 .../dxl/minidump/TaintedReplicatedFilter.mdp  |   0
 .../dxl/minidump/TaintedReplicatedLimit.mdp   |   0
 .../minidump/TaintedReplicatedTablesCTE.mdp   |   0
 .../minidump/TaintedReplicatedWindowAgg.mdp   |   0
 .../dxl/minidump/TextMCVCardinalityEquals.mdp |   0
 .../TextMCVCardinalityGreaterThan.mdp         |   0
 .../ThreeStageAgg-DistinctOnComputedCol.mdp   |   0
 .../ThreeStageAgg-DistinctOnDistrCol.mdp      |   0
 ...hreeStageAgg-DistinctOnSameNonDistrCol.mdp |   0
 ...geAgg-GbMultipleCol-DistinctOnDistrCol.mdp |   0
 .../ThreeStageAgg-GbandDistinctOnDistrCol.mdp |   0
 ...StageAgg-ScalarAgg-DistinctComputedCol.mdp |   0
 ...reeStageAgg-ScalarAgg-DistinctDistrCol.mdp |   0
 ...StageAgg-ScalarAgg-DistinctNonDistrCol.mdp |   0
 .../data/dxl/minidump/ThreeStageAgg.mdp       |   0
 .../dxl/minidump/TimeStamp-Date-HashJoin.mdp  |   0
 .../minidump/Tpcds-10TB-Q37-NoIndexJoin.mdp   |   0
 .../data/dxl/minidump/Tpcds-NonPart-Q70a.mdp  |   0
 .../minidump/TranslateFilterDisjunctQuals.mdp |   0
 ...AndTableScanIntoFilterAndOneTimeFilter.mdp |   0
 .../TranslateOneTimeFilterConjunctQuals.mdp   |   0
 .../dxl/minidump/TypeModifierArrayRef.mdp     |   0
 .../data/dxl/minidump/TypeModifierCast.mdp    |   0
 .../data/dxl/minidump/TypeModifierColumn.mdp  |   0
 .../data/dxl/minidump/TypeModifierConst.mdp   |   0
 .../TypeModifierDoubleMappableConst.mdp       |   0
 .../gporca/data/dxl/minidump/UDA-AnyArray.mdp |   0
 .../data/dxl/minidump/UDA-AnyElement-1.mdp    |   0
 .../data/dxl/minidump/UDA-AnyElement-2.mdp    |   0
 ...ion-Distributed-Table-With-Const-Table.mdp |   0
 .../minidump/Union-NOT-Plus-OR-Constraint.mdp |   0
 .../Union-OuterRefs-Casting-Output.mdp        |   0
 .../minidump/Union-OuterRefs-InnerChild.mdp   |   0
 .../dxl/minidump/Union-OuterRefs-Output.mdp   |   0
 .../data/dxl/minidump/Union-Over-UnionAll.mdp |   0
 .../data/dxl/minidump/Union-Volatile-Func.mdp |   0
 .../gporca/data/dxl/minidump/UnionAll.mdp     |   0
 .../minidump/UnionAllCompatibleDataType.mdp   |   0
 .../minidump/UnionAllWithTruncatedOutput.mdp  |   0
 .../data/dxl/minidump/UnionGbSubquery.mdp     |   0
 .../data/dxl/minidump/UnionOfDQAQueries.mdp   |   0
 .../gporca/data/dxl/minidump/UnionWithCTE.mdp |   0
 .../data/dxl/minidump/UnionWithOuterRefs.mdp  |   0
 .../data/dxl/minidump/UnnestSQJoins.mdp       |   0
 .../minidump/UnsupportedStatsPredicate.mdp    |   0
 .../dxl/minidump/UpdateCardinalityAssert.mdp  |   0
 .../dxl/minidump/UpdateCheckConstraint.mdp    |   0
 .../UpdateDistKeyMismatchedDistribution.mdp   |   0
 .../minidump/UpdateDistKeyWithNestedJoin.mdp  |   0
 .../data/dxl/minidump/UpdateDistrKey.mdp      |   0
 .../data/dxl/minidump/UpdateDroppedCols.mdp   |   0
 .../minidump/UpdateNoCardinalityAssert.mdp    |   0
 .../UpdateNoDistKeyMismatchedDistribution.mdp |   0
 .../minidump/UpdateNoEnforceConstraints.mdp   |   0
 .../data/dxl/minidump/UpdateNotNullCols.mdp   |   0
 .../data/dxl/minidump/UpdatePartTable.mdp     |   0
 .../data/dxl/minidump/UpdateRandomDistr.mdp   |   0
 .../dxl/minidump/UpdateUniqueConstraint-2.mdp |   0
 .../dxl/minidump/UpdateUniqueConstraint.mdp   |   0
 .../dxl/minidump/UpdateVolatileFunction.mdp   |   0
 .../dxl/minidump/UpdateWindowGatherMerge.mdp  |   0
 .../data/dxl/minidump/UpdateWithHashJoin.mdp  |   0
 .../data/dxl/minidump/UpdateZeroRows.mdp      |   0
 .../minidump/UpdatingDistributionColumn.mdp   |   0
 .../dxl/minidump/UpdatingMultipleColumn.mdp   |   0
 .../minidump/UpdatingNonDistColSameTable.mdp  |   0
 .../UpdatingNonDistributionColumnFunc.mdp     |   0
 ...tionSatisfactionForUniversalInnerChild.mdp |   0
 ...alueScanWithDuplicateAndSelfComparison.mdp |   0
 .../minidump/VarcharMCVCardinalityEquals.mdp  |   0
 .../VarcharMCVCardinalityGreaterThan.mdp      |   0
 .../minidump/VariadicFlagWithFormatQuery.mdp  |   0
 .../dxl/minidump/VariadicFlagWithJson.mdp     |   0
 .../dxl/minidump/VariadicFlagWithUnionAll.mdp |   0
 .../VolatileFunctionsBelowScalarAgg.mdp       |   0
 ...WinFunc-Redistribute-Sort-CTE-Producer.mdp |   0
 .../data/dxl/minidump/WinFunc-Simple.mdp      |   0
 .../data/dxl/minidump/WinFuncWithSubqArgs.mdp |   0
 .../dxl/minidump/WindowFrame-SingleEdged.mdp  |   0
 .../minidump/WindowFrameExcludeCurrentRow.mdp |   0
 .../dxl/minidump/WindowFrameExcludeGroup.mdp  |   0
 .../dxl/minidump/WindowFrameExcludeTies.mdp   |   0
 .../data/dxl/minidump/WindowFrameGroups.mdp   |   0
 .../WindowFrameRangePrecedingAndFollowing.mdp |   0
 .../dxl/minidump/cte-duplicate-columns-1.mdp  |   0
 .../dxl/minidump/cte-duplicate-columns-2.mdp  |   0
 .../dxl/minidump/cte-duplicate-columns-3.mdp  |   0
 .../dxl/minidump/cte-duplicate-columns-4.mdp  |   0
 .../gporca/data/dxl/minidump/retail_28.mdp    |   0
 .../data/dxl/minidump/sql/BitmapIndexScan.sql |   0
 .../minidump/sql/DynamicBitmapIndexScan.sql   |   0
 .../data/dxl/minidump/window-count-gpdb6.mdp  |   0
 ...el-Casting-cast_boundary_value_to_date.mdp |   0
 ...-Casting-cast_partition_column_to_text.mdp |   0
 .../Multilevel-Casting-no_casting.mdp         |   0
 ...ilevel-Casting-predicate-on-all-levels.mdp |   0
 ...l-Casting-predicate-on-non-leaf-levels.mdp |   0
 ...l-Casting-predicate-on-non-root-levels.mdp |   0
 ...Multilevel-ConstPred-AllLevels-Default.mdp |   0
 ...ltilevel-ConstPred-AllLevels-NoDefault.mdp |   0
 .../Multilevel-ConstPred-Level1-Default.mdp   |   0
 .../Multilevel-ConstPred-Level1-NoDefault.mdp |   0
 .../Multilevel-ConstPred-Level2-Default.mdp   |   0
 .../Multilevel-ConstPred-Level2-NoDefault.mdp |   0
 .../Multilevel-FullScan.mdp                   |   0
 .../Multilevel-JoinPred-AllLevels.mdp         |   0
 .../Multilevel-JoinPred-Level1.mdp            |   0
 .../Multilevel-JoinPred-Level2.mdp            |   0
 .../Multilevel-Nary-Join.mdp                  |   0
 .../parse_tests/CostModelConfigCalibrated.xml |   0
 .../gporca/data/dxl/parse_tests/MDRequest.xml |   0
 .../data/dxl/parse_tests/OptimizerConfig.xml  |   0
 .../dxl/parse_tests/f1-MissingAttribute.xml   |   0
 .../parse_tests/f10-BoolExpr-MissingChild.xml |   0
 .../parse_tests/f11-BoolExpr-ExtraChild.xml   |   0
 .../f12-Const-MissingAttribute.xml            |   0
 .../data/dxl/parse_tests/f13-Case-Noelse.xml  |   0
 .../f14-Case-IncorrectCondition.xml           |   0
 .../dxl/parse_tests/f15-Case-MultipleElse.xml |   0
 .../parse_tests/f16-Case-NoResultClause.xml   |   0
 .../parse_tests/f17-Limit-MissingCount.xml    |   0
 .../dxl/parse_tests/f2-UnrecognizedOp.xml     |   0
 .../data/dxl/parse_tests/f3-UnexpectedTag.xml |   0
 .../dxl/parse_tests/f4-InvalidAttrValue.xml   |   0
 .../data/dxl/parse_tests/f5-UnexpectedTag.xml |   0
 .../data/dxl/parse_tests/f6-UnexpectedTag.xml |   0
 .../data/dxl/parse_tests/f7-UnexpectedTag.xml |   0
 .../data/dxl/parse_tests/f8-UnexpectedTag.xml |   0
 .../data/dxl/parse_tests/f9-UnexpectedTag.xml |   0
 .../gporca/data/dxl/parse_tests/q1-TS.xml     |   0
 .../gporca/data/dxl/parse_tests/q10-Case.xml  |   0
 .../gporca/data/dxl/parse_tests/q11-Limit.xml |   0
 .../dxl/parse_tests/q12-Limit-NoOffset.xml    |   0
 .../data/dxl/parse_tests/q13-AGG-TS.xml       |   0
 .../dxl/parse_tests/q14-FuncExpr-NoArg.xml    |   0
 .../dxl/parse_tests/q15-FuncExpr-WithArgs.xml |   0
 .../q16-FuncExpr-WithNestedFuncExpr.xml       |   0
 .../data/dxl/parse_tests/q17-AggRef.xml       |   0
 .../data/dxl/parse_tests/q18-Sort-TS.xml      |   0
 .../data/dxl/parse_tests/q19-DistinctFrom.xml |   0
 .../gporca/data/dxl/parse_tests/q2-HJ.xml     |   0
 .../dxl/parse_tests/q20-DistinctFrom-HJ.xml   |   0
 .../data/dxl/parse_tests/q22-Result.xml       |   0
 .../gporca/data/dxl/parse_tests/q23-MJ.xml    |   0
 .../dxl/parse_tests/q25-AppendPartTable.xml   |   0
 .../data/dxl/parse_tests/q26-Metadata.xml     |   0
 .../data/dxl/parse_tests/q28-Materialize.xml  |   0
 .../gporca/data/dxl/parse_tests/q3-HJ2.xml    |   0
 .../dxl/parse_tests/q30-LogicalOrderBy.xml    |   0
 .../data/dxl/parse_tests/q31-LogicalLimit.xml |   0
 .../dxl/parse_tests/q32-ScalarSubquery.xml    |   0
 .../dxl/parse_tests/q33-ScalarSubqueryAny.xml |   0
 .../dxl/parse_tests/q34-SubqueryExists.xml    |   0
 .../data/dxl/parse_tests/q35-ConstTable.xml   |   0
 .../data/dxl/parse_tests/q36-Statistics.xml   |   0
 .../data/dxl/parse_tests/q37-IndexScan.xml    |   0
 .../gporca/data/dxl/parse_tests/q39-Array.xml |   0
 .../gporca/data/dxl/parse_tests/q4-NLJ-GM.xml |   0
 .../data/dxl/parse_tests/q40-SubPlan.xml      |   0
 .../data/dxl/parse_tests/q41-LogicalTVF.xml   |   0
 .../gporca/data/dxl/parse_tests/q41-SetOp.xml |   0
 .../parse_tests/q42-TableValuedFunction.xml   |   0
 .../data/dxl/parse_tests/q43-LogicalCTE.xml   |   0
 .../data/dxl/parse_tests/q44-Window.xml       |   0
 .../dxl/parse_tests/q45-WindowWithFraming.xml |   0
 .../dxl/parse_tests/q46-LogicalWindow.xml     |   0
 .../dxl/parse_tests/q47-WindowWithFraming.xml |   0
 .../dxl/parse_tests/q48-IndexOnlyScan.xml     |   0
 .../data/dxl/parse_tests/q49-Coalesce.xml     |   0
 .../gporca/data/dxl/parse_tests/q5-HJ-RM.xml  |   0
 .../data/dxl/parse_tests/q50-Switch.xml       |   0
 .../dxl/parse_tests/q51-SwitchNoDefault.xml   |   0
 .../data/dxl/parse_tests/q52-CaseTest.xml     |   0
 .../data/dxl/parse_tests/q53-NullIf.xml       |   0
 .../q54-WindowWithNoLeadingFrameEdge.xml      |   0
 .../data/dxl/parse_tests/q55-Insert.xml       |   0
 .../data/dxl/parse_tests/q56-Delete.xml       |   0
 .../data/dxl/parse_tests/q57-DMLDelete.xml    |   0
 .../data/dxl/parse_tests/q59-Update.xml       |   0
 .../gporca/data/dxl/parse_tests/q6-opexpr.xml |   0
 .../data/dxl/parse_tests/q60-DMLUpdate.xml    |   0
 .../dxl/parse_tests/q61-PlanWithStats.xml     |   0
 .../data/dxl/parse_tests/q62-CTEPlan.xml      |   0
 .../dxl/parse_tests/q63-LogicalForeignGet.xml |   0
 .../data/dxl/parse_tests/q64-ExternalScan.xml |   0
 .../dxl/parse_tests/q65-LogicalCTASHash.xml   |   0
 .../dxl/parse_tests/q66-LogicalCTASRandom.xml |   0
 .../data/dxl/parse_tests/q67-PhysicalCTAS.xml |   0
 .../data/dxl/parse_tests/q68-ArrayRef1.xml    |   0
 .../data/dxl/parse_tests/q69-ArrayRef2.xml    |   0
 .../data/dxl/parse_tests/q7-boolexpr.xml      |   0
 .../dxl/parse_tests/q70-BitmapIndexProbe.xml  |   0
 .../data/dxl/parse_tests/q72-BitmapBoolOp.xml |   0
 .../q73-LogicalLimit-NonRemovable.xml         |   0
 .../parse_tests/q74-DirectDispatchInfo.xml    |   0
 .../data/dxl/parse_tests/q75-MinMax.xml       |   0
 .../data/dxl/parse_tests/q76-ValuesScan.xml   |   0
 .../data/dxl/parse_tests/q8-boolexpr-not.xml  |   0
 .../data/dxl/parse_tests/q9-constval.xml      |   0
 .../data/dxl/parse_tests/s01-ConstValue.xml   |   0
 .../dxl/parse_tests/s02-NestedFuncExpr.xml    |   0
 .../gporca/data/dxl/parse_tests/sax-fail.xml  |   0
 .../orca}/gporca/data/dxl/query/dxl-q17.xml   |   0
 .../orca}/gporca/data/dxl/query/dxl-q18.xml   |   0
 .../orca}/gporca/data/dxl/query/dxl-q19.xml   |   0
 .../orca}/gporca/data/dxl/query/dxl-q23.xml   |   0
 .../gporca/data/dxl/search/strategy0.xml      |   0
 .../data/dxl/search/timeout-strategy.xml      |   0
 .../gporca/data/dxl/search/wrong-strategy.xml |   0
 .../dxl/statistics/ArrayCmpAny-Input-1.xml    |   0
 .../dxl/statistics/ArrayCmpAny-Output-1.xml   |   0
 .../dxl/statistics/Basic-Statistics-Input.xml |   0
 .../statistics/Basic-Statistics-Output.xml    |   0
 .../data/dxl/statistics/Disj-Input-1.xml      |   0
 .../data/dxl/statistics/Disj-Input-2.xml      |   0
 .../data/dxl/statistics/Disj-Output-1.xml     |   0
 .../data/dxl/statistics/Disj-Output-2-1.xml   |   0
 .../data/dxl/statistics/Disj-Output-2-2.xml   |   0
 .../data/dxl/statistics/Disj-Output-2-3.xml   |   0
 .../data/dxl/statistics/Disj-Output-2-4.xml   |   0
 .../data/dxl/statistics/Disj-Output-2-5.xml   |   0
 .../data/dxl/statistics/Disj-Output-8.xml     |   0
 .../Join-Statistics-DDistinct-Input.xml       |   0
 .../Join-Statistics-DDistinct-Output.xml      |   0
 .../Join-Statistics-Input-Null-Bucket.xml     |   0
 .../Join-Statistics-Input-Only-Nulls.xml      |   0
 .../dxl/statistics/Join-Statistics-Input.xml  |   0
 .../Join-Statistics-Output-LOJ-Only-Nulls.xml |   0
 .../Join-Statistics-Output-Null-Bucket.xml    |   0
 .../Join-Statistics-Output-Only-Nulls.xml     |   0
 .../dxl/statistics/Join-Statistics-Output.xml |   0
 .../gporca/data/dxl/statistics/LOJ-Input.xml  |   0
 .../gporca/data/dxl/statistics/LOJ-Output.xml |   0
 .../data/dxl/statistics/MCV-Sort-Output.xml   |   0
 .../statistics/Merge-Input-Histogram-Int.xml  |   0
 .../Merge-Input-Histogram-Numeric.xml         |   0
 .../dxl/statistics/Merge-Input-MCV-Int.xml    |   0
 .../statistics/Merge-Input-MCV-Numeric.xml    |   0
 .../data/dxl/statistics/Merge-Output-Int.xml  |   0
 .../dxl/statistics/Merge-Output-Numeric.xml   |   0
 .../dxl/statistics/NestedPred-Input-1.xml     |   0
 .../dxl/statistics/NestedPred-Input-10.xml    |   0
 .../dxl/statistics/NestedPred-Input-2.xml     |   0
 .../dxl/statistics/NestedPred-Input-3.xml     |   0
 .../dxl/statistics/NestedPred-Input-8.xml     |   0
 .../dxl/statistics/NestedPred-Input-9.xml     |   0
 .../dxl/statistics/NestedPred-Output-1.xml    |   0
 .../dxl/statistics/NestedPred-Output-10.xml   |   0
 .../dxl/statistics/NestedPred-Output-2.xml    |   0
 .../dxl/statistics/NestedPred-Output-3.xml    |   0
 .../dxl/statistics/NestedPred-Output-4.xml    |   0
 .../dxl/statistics/NestedPred-Output-5.xml    |   0
 .../dxl/statistics/NestedPred-Output-6.xml    |   0
 .../dxl/statistics/NestedPred-Output-7.xml    |   0
 .../dxl/statistics/NestedPred-Output-8.xml    |   0
 .../dxl/statistics/NestedPred-Output-9.xml    |   0
 .../data/dxl/statistics/Numeric-Input.xml     |   0
 .../data/dxl/statistics/Numeric-Input2.xml    |   0
 .../Numeric-Output-2-E-MaxBoundary.xml        |   0
 .../Numeric-Output-2-E-MinBoundary.xml        |   0
 .../Numeric-Output-2-GT-MaxBoundary.xml       |   0
 .../Numeric-Output-2-GT-MinBoundary.xml       |   0
 .../Numeric-Output-2-GTE-MaxBoundary.xml      |   0
 .../Numeric-Output-2-GTE-MinBoundary.xml      |   0
 .../Numeric-Output-2-LT-MaxBoundary.xml       |   0
 .../Numeric-Output-2-LT-MinBoundary.xml       |   0
 .../Numeric-Output-2-LTE-MaxBoundary.xml      |   0
 .../Numeric-Output-2-LTE-MinBoundary.xml      |   0
 .../Numeric-Output-E-MaxBoundary.xml          |   0
 .../Numeric-Output-E-MinBoundary.xml          |   0
 .../Numeric-Output-GT-MaxBoundary.xml         |   0
 .../Numeric-Output-GTE-MaxBoundary.xml        |   0
 .../Numeric-Output-LT-MinBoundary.xml         |   0
 .../Numeric-Output-LTE-MinBoundary.xml        |   0
 .../Select-Statistics-Input-Null-Bucket.xml   |   0
 ...ect-Statistics-Output-NotNull-Constant.xml |   0
 .../Select-Statistics-Output-Null-Bucket.xml  |   0
 ...Select-Statistics-Output-Null-Constant.xml |   0
 .../gporca/data/dxl/statistics/SelectPlan.xml |   0
 .../data/dxl/statistics/SelectQuery.xml       |   0
 .../data/dxl/statistics/UnionAll-Input-1.xml  |   0
 .../data/dxl/statistics/UnionAll-Output-1.xml |   0
 .../gporca/data/dxl/tpch/q1-partitioned.mdp   |   0
 .../orca}/gporca/data/dxl/tpch/q1.mdp         |   0
 .../orca}/gporca/data/dxl/tpch/q10.mdp        |   0
 .../orca}/gporca/data/dxl/tpch/q11.mdp        |   0
 .../orca}/gporca/data/dxl/tpch/q12.mdp        |   0
 .../orca}/gporca/data/dxl/tpch/q13.mdp        |   0
 .../orca}/gporca/data/dxl/tpch/q14.mdp        |   0
 .../orca}/gporca/data/dxl/tpch/q15.mdp        |   0
 .../orca}/gporca/data/dxl/tpch/q16.mdp        |   0
 .../orca}/gporca/data/dxl/tpch/q17.mdp        |   0
 .../orca}/gporca/data/dxl/tpch/q18.mdp        |   0
 .../orca}/gporca/data/dxl/tpch/q19.mdp        |   0
 .../orca}/gporca/data/dxl/tpch/q2.mdp         |   0
 .../orca}/gporca/data/dxl/tpch/q20.mdp        |   0
 .../orca}/gporca/data/dxl/tpch/q21.mdp        |   0
 .../orca}/gporca/data/dxl/tpch/q22.mdp        |   0
 .../orca}/gporca/data/dxl/tpch/q3.mdp         |   0
 .../orca}/gporca/data/dxl/tpch/q4.mdp         |   0
 .../orca}/gporca/data/dxl/tpch/q5.mdp         |   0
 .../orca}/gporca/data/dxl/tpch/q6.mdp         |   0
 .../orca}/gporca/data/dxl/tpch/q7.mdp         |   0
 .../orca}/gporca/data/dxl/tpch/q8.mdp         |   0
 .../orca}/gporca/data/dxl/tpch/q9.mdp         |   0
 .../orca}/gporca/libgpdbcost/CMakeLists.txt   |   0
 .../include/gpdbcost/CCostModelGPDB.h         |   0
 .../include/gpdbcost/CCostModelParamsGPDB.h   |   0
 .../gporca/libgpdbcost/src/CCostModelGPDB.cpp |   0
 .../libgpdbcost/src/CCostModelParamsGPDB.cpp  |   0
 .../gporca/libgpdbcost/src/ICostModel.cpp     |   0
 .../orca}/gporca/libgpopt/CMakeLists.txt      |   0
 .../include/gpopt/base/CAutoOptCtxt.h         |   0
 .../libgpopt/include/gpopt/base/CCTEInfo.h    |   0
 .../libgpopt/include/gpopt/base/CCTEMap.h     |   0
 .../libgpopt/include/gpopt/base/CCTEReq.h     |   0
 .../libgpopt/include/gpopt/base/CCastUtils.h  |   0
 .../gpopt/base/CColConstraintsArrayMapper.h   |   0
 .../gpopt/base/CColConstraintsHashMapper.h    |   0
 .../libgpopt/include/gpopt/base/CColRef.h     |   0
 .../include/gpopt/base/CColRefComputed.h      |   0
 .../libgpopt/include/gpopt/base/CColRefSet.h  |   0
 .../include/gpopt/base/CColRefSetIter.h       |   0
 .../include/gpopt/base/CColRefTable.h         |   0
 .../include/gpopt/base/CColumnFactory.h       |   0
 .../libgpopt/include/gpopt/base/CConstraint.h |   0
 .../gpopt/base/CConstraintConjunction.h       |   0
 .../gpopt/base/CConstraintDisjunction.h       |   0
 .../include/gpopt/base/CConstraintInterval.h  |   0
 .../include/gpopt/base/CConstraintNegation.h  |   0
 .../include/gpopt/base/CCostContext.h         |   0
 .../include/gpopt/base/CDatumSortedSet.h      |   0
 .../include/gpopt/base/CDefaultComparator.h   |   0
 .../include/gpopt/base/CDistributionSpec.h    |   0
 .../include/gpopt/base/CDistributionSpecAny.h |   0
 .../gpopt/base/CDistributionSpecHashed.h      |   0
 .../gpopt/base/CDistributionSpecHashedNoOp.h  |   0
 .../base/CDistributionSpecNonReplicated.h     |   0
 .../base/CDistributionSpecNonSingleton.h      |   0
 .../gpopt/base/CDistributionSpecRandom.h      |   0
 .../gpopt/base/CDistributionSpecReplicated.h  |   0
 .../gpopt/base/CDistributionSpecRouted.h      |   0
 .../gpopt/base/CDistributionSpecSingleton.h   |   0
 .../base/CDistributionSpecStrictHashed.h      |   0
 .../base/CDistributionSpecStrictRandom.h      |   0
 .../base/CDistributionSpecStrictSingleton.h   |   0
 .../gpopt/base/CDistributionSpecUniversal.h   |   0
 .../libgpopt/include/gpopt/base/CDrvdProp.h   |   0
 .../include/gpopt/base/CDrvdPropCtxt.h        |   0
 .../include/gpopt/base/CDrvdPropCtxtPlan.h    |   0
 .../gpopt/base/CDrvdPropCtxtRelational.h      |   0
 .../include/gpopt/base/CDrvdPropPlan.h        |   0
 .../include/gpopt/base/CDrvdPropRelational.h  |   0
 .../include/gpopt/base/CDrvdPropScalar.h      |   0
 .../include/gpopt/base/CEnfdDistribution.h    |   0
 .../libgpopt/include/gpopt/base/CEnfdOrder.h  |   0
 .../gpopt/base/CEnfdPartitionPropagation.h    |   0
 .../libgpopt/include/gpopt/base/CEnfdProp.h   |   0
 .../include/gpopt/base/CEnfdRewindability.h   |   0
 .../include/gpopt/base/CFunctionProp.h        |   0
 .../gpopt/base/CFunctionalDependency.h        |   0
 .../libgpopt/include/gpopt/base/CIOUtils.h    |   0
 .../libgpopt/include/gpopt/base/CKHeap.h      |   0
 .../include/gpopt/base/CKeyCollection.h       |   0
 .../libgpopt/include/gpopt/base/CMaxCard.h    |   0
 .../libgpopt/include/gpopt/base/COptCtxt.h    |   0
 .../include/gpopt/base/COptimizationContext.h |   0
 .../libgpopt/include/gpopt/base/COrderSpec.h  |   0
 .../libgpopt/include/gpopt/base/CPartInfo.h   |   0
 .../libgpopt/include/gpopt/base/CPartKeys.h   |   0
 .../gpopt/base/CPartitionPropagationSpec.h    |   0
 .../include/gpopt/base/CPrintPrefix.h         |   0
 .../include/gpopt/base/CPropConstraint.h      |   0
 .../libgpopt/include/gpopt/base/CPropSpec.h   |   0
 .../include/gpopt/base/CQueryContext.h        |   0
 .../libgpopt/include/gpopt/base/CRange.h      |   0
 .../libgpopt/include/gpopt/base/CReqdProp.h   |   0
 .../include/gpopt/base/CReqdPropPlan.h        |   0
 .../include/gpopt/base/CReqdPropRelational.h  |   0
 .../include/gpopt/base/CRewindabilitySpec.h   |   0
 .../include/gpopt/base/CStateMachine.h        |   0
 .../libgpopt/include/gpopt/base/CUtils.h      |   0
 .../include/gpopt/base/CWindowFrame.h         |   0
 .../libgpopt/include/gpopt/base/CWindowOids.h |   0
 .../gpopt/base/IColConstraintsMapper.h        |   0
 .../libgpopt/include/gpopt/base/IComparator.h |   0
 .../include/gpopt/base/SPartSelectorInfo.h    |   0
 .../libgpopt/include/gpopt/cost/CCost.h       |   0
 .../libgpopt/include/gpopt/cost/ICostModel.h  |   0
 .../include/gpopt/cost/ICostModelParams.h     |   0
 .../include/gpopt/engine/CCTEConfig.h         |   0
 .../libgpopt/include/gpopt/engine/CEngine.h   |   0
 .../include/gpopt/engine/CEnumeratorConfig.h  |   0
 .../libgpopt/include/gpopt/engine/CHint.h     |   0
 .../include/gpopt/engine/CPartialPlan.h       |   0
 .../include/gpopt/engine/CStatisticsConfig.h  |   0
 .../gpopt/eval/CConstExprEvaluatorDXL.h       |   0
 .../gpopt/eval/CConstExprEvaluatorDefault.h   |   0
 .../gpopt/eval/IConstDXLNodeEvaluator.h       |   0
 .../include/gpopt/eval/IConstExprEvaluator.h  |   0
 .../gporca/libgpopt/include/gpopt/exception.h |   0
 .../libgpopt/include/gpopt/hints/CHintUtils.h |   0
 .../libgpopt/include/gpopt/hints/CJoinHint.h  |   0
 .../libgpopt/include/gpopt/hints/CPlanHint.h  |   0
 .../libgpopt/include/gpopt/hints/CRowHint.h   |   0
 .../libgpopt/include/gpopt/hints/CScanHint.h  |   0
 .../libgpopt/include/gpopt/hints/IHint.h      |   0
 .../gporca/libgpopt/include/gpopt/init.h      |   0
 .../include/gpopt/mdcache/CAutoMDAccessor.h   |   0
 .../include/gpopt/mdcache/CMDAccessor.h       |   0
 .../include/gpopt/mdcache/CMDAccessorUtils.h  |   0
 .../libgpopt/include/gpopt/mdcache/CMDCache.h |   0
 .../libgpopt/include/gpopt/mdcache/CMDKey.h   |   0
 .../gpopt/metadata/CColumnDescriptor.h        |   0
 .../include/gpopt/metadata/CIndexDescriptor.h |   0
 .../libgpopt/include/gpopt/metadata/CName.h   |   0
 .../include/gpopt/metadata/CTableDescriptor.h |   0
 .../include/gpopt/minidump/CDXLMinidump.h     |   0
 .../gpopt/minidump/CMetadataAccessorFactory.h |   0
 .../include/gpopt/minidump/CMiniDumperDXL.h   |   0
 .../include/gpopt/minidump/CMinidumperUtils.h |   0
 .../gpopt/minidump/CSerializableMDAccessor.h  |   0
 .../minidump/CSerializableOptimizerConfig.h   |   0
 .../gpopt/minidump/CSerializablePlan.h        |   0
 .../gpopt/minidump/CSerializableQuery.h       |   0
 .../gpopt/minidump/CSerializableStackTrace.h  |   0
 .../include/gpopt/operators/CExpression.h     |   0
 .../gpopt/operators/CExpressionFactorizer.h   |   0
 .../gpopt/operators/CExpressionHandle.h       |   0
 .../gpopt/operators/CExpressionPreprocessor.h |   0
 .../gpopt/operators/CExpressionUtils.h        |   0
 .../gpopt/operators/CHashedDistributions.h    |   0
 .../operators/CJoinOrderHintsPreprocessor.h   |   0
 .../operators/CLeftJoinPruningPreprocessor.h  |   0
 .../include/gpopt/operators/CLogical.h        |   0
 .../include/gpopt/operators/CLogicalApply.h   |   0
 .../include/gpopt/operators/CLogicalAssert.h  |   0
 .../gpopt/operators/CLogicalBitmapTableGet.h  |   0
 .../gpopt/operators/CLogicalCTEAnchor.h       |   0
 .../gpopt/operators/CLogicalCTEConsumer.h     |   0
 .../gpopt/operators/CLogicalCTEProducer.h     |   0
 .../gpopt/operators/CLogicalConstTableGet.h   |   0
 .../include/gpopt/operators/CLogicalDML.h     |   0
 .../include/gpopt/operators/CLogicalDelete.h  |   0
 .../gpopt/operators/CLogicalDifference.h      |   0
 .../gpopt/operators/CLogicalDifferenceAll.h   |   0
 .../operators/CLogicalDynamicBitmapTableGet.h |   0
 .../operators/CLogicalDynamicForeignGet.h     |   0
 .../gpopt/operators/CLogicalDynamicGet.h      |   0
 .../gpopt/operators/CLogicalDynamicGetBase.h  |   0
 .../gpopt/operators/CLogicalDynamicIndexGet.h |   0
 .../operators/CLogicalDynamicIndexOnlyGet.h   |   0
 .../gpopt/operators/CLogicalForeignGet.h      |   0
 .../gpopt/operators/CLogicalFullOuterJoin.h   |   0
 .../include/gpopt/operators/CLogicalGbAgg.h   |   0
 .../operators/CLogicalGbAggDeduplicate.h      |   0
 .../include/gpopt/operators/CLogicalGet.h     |   0
 .../gpopt/operators/CLogicalIndexApply.h      |   0
 .../gpopt/operators/CLogicalIndexGet.h        |   0
 .../gpopt/operators/CLogicalIndexOnlyGet.h    |   0
 .../gpopt/operators/CLogicalInnerApply.h      |   0
 .../operators/CLogicalInnerCorrelatedApply.h  |   0
 .../gpopt/operators/CLogicalInnerJoin.h       |   0
 .../include/gpopt/operators/CLogicalInsert.h  |   0
 .../gpopt/operators/CLogicalIntersect.h       |   0
 .../gpopt/operators/CLogicalIntersectAll.h    |   0
 .../include/gpopt/operators/CLogicalJoin.h    |   0
 .../operators/CLogicalLeftAntiSemiApply.h     |   0
 .../CLogicalLeftAntiSemiApplyNotIn.h          |   0
 .../CLogicalLeftAntiSemiCorrelatedApply.h     |   0
 ...CLogicalLeftAntiSemiCorrelatedApplyNotIn.h |   0
 .../operators/CLogicalLeftAntiSemiJoin.h      |   0
 .../operators/CLogicalLeftAntiSemiJoinNotIn.h |   0
 .../gpopt/operators/CLogicalLeftOuterApply.h  |   0
 .../CLogicalLeftOuterCorrelatedApply.h        |   0
 .../gpopt/operators/CLogicalLeftOuterJoin.h   |   0
 .../gpopt/operators/CLogicalLeftSemiApply.h   |   0
 .../gpopt/operators/CLogicalLeftSemiApplyIn.h |   0
 .../CLogicalLeftSemiCorrelatedApply.h         |   0
 .../CLogicalLeftSemiCorrelatedApplyIn.h       |   0
 .../gpopt/operators/CLogicalLeftSemiJoin.h    |   0
 .../include/gpopt/operators/CLogicalLimit.h   |   0
 .../gpopt/operators/CLogicalMaxOneRow.h       |   0
 .../gpopt/operators/CLogicalNAryJoin.h        |   0
 .../include/gpopt/operators/CLogicalProject.h |   0
 .../gpopt/operators/CLogicalRightOuterJoin.h  |   0
 .../include/gpopt/operators/CLogicalSelect.h  |   0
 .../gpopt/operators/CLogicalSequence.h        |   0
 .../gpopt/operators/CLogicalSequenceProject.h |   0
 .../include/gpopt/operators/CLogicalSetOp.h   |   0
 .../include/gpopt/operators/CLogicalSplit.h   |   0
 .../include/gpopt/operators/CLogicalTVF.h     |   0
 .../include/gpopt/operators/CLogicalUnary.h   |   0
 .../include/gpopt/operators/CLogicalUnion.h   |   0
 .../gpopt/operators/CLogicalUnionAll.h        |   0
 .../include/gpopt/operators/CLogicalUpdate.h  |   0
 .../include/gpopt/operators/CNormalizer.h     |   0
 .../include/gpopt/operators/COperator.h       |   0
 .../gpopt/operators/COrderedAggPreprocessor.h |   0
 .../include/gpopt/operators/CPattern.h        |   0
 .../include/gpopt/operators/CPatternLeaf.h    |   0
 .../gpopt/operators/CPatternMultiLeaf.h       |   0
 .../gpopt/operators/CPatternMultiTree.h       |   0
 .../include/gpopt/operators/CPatternNode.h    |   0
 .../include/gpopt/operators/CPatternTree.h    |   0
 .../include/gpopt/operators/CPhysical.h       |   0
 .../include/gpopt/operators/CPhysicalAgg.h    |   0
 .../include/gpopt/operators/CPhysicalAssert.h |   0
 .../operators/CPhysicalBitmapTableScan.h      |   0
 .../gpopt/operators/CPhysicalCTEConsumer.h    |   0
 .../gpopt/operators/CPhysicalCTEProducer.h    |   0
 .../gpopt/operators/CPhysicalComputeScalar.h  |   0
 .../gpopt/operators/CPhysicalConstTableGet.h  |   0
 .../CPhysicalCorrelatedInLeftSemiNLJoin.h     |   0
 .../CPhysicalCorrelatedInnerNLJoin.h          |   0
 .../CPhysicalCorrelatedLeftAntiSemiNLJoin.h   |   0
 .../CPhysicalCorrelatedLeftOuterNLJoin.h      |   0
 .../CPhysicalCorrelatedLeftSemiNLJoin.h       |   0
 ...hysicalCorrelatedNotInLeftAntiSemiNLJoin.h |   0
 .../include/gpopt/operators/CPhysicalDML.h    |   0
 .../CPhysicalDynamicBitmapTableScan.h         |   0
 .../operators/CPhysicalDynamicForeignScan.h   |   0
 .../operators/CPhysicalDynamicIndexOnlyScan.h |   0
 .../operators/CPhysicalDynamicIndexScan.h     |   0
 .../gpopt/operators/CPhysicalDynamicScan.h    |   0
 .../operators/CPhysicalDynamicTableScan.h     |   0
 .../include/gpopt/operators/CPhysicalFilter.h |   0
 .../gpopt/operators/CPhysicalForeignScan.h    |   0
 .../gpopt/operators/CPhysicalFullHashJoin.h   |   0
 .../gpopt/operators/CPhysicalFullMergeJoin.h  |   0
 .../gpopt/operators/CPhysicalHashAgg.h        |   0
 .../operators/CPhysicalHashAggDeduplicate.h   |   0
 .../gpopt/operators/CPhysicalHashJoin.h       |   0
 .../gpopt/operators/CPhysicalIndexOnlyScan.h  |   0
 .../gpopt/operators/CPhysicalIndexScan.h      |   0
 .../gpopt/operators/CPhysicalInnerHashJoin.h  |   0
 .../operators/CPhysicalInnerIndexNLJoin.h     |   0
 .../gpopt/operators/CPhysicalInnerNLJoin.h    |   0
 .../include/gpopt/operators/CPhysicalJoin.h   |   0
 .../operators/CPhysicalLeftAntiSemiHashJoin.h |   0
 .../CPhysicalLeftAntiSemiHashJoinNotIn.h      |   0
 .../operators/CPhysicalLeftAntiSemiNLJoin.h   |   0
 .../CPhysicalLeftAntiSemiNLJoinNotIn.h        |   0
 .../operators/CPhysicalLeftOuterHashJoin.h    |   0
 .../operators/CPhysicalLeftOuterIndexNLJoin.h |   0
 .../operators/CPhysicalLeftOuterNLJoin.h      |   0
 .../operators/CPhysicalLeftSemiHashJoin.h     |   0
 .../gpopt/operators/CPhysicalLeftSemiNLJoin.h |   0
 .../include/gpopt/operators/CPhysicalLimit.h  |   0
 .../include/gpopt/operators/CPhysicalMotion.h |   0
 .../operators/CPhysicalMotionBroadcast.h      |   0
 .../gpopt/operators/CPhysicalMotionGather.h   |   0
 .../operators/CPhysicalMotionHashDistribute.h |   0
 .../gpopt/operators/CPhysicalMotionRandom.h   |   0
 .../CPhysicalMotionRoutedDistribute.h         |   0
 .../include/gpopt/operators/CPhysicalNLJoin.h |   0
 .../operators/CPhysicalParallelUnionAll.h     |   0
 .../operators/CPhysicalPartitionSelector.h    |   0
 .../operators/CPhysicalRightOuterHashJoin.h   |   0
 .../gpopt/operators/CPhysicalScalarAgg.h      |   0
 .../include/gpopt/operators/CPhysicalScan.h   |   0
 .../gpopt/operators/CPhysicalSequence.h       |   0
 .../operators/CPhysicalSequenceProject.h      |   0
 .../gpopt/operators/CPhysicalSerialUnionAll.h |   0
 .../include/gpopt/operators/CPhysicalSort.h   |   0
 .../include/gpopt/operators/CPhysicalSplit.h  |   0
 .../include/gpopt/operators/CPhysicalSpool.h  |   0
 .../gpopt/operators/CPhysicalStreamAgg.h      |   0
 .../operators/CPhysicalStreamAggDeduplicate.h |   0
 .../include/gpopt/operators/CPhysicalTVF.h    |   0
 .../gpopt/operators/CPhysicalTableScan.h      |   0
 .../gpopt/operators/CPhysicalUnionAll.h       |   0
 .../operators/CPhysicalUnionAllFactory.h      |   0
 .../include/gpopt/operators/CPredicateUtils.h |   0
 .../include/gpopt/operators/CScalar.h         |   0
 .../include/gpopt/operators/CScalarAggFunc.h  |   0
 .../include/gpopt/operators/CScalarArray.h    |   0
 .../include/gpopt/operators/CScalarArrayCmp.h |   0
 .../gpopt/operators/CScalarArrayCoerceExpr.h  |   0
 .../include/gpopt/operators/CScalarArrayRef.h |   0
 .../operators/CScalarArrayRefIndexList.h      |   0
 .../gpopt/operators/CScalarAssertConstraint.h |   0
 .../operators/CScalarAssertConstraintList.h   |   0
 .../gpopt/operators/CScalarBitmapBoolOp.h     |   0
 .../gpopt/operators/CScalarBitmapIndexProbe.h |   0
 .../include/gpopt/operators/CScalarBoolOp.h   |   0
 .../gpopt/operators/CScalarBooleanTest.h      |   0
 .../include/gpopt/operators/CScalarCaseTest.h |   0
 .../include/gpopt/operators/CScalarCast.h     |   0
 .../include/gpopt/operators/CScalarCmp.h      |   0
 .../include/gpopt/operators/CScalarCoalesce.h |   0
 .../gpopt/operators/CScalarCoerceBase.h       |   0
 .../gpopt/operators/CScalarCoerceToDomain.h   |   0
 .../gpopt/operators/CScalarCoerceViaIO.h      |   0
 .../include/gpopt/operators/CScalarConst.h    |   0
 .../gpopt/operators/CScalarDMLAction.h        |   0
 .../gpopt/operators/CScalarFieldSelect.h      |   0
 .../include/gpopt/operators/CScalarFunc.h     |   0
 .../include/gpopt/operators/CScalarIdent.h    |   0
 .../include/gpopt/operators/CScalarIf.h       |   0
 .../gpopt/operators/CScalarIsDistinctFrom.h   |   0
 .../include/gpopt/operators/CScalarMinMax.h   |   0
 .../gpopt/operators/CScalarNAryJoinPredList.h |   0
 .../include/gpopt/operators/CScalarNullIf.h   |   0
 .../include/gpopt/operators/CScalarNullTest.h |   0
 .../include/gpopt/operators/CScalarOp.h       |   0
 .../include/gpopt/operators/CScalarParam.h    |   0
 .../gpopt/operators/CScalarProjectElement.h   |   0
 .../gpopt/operators/CScalarProjectList.h      |   0
 .../gpopt/operators/CScalarSortGroupClause.h  |   0
 .../include/gpopt/operators/CScalarSubquery.h |   0
 .../gpopt/operators/CScalarSubqueryAll.h      |   0
 .../gpopt/operators/CScalarSubqueryAny.h      |   0
 .../operators/CScalarSubqueryExistential.h    |   0
 .../gpopt/operators/CScalarSubqueryExists.h   |   0
 .../operators/CScalarSubqueryNotExists.h      |   0
 .../operators/CScalarSubqueryQuantified.h     |   0
 .../include/gpopt/operators/CScalarSwitch.h   |   0
 .../gpopt/operators/CScalarSwitchCase.h       |   0
 .../gpopt/operators/CScalarValuesList.h       |   0
 .../gpopt/operators/CScalarWindowFunc.h       |   0
 .../operators/CStrictHashedDistributions.h    |   0
 .../include/gpopt/optimizer/COptimizer.h      |   0
 .../gpopt/optimizer/COptimizerConfig.h        |   0
 .../libgpopt/include/gpopt/search/CBinding.h  |   0
 .../libgpopt/include/gpopt/search/CGroup.h    |   0
 .../include/gpopt/search/CGroupExpression.h   |   0
 .../include/gpopt/search/CGroupProxy.h        |   0
 .../libgpopt/include/gpopt/search/CJob.h      |   0
 .../include/gpopt/search/CJobFactory.h        |   0
 .../libgpopt/include/gpopt/search/CJobGroup.h |   0
 .../gpopt/search/CJobGroupExploration.h       |   0
 .../gpopt/search/CJobGroupExpression.h        |   0
 .../search/CJobGroupExpressionExploration.h   |   0
 .../CJobGroupExpressionImplementation.h       |   0
 .../search/CJobGroupExpressionOptimization.h  |   0
 .../gpopt/search/CJobGroupImplementation.h    |   0
 .../gpopt/search/CJobGroupOptimization.h      |   0
 .../libgpopt/include/gpopt/search/CJobQueue.h |   0
 .../include/gpopt/search/CJobStateMachine.h   |   0
 .../libgpopt/include/gpopt/search/CJobTest.h  |   0
 .../include/gpopt/search/CJobTransformation.h |   0
 .../libgpopt/include/gpopt/search/CMemo.h     |   0
 .../include/gpopt/search/CScheduler.h         |   0
 .../include/gpopt/search/CSchedulerContext.h  |   0
 .../include/gpopt/search/CSearchStage.h       |   0
 .../libgpopt/include/gpopt/search/CTreeMap.h  |   0
 .../gpopt/translate/CTranslatorDXLToExpr.h    |   0
 .../translate/CTranslatorDXLToExprUtils.h     |   0
 .../gpopt/translate/CTranslatorExprToDXL.h    |   0
 .../translate/CTranslatorExprToDXLUtils.h     |   0
 .../include/gpopt/xforms/CDecorrelator.h      |   0
 .../include/gpopt/xforms/CJoinOrder.h         |   0
 .../include/gpopt/xforms/CJoinOrderDP.h       |   0
 .../include/gpopt/xforms/CJoinOrderDPv2.h     |   0
 .../include/gpopt/xforms/CJoinOrderGreedy.h   |   0
 .../include/gpopt/xforms/CJoinOrderMinCard.h  |   0
 .../include/gpopt/xforms/CSubqueryHandler.h   |   0
 .../libgpopt/include/gpopt/xforms/CXform.h    |   0
 .../CXformAntiSemiJoinAntiSemiJoinNotInSwap.h |   0
 .../CXformAntiSemiJoinAntiSemiJoinSwap.h      |   0
 .../xforms/CXformAntiSemiJoinInnerJoinSwap.h  |   0
 ...rmAntiSemiJoinNotInAntiSemiJoinNotInSwap.h |   0
 .../CXformAntiSemiJoinNotInAntiSemiJoinSwap.h |   0
 .../CXformAntiSemiJoinNotInInnerJoinSwap.h    |   0
 .../CXformAntiSemiJoinNotInSemiJoinSwap.h     |   0
 .../xforms/CXformAntiSemiJoinSemiJoinSwap.h   |   0
 .../include/gpopt/xforms/CXformApply2Join.h   |   0
 .../gpopt/xforms/CXformCTEAnchor2Sequence.h   |   0
 .../xforms/CXformCTEAnchor2TrivialSelect.h    |   0
 .../gpopt/xforms/CXformCollapseGbAgg.h        |   0
 .../gpopt/xforms/CXformCollapseProject.h      |   0
 .../include/gpopt/xforms/CXformContext.h      |   0
 .../include/gpopt/xforms/CXformDelete2DML.h   |   0
 .../CXformDifference2LeftAntiSemiJoin.h       |   0
 .../CXformDifferenceAll2LeftAntiSemiJoin.h    |   0
 ...formDynamicForeignGet2DynamicForeignScan.h |   0
 .../CXformDynamicGet2DynamicTableScan.h       |   0
 .../CXformDynamicIndexGet2DynamicIndexScan.h  |   0
 ...DynamicIndexOnlyGet2DynamicIndexOnlyScan.h |   0
 .../include/gpopt/xforms/CXformEagerAgg.h     |   0
 ...ormExpandDynamicGetWithForeignPartitions.h |   0
 .../gpopt/xforms/CXformExpandFullOuterJoin.h  |   0
 .../gpopt/xforms/CXformExpandNAryJoin.h       |   0
 .../gpopt/xforms/CXformExpandNAryJoinDP.h     |   0
 .../gpopt/xforms/CXformExpandNAryJoinDPv2.h   |   0
 .../gpopt/xforms/CXformExpandNAryJoinGreedy.h |   0
 .../xforms/CXformExpandNAryJoinMinCard.h      |   0
 .../include/gpopt/xforms/CXformExploration.h  |   0
 .../include/gpopt/xforms/CXformFactory.h      |   0
 .../xforms/CXformForeignGet2ForeignScan.h     |   0
 .../xforms/CXformFullJoinCommutativity.h      |   0
 .../xforms/CXformFullOuterJoin2HashJoin.h     |   0
 .../include/gpopt/xforms/CXformGbAgg2Apply.h  |   0
 .../gpopt/xforms/CXformGbAgg2HashAgg.h        |   0
 .../gpopt/xforms/CXformGbAgg2ScalarAgg.h      |   0
 .../gpopt/xforms/CXformGbAgg2StreamAgg.h      |   0
 .../xforms/CXformGbAggDedup2HashAggDedup.h    |   0
 .../xforms/CXformGbAggDedup2StreamAggDedup.h  |   0
 .../gpopt/xforms/CXformGbAggWithMDQA2Join.h   |   0
 .../gpopt/xforms/CXformGet2TableScan.h        |   0
 .../gpopt/xforms/CXformImplementAssert.h      |   0
 .../xforms/CXformImplementBitmapTableGet.h    |   0
 .../gpopt/xforms/CXformImplementCTEConsumer.h |   0
 .../gpopt/xforms/CXformImplementCTEProducer.h |   0
 .../xforms/CXformImplementConstTableGet.h     |   0
 .../xforms/CXformImplementCorrelatedApply.h   |   0
 .../include/gpopt/xforms/CXformImplementDML.h |   0
 .../CXformImplementDynamicBitmapTableGet.h    |   0
 .../CXformImplementFullOuterMergeJoin.h       |   0
 .../gpopt/xforms/CXformImplementIndexApply.h  |   0
 .../CXformImplementInnerCorrelatedApply.h     |   0
 .../gpopt/xforms/CXformImplementInnerJoin.h   |   0
 ...formImplementLeftAntiSemiCorrelatedApply.h |   0
 ...mplementLeftAntiSemiCorrelatedApplyNotIn.h |   0
 .../CXformImplementLeftOuterCorrelatedApply.h |   0
 .../CXformImplementLeftSemiCorrelatedApply.h  |   0
 ...CXformImplementLeftSemiCorrelatedApplyIn.h |   0
 .../gpopt/xforms/CXformImplementLimit.h       |   0
 .../gpopt/xforms/CXformImplementSequence.h    |   0
 .../xforms/CXformImplementSequenceProject.h   |   0
 .../gpopt/xforms/CXformImplementSplit.h       |   0
 .../include/gpopt/xforms/CXformImplementTVF.h |   0
 .../gpopt/xforms/CXformImplementTVFNoArgs.h   |   0
 .../gpopt/xforms/CXformImplementUnionAll.h    |   0
 .../gpopt/xforms/CXformImplementation.h       |   0
 .../gpopt/xforms/CXformIndexGet2IndexScan.h   |   0
 .../xforms/CXformIndexOnlyGet2IndexOnlyScan.h |   0
 .../gpopt/xforms/CXformInlineCTEConsumer.h    |   0
 .../CXformInlineCTEConsumerUnderSelect.h      |   0
 .../gpopt/xforms/CXformInnerApply2InnerJoin.h |   0
 ...CXformInnerApply2InnerJoinNoCorrelations.h |   0
 .../CXformInnerApplyWithOuterKey2InnerJoin.h  |   0
 .../CXformInnerJoinAntiSemiJoinNotInSwap.h    |   0
 .../xforms/CXformInnerJoinAntiSemiJoinSwap.h  |   0
 .../xforms/CXformInnerJoinCommutativity.h     |   0
 .../xforms/CXformInnerJoinSemiJoinSwap.h      |   0
 .../include/gpopt/xforms/CXformInsert2DML.h   |   0
 .../gpopt/xforms/CXformIntersect2Join.h       |   0
 .../xforms/CXformIntersectAll2LeftSemiJoin.h  |   0
 .../xforms/CXformJoin2BitmapIndexGetApply.h   |   0
 .../gpopt/xforms/CXformJoin2IndexApply.h      |   0
 .../xforms/CXformJoin2IndexApplyGeneric.h     |   0
 .../gpopt/xforms/CXformJoin2IndexGetApply.h   |   0
 .../gpopt/xforms/CXformJoinAssociativity.h    |   0
 .../include/gpopt/xforms/CXformJoinSwap.h     |   0
 ...CXformLeftAntiSemiApply2LeftAntiSemiJoin.h |   0
 ...SemiApply2LeftAntiSemiJoinNoCorrelations.h |   0
 ...AntiSemiApplyNotIn2LeftAntiSemiJoinNotIn.h |   0
 ...otIn2LeftAntiSemiJoinNotInNoCorrelations.h |   0
 .../CXformLeftAntiSemiJoin2CrossProduct.h     |   0
 .../xforms/CXformLeftAntiSemiJoin2HashJoin.h  |   0
 .../xforms/CXformLeftAntiSemiJoin2NLJoin.h    |   0
 ...CXformLeftAntiSemiJoinNotIn2CrossProduct.h |   0
 ...XformLeftAntiSemiJoinNotIn2HashJoinNotIn.h |   0
 .../CXformLeftAntiSemiJoinNotIn2NLJoinNotIn.h |   0
 .../gpopt/xforms/CXformLeftJoin2RightJoin.h   |   0
 ...mLeftOuter2InnerUnionAllLeftAntiSemiJoin.h |   0
 .../CXformLeftOuterApply2LeftOuterJoin.h      |   0
 ...ftOuterApply2LeftOuterJoinNoCorrelations.h |   0
 .../xforms/CXformLeftOuterJoin2HashJoin.h     |   0
 .../gpopt/xforms/CXformLeftOuterJoin2NLJoin.h |   0
 .../xforms/CXformLeftSemiApply2LeftSemiJoin.h |   0
 ...LeftSemiApply2LeftSemiJoinNoCorrelations.h |   0
 .../CXformLeftSemiApplyIn2LeftSemiJoin.h      |   0
 ...ftSemiApplyIn2LeftSemiJoinNoCorrelations.h |   0
 ...ftSemiApplyInWithExternalCorrs2InnerJoin.h |   0
 ...LeftSemiApplyWithExternalCorrs2InnerJoin.h |   0
 .../xforms/CXformLeftSemiJoin2CrossProduct.h  |   0
 .../xforms/CXformLeftSemiJoin2HashJoin.h      |   0
 .../xforms/CXformLeftSemiJoin2InnerJoin.h     |   0
 .../CXformLeftSemiJoin2InnerJoinUnderGb.h     |   0
 .../gpopt/xforms/CXformLeftSemiJoin2NLJoin.h  |   0
 .../gpopt/xforms/CXformLimit2IndexGet.h       |   0
 .../gpopt/xforms/CXformLimit2IndexOnlyGet.h   |   0
 .../gpopt/xforms/CXformMaxOneRow2Assert.h     |   0
 .../gpopt/xforms/CXformMinMax2IndexGet.h      |   0
 .../gpopt/xforms/CXformMinMax2IndexOnlyGet.h  |   0
 .../gpopt/xforms/CXformProject2Apply.h        |   0
 .../xforms/CXformProject2ComputeScalar.h      |   0
 .../xforms/CXformPushDownLeftOuterJoin.h      |   0
 .../gpopt/xforms/CXformPushGbBelowJoin.h      |   0
 .../gpopt/xforms/CXformPushGbBelowSetOp.h     |   0
 .../gpopt/xforms/CXformPushGbBelowUnion.h     |   0
 .../gpopt/xforms/CXformPushGbBelowUnionAll.h  |   0
 .../gpopt/xforms/CXformPushGbDedupBelowJoin.h |   0
 .../xforms/CXformPushGbWithHavingBelowJoin.h  |   0
 .../xforms/CXformPushJoinBelowLeftUnionAll.h  |   0
 .../xforms/CXformPushJoinBelowRightUnionAll.h |   0
 .../xforms/CXformPushJoinBelowUnionAll.h      |   0
 .../gpopt/xforms/CXformRemoveSubqDistinct.h   |   0
 .../include/gpopt/xforms/CXformResult.h       |   0
 .../xforms/CXformRightOuterJoin2HashJoin.h    |   0
 .../include/gpopt/xforms/CXformSelect2Apply.h |   0
 .../gpopt/xforms/CXformSelect2BitmapBoolOp.h  |   0
 .../xforms/CXformSelect2DynamicBitmapBoolOp.h |   0
 .../xforms/CXformSelect2DynamicIndexGet.h     |   0
 .../xforms/CXformSelect2DynamicIndexOnlyGet.h |   0
 .../gpopt/xforms/CXformSelect2Filter.h        |   0
 .../gpopt/xforms/CXformSelect2IndexGet.h      |   0
 .../gpopt/xforms/CXformSelect2IndexOnlyGet.h  |   0
 .../CXformSemiJoinAntiSemiJoinNotInSwap.h     |   0
 .../xforms/CXformSemiJoinAntiSemiJoinSwap.h   |   0
 .../xforms/CXformSemiJoinInnerJoinSwap.h      |   0
 .../gpopt/xforms/CXformSemiJoinSemiJoinSwap.h |   0
 .../xforms/CXformSequenceProject2Apply.h      |   0
 .../gpopt/xforms/CXformSimplifyGbAgg.h        |   0
 .../xforms/CXformSimplifyLeftOuterJoin.h      |   0
 .../CXformSimplifyProjectWithSubquery.h       |   0
 .../xforms/CXformSimplifySelectWithSubquery.h |   0
 .../gpopt/xforms/CXformSimplifySubquery.h     |   0
 .../include/gpopt/xforms/CXformSplitDQA.h     |   0
 .../include/gpopt/xforms/CXformSplitGbAgg.h   |   0
 .../gpopt/xforms/CXformSplitGbAggDedup.h      |   0
 .../include/gpopt/xforms/CXformSplitLimit.h   |   0
 .../gpopt/xforms/CXformSubqJoin2Apply.h       |   0
 .../gpopt/xforms/CXformSubqNAryJoin2Apply.h   |   0
 .../gpopt/xforms/CXformSubqueryUnnest.h       |   0
 .../gpopt/xforms/CXformUnion2UnionAll.h       |   0
 .../include/gpopt/xforms/CXformUnnestTVF.h    |   0
 .../include/gpopt/xforms/CXformUpdate2DML.h   |   0
 .../include/gpopt/xforms/CXformUtils.h        |   0
 .../libgpopt/include/gpopt/xforms/xforms.h    |   0
 .../gporca/libgpopt/src/base/CAutoOptCtxt.cpp |   0
 .../gporca/libgpopt/src/base/CCTEInfo.cpp     |   0
 .../gporca/libgpopt/src/base/CCTEMap.cpp      |   0
 .../gporca/libgpopt/src/base/CCTEReq.cpp      |   0
 .../gporca/libgpopt/src/base/CCastUtils.cpp   |   0
 .../src/base/CColConstraintsArrayMapper.cpp   |   0
 .../src/base/CColConstraintsHashMapper.cpp    |   0
 .../gporca/libgpopt/src/base/CColRef.cpp      |   0
 .../libgpopt/src/base/CColRefComputed.cpp     |   0
 .../gporca/libgpopt/src/base/CColRefSet.cpp   |   0
 .../libgpopt/src/base/CColRefSetIter.cpp      |   0
 .../gporca/libgpopt/src/base/CColRefTable.cpp |   0
 .../libgpopt/src/base/CColumnFactory.cpp      |   0
 .../gporca/libgpopt/src/base/CConstraint.cpp  |   0
 .../src/base/CConstraintConjunction.cpp       |   0
 .../src/base/CConstraintDisjunction.cpp       |   0
 .../libgpopt/src/base/CConstraintInterval.cpp |   0
 .../libgpopt/src/base/CConstraintNegation.cpp |   0
 .../gporca/libgpopt/src/base/CCostContext.cpp |   0
 .../libgpopt/src/base/CDatumSortedSet.cpp     |   0
 .../libgpopt/src/base/CDefaultComparator.cpp  |   0
 .../src/base/CDistributionSpecHashed.cpp      |   0
 .../src/base/CDistributionSpecHashedNoOp.cpp  |   0
 .../base/CDistributionSpecNonSingleton.cpp    |   0
 .../src/base/CDistributionSpecRandom.cpp      |   0
 .../src/base/CDistributionSpecReplicated.cpp  |   0
 .../src/base/CDistributionSpecRouted.cpp      |   0
 .../src/base/CDistributionSpecSingleton.cpp   |   0
 .../base/CDistributionSpecStrictHashed.cpp    |   0
 .../base/CDistributionSpecStrictRandom.cpp    |   0
 .../base/CDistributionSpecStrictSingleton.cpp |   0
 .../src/base/CDistributionSpecUniversal.cpp   |   0
 .../gporca/libgpopt/src/base/CDrvdProp.cpp    |   0
 .../libgpopt/src/base/CDrvdPropCtxt.cpp       |   0
 .../libgpopt/src/base/CDrvdPropCtxtPlan.cpp   |   0
 .../libgpopt/src/base/CDrvdPropPlan.cpp       |   0
 .../libgpopt/src/base/CDrvdPropRelational.cpp |   0
 .../libgpopt/src/base/CDrvdPropScalar.cpp     |   0
 .../libgpopt/src/base/CEnfdDistribution.cpp   |   0
 .../gporca/libgpopt/src/base/CEnfdOrder.cpp   |   0
 .../src/base/CEnfdPartitionPropagation.cpp    |   0
 .../gporca/libgpopt/src/base/CEnfdProp.cpp    |   0
 .../libgpopt/src/base/CEnfdRewindability.cpp  |   0
 .../libgpopt/src/base/CFunctionProp.cpp       |   0
 .../src/base/CFunctionalDependency.cpp        |   0
 .../gporca/libgpopt/src/base/CIOUtils.cpp     |   0
 .../libgpopt/src/base/CKeyCollection.cpp      |   0
 .../gporca/libgpopt/src/base/COptCtxt.cpp     |   0
 .../src/base/COptimizationContext.cpp         |   0
 .../gporca/libgpopt/src/base/COrderSpec.cpp   |   0
 .../gporca/libgpopt/src/base/CPartInfo.cpp    |   0
 .../gporca/libgpopt/src/base/CPartKeys.cpp    |   0
 .../src/base/CPartitionPropagationSpec.cpp    |   0
 .../gporca/libgpopt/src/base/CPrintPrefix.cpp |   0
 .../libgpopt/src/base/CPropConstraint.cpp     |   0
 .../libgpopt/src/base/CQueryContext.cpp       |   0
 .../orca}/gporca/libgpopt/src/base/CRange.cpp |   0
 .../gporca/libgpopt/src/base/CReqdProp.cpp    |   0
 .../libgpopt/src/base/CReqdPropPlan.cpp       |   0
 .../libgpopt/src/base/CReqdPropRelational.cpp |   0
 .../libgpopt/src/base/CRewindabilitySpec.cpp  |   0
 .../orca}/gporca/libgpopt/src/base/CUtils.cpp |   0
 .../gporca/libgpopt/src/base/CWindowFrame.cpp |   0
 .../gporca/libgpopt/src/base/CWindowOids.cpp  |   0
 .../src/base/IColConstraintsMapper.cpp        |   0
 .../gporca/libgpopt/src/engine/CEngine.cpp    |   0
 .../libgpopt/src/engine/CEnumeratorConfig.cpp |   0
 .../libgpopt/src/engine/CPartialPlan.cpp      |   0
 .../libgpopt/src/engine/CStatisticsConfig.cpp |   0
 .../src/eval/CConstExprEvaluatorDXL.cpp       |   0
 .../src/eval/CConstExprEvaluatorDefault.cpp   |   0
 .../orca}/gporca/libgpopt/src/exception.cpp   |   0
 .../gporca/libgpopt/src/hints/CHintUtils.cpp  |   0
 .../gporca/libgpopt/src/hints/CJoinHint.cpp   |   0
 .../gporca/libgpopt/src/hints/CPlanHint.cpp   |   0
 .../gporca/libgpopt/src/hints/CRowHint.cpp    |   0
 .../gporca/libgpopt/src/hints/CScanHint.cpp   |   0
 .../orca}/gporca/libgpopt/src/hints/README    |   0
 .../orca}/gporca/libgpopt/src/init.cpp        |   0
 .../libgpopt/src/mdcache/CMDAccessor.cpp      |   0
 .../libgpopt/src/mdcache/CMDAccessorUtils.cpp |   0
 .../gporca/libgpopt/src/mdcache/CMDCache.cpp  |   0
 .../gporca/libgpopt/src/mdcache/CMDKey.cpp    |   0
 .../src/metadata/CColumnDescriptor.cpp        |   0
 .../src/metadata/CIndexDescriptor.cpp         |   0
 .../gporca/libgpopt/src/metadata/CName.cpp    |   0
 .../src/metadata/CTableDescriptor.cpp         |   0
 .../libgpopt/src/minidump/CDXLMinidump.cpp    |   0
 .../src/minidump/CMetadataAccessorFactory.cpp |   0
 .../libgpopt/src/minidump/CMiniDumperDXL.cpp  |   0
 .../src/minidump/CMinidumperUtils.cpp         |   0
 .../src/minidump/CSerializableMDAccessor.cpp  |   0
 .../minidump/CSerializableOptimizerConfig.cpp |   0
 .../src/minidump/CSerializablePlan.cpp        |   0
 .../src/minidump/CSerializableQuery.cpp       |   0
 .../src/minidump/CSerializableStackTrace.cpp  |   0
 .../libgpopt/src/operators/CExpression.cpp    |   0
 .../src/operators/CExpressionFactorizer.cpp   |   0
 .../src/operators/CExpressionHandle.cpp       |   0
 .../src/operators/CExpressionPreprocessor.cpp |   0
 .../src/operators/CExpressionUtils.cpp        |   0
 .../src/operators/CHashedDistributions.cpp    |   0
 .../operators/CJoinOrderHintsPreprocessor.cpp |   0
 .../CLeftJoinPruningPreprocessor.cpp          |   0
 .../libgpopt/src/operators/CLogical.cpp       |   0
 .../libgpopt/src/operators/CLogicalApply.cpp  |   0
 .../libgpopt/src/operators/CLogicalAssert.cpp |   0
 .../src/operators/CLogicalBitmapTableGet.cpp  |   0
 .../src/operators/CLogicalCTEAnchor.cpp       |   0
 .../src/operators/CLogicalCTEConsumer.cpp     |   0
 .../src/operators/CLogicalCTEProducer.cpp     |   0
 .../src/operators/CLogicalConstTableGet.cpp   |   0
 .../libgpopt/src/operators/CLogicalDML.cpp    |   0
 .../libgpopt/src/operators/CLogicalDelete.cpp |   0
 .../src/operators/CLogicalDifference.cpp      |   0
 .../src/operators/CLogicalDifferenceAll.cpp   |   0
 .../CLogicalDynamicBitmapTableGet.cpp         |   0
 .../operators/CLogicalDynamicForeignGet.cpp   |   0
 .../src/operators/CLogicalDynamicGet.cpp      |   0
 .../src/operators/CLogicalDynamicGetBase.cpp  |   0
 .../src/operators/CLogicalDynamicIndexGet.cpp |   0
 .../src/operators/CLogicalForeignGet.cpp      |   0
 .../src/operators/CLogicalFullOuterJoin.cpp   |   0
 .../libgpopt/src/operators/CLogicalGbAgg.cpp  |   0
 .../operators/CLogicalGbAggDeduplicate.cpp    |   0
 .../libgpopt/src/operators/CLogicalGet.cpp    |   0
 .../src/operators/CLogicalIndexApply.cpp      |   0
 .../src/operators/CLogicalIndexGet.cpp        |   0
 .../src/operators/CLogicalInnerApply.cpp      |   0
 .../CLogicalInnerCorrelatedApply.cpp          |   0
 .../src/operators/CLogicalInnerJoin.cpp       |   0
 .../libgpopt/src/operators/CLogicalInsert.cpp |   0
 .../src/operators/CLogicalIntersect.cpp       |   0
 .../src/operators/CLogicalIntersectAll.cpp    |   0
 .../libgpopt/src/operators/CLogicalJoin.cpp   |   0
 .../operators/CLogicalLeftAntiSemiApply.cpp   |   0
 .../CLogicalLeftAntiSemiApplyNotIn.cpp        |   0
 .../CLogicalLeftAntiSemiCorrelatedApply.cpp   |   0
 ...ogicalLeftAntiSemiCorrelatedApplyNotIn.cpp |   0
 .../operators/CLogicalLeftAntiSemiJoin.cpp    |   0
 .../CLogicalLeftAntiSemiJoinNotIn.cpp         |   0
 .../src/operators/CLogicalLeftOuterApply.cpp  |   0
 .../CLogicalLeftOuterCorrelatedApply.cpp      |   0
 .../src/operators/CLogicalLeftOuterJoin.cpp   |   0
 .../src/operators/CLogicalLeftSemiApply.cpp   |   0
 .../src/operators/CLogicalLeftSemiApplyIn.cpp |   0
 .../CLogicalLeftSemiCorrelatedApply.cpp       |   0
 .../CLogicalLeftSemiCorrelatedApplyIn.cpp     |   0
 .../src/operators/CLogicalLeftSemiJoin.cpp    |   0
 .../libgpopt/src/operators/CLogicalLimit.cpp  |   0
 .../src/operators/CLogicalMaxOneRow.cpp       |   0
 .../src/operators/CLogicalNAryJoin.cpp        |   0
 .../src/operators/CLogicalProject.cpp         |   0
 .../src/operators/CLogicalRightOuterJoin.cpp  |   0
 .../libgpopt/src/operators/CLogicalSelect.cpp |   0
 .../src/operators/CLogicalSequence.cpp        |   0
 .../src/operators/CLogicalSequenceProject.cpp |   0
 .../libgpopt/src/operators/CLogicalSetOp.cpp  |   0
 .../libgpopt/src/operators/CLogicalSplit.cpp  |   0
 .../libgpopt/src/operators/CLogicalTVF.cpp    |   0
 .../libgpopt/src/operators/CLogicalUnary.cpp  |   0
 .../libgpopt/src/operators/CLogicalUnion.cpp  |   0
 .../src/operators/CLogicalUnionAll.cpp        |   0
 .../libgpopt/src/operators/CLogicalUpdate.cpp |   0
 .../libgpopt/src/operators/CNormalizer.cpp    |   0
 .../libgpopt/src/operators/COperator.cpp      |   0
 .../src/operators/COrderedAggPreprocessor.cpp |   0
 .../libgpopt/src/operators/CPattern.cpp       |   0
 .../libgpopt/src/operators/CPhysical.cpp      |   0
 .../libgpopt/src/operators/CPhysicalAgg.cpp   |   0
 .../src/operators/CPhysicalAssert.cpp         |   0
 .../operators/CPhysicalBitmapTableScan.cpp    |   0
 .../src/operators/CPhysicalCTEConsumer.cpp    |   0
 .../src/operators/CPhysicalCTEProducer.cpp    |   0
 .../src/operators/CPhysicalComputeScalar.cpp  |   0
 .../src/operators/CPhysicalConstTableGet.cpp  |   0
 .../libgpopt/src/operators/CPhysicalDML.cpp   |   0
 .../CPhysicalDynamicBitmapTableScan.cpp       |   0
 .../operators/CPhysicalDynamicForeignScan.cpp |   0
 .../CPhysicalDynamicIndexOnlyScan.cpp         |   0
 .../operators/CPhysicalDynamicIndexScan.cpp   |   0
 .../src/operators/CPhysicalDynamicScan.cpp    |   0
 .../operators/CPhysicalDynamicTableScan.cpp   |   0
 .../src/operators/CPhysicalFilter.cpp         |   0
 .../src/operators/CPhysicalForeignScan.cpp    |   0
 .../src/operators/CPhysicalFullHashJoin.cpp   |   0
 .../src/operators/CPhysicalFullMergeJoin.cpp  |   0
 .../src/operators/CPhysicalHashAgg.cpp        |   0
 .../operators/CPhysicalHashAggDeduplicate.cpp |   0
 .../src/operators/CPhysicalHashJoin.cpp       |   0
 .../src/operators/CPhysicalIndexOnlyScan.cpp  |   0
 .../src/operators/CPhysicalIndexScan.cpp      |   0
 .../src/operators/CPhysicalInnerHashJoin.cpp  |   0
 .../operators/CPhysicalInnerIndexNLJoin.cpp   |   0
 .../src/operators/CPhysicalInnerNLJoin.cpp    |   0
 .../libgpopt/src/operators/CPhysicalJoin.cpp  |   0
 .../CPhysicalLeftAntiSemiHashJoin.cpp         |   0
 .../CPhysicalLeftAntiSemiHashJoinNotIn.cpp    |   0
 .../operators/CPhysicalLeftAntiSemiNLJoin.cpp |   0
 .../operators/CPhysicalLeftOuterHashJoin.cpp  |   0
 .../CPhysicalLeftOuterIndexNLJoin.cpp         |   0
 .../operators/CPhysicalLeftOuterNLJoin.cpp    |   0
 .../operators/CPhysicalLeftSemiHashJoin.cpp   |   0
 .../src/operators/CPhysicalLeftSemiNLJoin.cpp |   0
 .../libgpopt/src/operators/CPhysicalLimit.cpp |   0
 .../src/operators/CPhysicalMotion.cpp         |   0
 .../operators/CPhysicalMotionBroadcast.cpp    |   0
 .../src/operators/CPhysicalMotionGather.cpp   |   0
 .../CPhysicalMotionHashDistribute.cpp         |   0
 .../src/operators/CPhysicalMotionRandom.cpp   |   0
 .../CPhysicalMotionRoutedDistribute.cpp       |   0
 .../src/operators/CPhysicalNLJoin.cpp         |   0
 .../operators/CPhysicalParallelUnionAll.cpp   |   0
 .../operators/CPhysicalPartitionSelector.cpp  |   0
 .../operators/CPhysicalRightOuterHashJoin.cpp |   0
 .../src/operators/CPhysicalScalarAgg.cpp      |   0
 .../libgpopt/src/operators/CPhysicalScan.cpp  |   0
 .../src/operators/CPhysicalSequence.cpp       |   0
 .../operators/CPhysicalSequenceProject.cpp    |   0
 .../src/operators/CPhysicalSerialUnionAll.cpp |   0
 .../libgpopt/src/operators/CPhysicalSort.cpp  |   0
 .../libgpopt/src/operators/CPhysicalSplit.cpp |   0
 .../libgpopt/src/operators/CPhysicalSpool.cpp |   0
 .../src/operators/CPhysicalStreamAgg.cpp      |   0
 .../CPhysicalStreamAggDeduplicate.cpp         |   0
 .../libgpopt/src/operators/CPhysicalTVF.cpp   |   0
 .../src/operators/CPhysicalTableScan.cpp      |   0
 .../src/operators/CPhysicalUnionAll.cpp       |   0
 .../operators/CPhysicalUnionAllFactory.cpp    |   0
 .../src/operators/CPredicateUtils.cpp         |   0
 .../gporca/libgpopt/src/operators/CScalar.cpp |   0
 .../libgpopt/src/operators/CScalarAggFunc.cpp |   0
 .../libgpopt/src/operators/CScalarArray.cpp   |   0
 .../src/operators/CScalarArrayCmp.cpp         |   0
 .../src/operators/CScalarArrayCoerceExpr.cpp  |   0
 .../src/operators/CScalarArrayRef.cpp         |   0
 .../operators/CScalarArrayRefIndexList.cpp    |   0
 .../src/operators/CScalarAssertConstraint.cpp |   0
 .../operators/CScalarAssertConstraintList.cpp |   0
 .../src/operators/CScalarBitmapBoolOp.cpp     |   0
 .../src/operators/CScalarBitmapIndexProbe.cpp |   0
 .../libgpopt/src/operators/CScalarBoolOp.cpp  |   0
 .../src/operators/CScalarBooleanTest.cpp      |   0
 .../src/operators/CScalarCaseTest.cpp         |   0
 .../libgpopt/src/operators/CScalarCast.cpp    |   0
 .../libgpopt/src/operators/CScalarCmp.cpp     |   0
 .../src/operators/CScalarCoalesce.cpp         |   0
 .../src/operators/CScalarCoerceBase.cpp       |   0
 .../src/operators/CScalarCoerceToDomain.cpp   |   0
 .../src/operators/CScalarCoerceViaIO.cpp      |   0
 .../libgpopt/src/operators/CScalarConst.cpp   |   0
 .../src/operators/CScalarDMLAction.cpp        |   0
 .../src/operators/CScalarFieldSelect.cpp      |   0
 .../libgpopt/src/operators/CScalarFunc.cpp    |   0
 .../libgpopt/src/operators/CScalarIdent.cpp   |   0
 .../libgpopt/src/operators/CScalarIf.cpp      |   0
 .../src/operators/CScalarIsDistinctFrom.cpp   |   0
 .../libgpopt/src/operators/CScalarMinMax.cpp  |   0
 .../src/operators/CScalarNAryJoinPredList.cpp |   0
 .../libgpopt/src/operators/CScalarNullIf.cpp  |   0
 .../src/operators/CScalarNullTest.cpp         |   0
 .../libgpopt/src/operators/CScalarOp.cpp      |   0
 .../libgpopt/src/operators/CScalarParam.cpp   |   0
 .../src/operators/CScalarProjectElement.cpp   |   0
 .../src/operators/CScalarProjectList.cpp      |   0
 .../src/operators/CScalarSortGroupClause.cpp  |   0
 .../src/operators/CScalarSubquery.cpp         |   0
 .../src/operators/CScalarSubqueryAll.cpp      |   0
 .../src/operators/CScalarSubqueryAny.cpp      |   0
 .../operators/CScalarSubqueryExistential.cpp  |   0
 .../operators/CScalarSubqueryQuantified.cpp   |   0
 .../libgpopt/src/operators/CScalarSwitch.cpp  |   0
 .../src/operators/CScalarSwitchCase.cpp       |   0
 .../src/operators/CScalarValuesList.cpp       |   0
 .../src/operators/CScalarWindowFunc.cpp       |   0
 .../operators/CStrictHashedDistributions.cpp  |   0
 .../libgpopt/src/optimizer/COptimizer.cpp     |   0
 .../src/optimizer/COptimizerConfig.cpp        |   0
 .../gporca/libgpopt/src/search/CBinding.cpp   |   0
 .../gporca/libgpopt/src/search/CGroup.cpp     |   0
 .../libgpopt/src/search/CGroupExpression.cpp  |   0
 .../libgpopt/src/search/CGroupProxy.cpp       |   0
 .../orca}/gporca/libgpopt/src/search/CJob.cpp |   0
 .../libgpopt/src/search/CJobFactory.cpp       |   0
 .../gporca/libgpopt/src/search/CJobGroup.cpp  |   0
 .../src/search/CJobGroupExploration.cpp       |   0
 .../src/search/CJobGroupExpression.cpp        |   0
 .../search/CJobGroupExpressionExploration.cpp |   0
 .../CJobGroupExpressionImplementation.cpp     |   0
 .../CJobGroupExpressionOptimization.cpp       |   0
 .../src/search/CJobGroupImplementation.cpp    |   0
 .../src/search/CJobGroupOptimization.cpp      |   0
 .../gporca/libgpopt/src/search/CJobQueue.cpp  |   0
 .../gporca/libgpopt/src/search/CJobTest.cpp   |   0
 .../src/search/CJobTransformation.cpp         |   0
 .../gporca/libgpopt/src/search/CMemo.cpp      |   0
 .../gporca/libgpopt/src/search/CScheduler.cpp |   0
 .../libgpopt/src/search/CSchedulerContext.cpp |   0
 .../libgpopt/src/search/CSearchStage.cpp      |   0
 .../src/translate/CTranslatorDXLToExpr.cpp    |   0
 .../translate/CTranslatorDXLToExprUtils.cpp   |   0
 .../src/translate/CTranslatorExprToDXL.cpp    |   0
 .../translate/CTranslatorExprToDXLUtils.cpp   |   0
 .../libgpopt/src/xforms/CDecorrelator.cpp     |   0
 .../gporca/libgpopt/src/xforms/CJoinOrder.cpp |   0
 .../libgpopt/src/xforms/CJoinOrderDP.cpp      |   0
 .../libgpopt/src/xforms/CJoinOrderDPv2.cpp    |   0
 .../libgpopt/src/xforms/CJoinOrderGreedy.cpp  |   0
 .../libgpopt/src/xforms/CJoinOrderMinCard.cpp |   0
 .../libgpopt/src/xforms/CSubqueryHandler.cpp  |   0
 .../gporca/libgpopt/src/xforms/CXform.cpp     |   0
 .../src/xforms/CXformCTEAnchor2Sequence.cpp   |   0
 .../xforms/CXformCTEAnchor2TrivialSelect.cpp  |   0
 .../src/xforms/CXformCollapseGbAgg.cpp        |   0
 .../src/xforms/CXformCollapseProject.cpp      |   0
 .../libgpopt/src/xforms/CXformDelete2DML.cpp  |   0
 .../CXformDifference2LeftAntiSemiJoin.cpp     |   0
 .../CXformDifferenceAll2LeftAntiSemiJoin.cpp  |   0
 ...rmDynamicForeignGet2DynamicForeignScan.cpp |   0
 .../CXformDynamicGet2DynamicTableScan.cpp     |   0
 ...CXformDynamicIndexGet2DynamicIndexScan.cpp |   0
 ...namicIndexOnlyGet2DynamicIndexOnlyScan.cpp |   0
 .../libgpopt/src/xforms/CXformEagerAgg.cpp    |   0
 ...mExpandDynamicGetWithForeignPartitions.cpp |   0
 .../src/xforms/CXformExpandFullOuterJoin.cpp  |   0
 .../src/xforms/CXformExpandNAryJoin.cpp       |   0
 .../src/xforms/CXformExpandNAryJoinDP.cpp     |   0
 .../src/xforms/CXformExpandNAryJoinDPv2.cpp   |   0
 .../src/xforms/CXformExpandNAryJoinGreedy.cpp |   0
 .../xforms/CXformExpandNAryJoinMinCard.cpp    |   0
 .../libgpopt/src/xforms/CXformExploration.cpp |   0
 .../libgpopt/src/xforms/CXformFactory.cpp     |   0
 .../xforms/CXformForeignGet2ForeignScan.cpp   |   0
 .../xforms/CXformFullJoinCommutativity.cpp    |   0
 .../xforms/CXformFullOuterJoin2HashJoin.cpp   |   0
 .../libgpopt/src/xforms/CXformGbAgg2Apply.cpp |   0
 .../src/xforms/CXformGbAgg2HashAgg.cpp        |   0
 .../src/xforms/CXformGbAgg2ScalarAgg.cpp      |   0
 .../src/xforms/CXformGbAgg2StreamAgg.cpp      |   0
 .../xforms/CXformGbAggDedup2HashAggDedup.cpp  |   0
 .../CXformGbAggDedup2StreamAggDedup.cpp       |   0
 .../src/xforms/CXformGbAggWithMDQA2Join.cpp   |   0
 .../src/xforms/CXformGet2TableScan.cpp        |   0
 .../src/xforms/CXformImplementAssert.cpp      |   0
 .../xforms/CXformImplementBitmapTableGet.cpp  |   0
 .../src/xforms/CXformImplementCTEConsumer.cpp |   0
 .../src/xforms/CXformImplementCTEProducer.cpp |   0
 .../xforms/CXformImplementConstTableGet.cpp   |   0
 .../src/xforms/CXformImplementDML.cpp         |   0
 .../CXformImplementDynamicBitmapTableGet.cpp  |   0
 .../CXformImplementFullOuterMergeJoin.cpp     |   0
 .../src/xforms/CXformImplementInnerJoin.cpp   |   0
 .../src/xforms/CXformImplementLimit.cpp       |   0
 .../src/xforms/CXformImplementSequence.cpp    |   0
 .../xforms/CXformImplementSequenceProject.cpp |   0
 .../src/xforms/CXformImplementSplit.cpp       |   0
 .../src/xforms/CXformImplementTVF.cpp         |   0
 .../src/xforms/CXformImplementTVFNoArgs.cpp   |   0
 .../src/xforms/CXformImplementUnionAll.cpp    |   0
 .../src/xforms/CXformImplementation.cpp       |   0
 .../src/xforms/CXformIndexGet2IndexScan.cpp   |   0
 .../CXformIndexOnlyGet2IndexOnlyScan.cpp      |   0
 .../src/xforms/CXformInlineCTEConsumer.cpp    |   0
 .../CXformInlineCTEConsumerUnderSelect.cpp    |   0
 .../src/xforms/CXformInnerApply2InnerJoin.cpp |   0
 ...formInnerApply2InnerJoinNoCorrelations.cpp |   0
 ...CXformInnerApplyWithOuterKey2InnerJoin.cpp |   0
 .../xforms/CXformInnerJoinCommutativity.cpp   |   0
 .../libgpopt/src/xforms/CXformInsert2DML.cpp  |   0
 .../src/xforms/CXformIntersect2Join.cpp       |   0
 .../CXformIntersectAll2LeftSemiJoin.cpp       |   0
 .../src/xforms/CXformJoin2IndexApply.cpp      |   0
 .../xforms/CXformJoin2IndexApplyGeneric.cpp   |   0
 .../src/xforms/CXformJoinAssociativity.cpp    |   0
 ...formLeftAntiSemiApply2LeftAntiSemiJoin.cpp |   0
 ...miApply2LeftAntiSemiJoinNoCorrelations.cpp |   0
 ...tiSemiApplyNotIn2LeftAntiSemiJoinNotIn.cpp |   0
 ...In2LeftAntiSemiJoinNotInNoCorrelations.cpp |   0
 .../CXformLeftAntiSemiJoin2CrossProduct.cpp   |   0
 .../CXformLeftAntiSemiJoin2HashJoin.cpp       |   0
 .../xforms/CXformLeftAntiSemiJoin2NLJoin.cpp  |   0
 ...ormLeftAntiSemiJoinNotIn2HashJoinNotIn.cpp |   0
 ...XformLeftAntiSemiJoinNotIn2NLJoinNotIn.cpp |   0
 .../src/xforms/CXformLeftJoin2RightJoin.cpp   |   0
 ...eftOuter2InnerUnionAllLeftAntiSemiJoin.cpp |   0
 .../CXformLeftOuterApply2LeftOuterJoin.cpp    |   0
 ...OuterApply2LeftOuterJoinNoCorrelations.cpp |   0
 .../xforms/CXformLeftOuterJoin2HashJoin.cpp   |   0
 .../src/xforms/CXformLeftOuterJoin2NLJoin.cpp |   0
 .../CXformLeftSemiApply2LeftSemiJoin.cpp      |   0
 ...ftSemiApply2LeftSemiJoinNoCorrelations.cpp |   0
 ...ftSemiApplyWithExternalCorrs2InnerJoin.cpp |   0
 .../CXformLeftSemiJoin2CrossProduct.cpp       |   0
 .../xforms/CXformLeftSemiJoin2HashJoin.cpp    |   0
 .../xforms/CXformLeftSemiJoin2InnerJoin.cpp   |   0
 .../CXformLeftSemiJoin2InnerJoinUnderGb.cpp   |   0
 .../src/xforms/CXformLeftSemiJoin2NLJoin.cpp  |   0
 .../src/xforms/CXformLimit2IndexGet.cpp       |   0
 .../src/xforms/CXformMaxOneRow2Assert.cpp     |   0
 .../src/xforms/CXformMinMax2IndexGet.cpp      |   0
 .../src/xforms/CXformProject2Apply.cpp        |   0
 .../xforms/CXformProject2ComputeScalar.cpp    |   0
 .../xforms/CXformPushDownLeftOuterJoin.cpp    |   0
 .../src/xforms/CXformPushGbBelowJoin.cpp      |   0
 .../src/xforms/CXformPushGbDedupBelowJoin.cpp |   0
 .../CXformPushGbWithHavingBelowJoin.cpp       |   0
 .../xforms/CXformPushJoinBelowUnionAll.cpp    |   0
 .../src/xforms/CXformRemoveSubqDistinct.cpp   |   0
 .../libgpopt/src/xforms/CXformResult.cpp      |   0
 .../xforms/CXformRightOuterJoin2HashJoin.cpp  |   0
 .../src/xforms/CXformSelect2Apply.cpp         |   0
 .../src/xforms/CXformSelect2BitmapBoolOp.cpp  |   0
 .../xforms/CXformSelect2DynamicIndexGet.cpp   |   0
 .../CXformSelect2DynamicIndexOnlyGet.cpp      |   0
 .../src/xforms/CXformSelect2Filter.cpp        |   0
 .../src/xforms/CXformSelect2IndexGet.cpp      |   0
 .../src/xforms/CXformSelect2IndexOnlyGet.cpp  |   0
 .../xforms/CXformSequenceProject2Apply.cpp    |   0
 .../src/xforms/CXformSimplifyGbAgg.cpp        |   0
 .../xforms/CXformSimplifyLeftOuterJoin.cpp    |   0
 .../src/xforms/CXformSimplifySubquery.cpp     |   0
 .../libgpopt/src/xforms/CXformSplitDQA.cpp    |   0
 .../libgpopt/src/xforms/CXformSplitGbAgg.cpp  |   0
 .../src/xforms/CXformSplitGbAggDedup.cpp      |   0
 .../libgpopt/src/xforms/CXformSplitLimit.cpp  |   0
 .../src/xforms/CXformSubqJoin2Apply.cpp       |   0
 .../src/xforms/CXformSubqueryUnnest.cpp       |   0
 .../src/xforms/CXformUnion2UnionAll.cpp       |   0
 .../libgpopt/src/xforms/CXformUnnestTVF.cpp   |   0
 .../libgpopt/src/xforms/CXformUpdate2DML.cpp  |   0
 .../libgpopt/src/xforms/CXformUtils.cpp       |   0
 .../CxformSelect2DynamicBitmapBoolOp.cpp      |   0
 .../orca}/gporca/libgpos/CMakeLists.txt       |   0
 .../orca}/gporca/libgpos/include/gpos/_api.h  |   0
 .../gporca/libgpos/include/gpos/assert.h      |   0
 .../gporca/libgpos/include/gpos/attributes.h  |   0
 .../orca}/gporca/libgpos/include/gpos/base.h  |   0
 .../libgpos/include/gpos/common/CAutoP.h      |   0
 .../libgpos/include/gpos/common/CAutoRef.h    |   0
 .../libgpos/include/gpos/common/CAutoRg.h     |   0
 .../libgpos/include/gpos/common/CAutoTimer.h  |   0
 .../libgpos/include/gpos/common/CBitSet.h     |   0
 .../libgpos/include/gpos/common/CBitSetIter.h |   0
 .../libgpos/include/gpos/common/CBitVector.h  |   0
 .../include/gpos/common/CDebugCounter.h       |   0
 .../libgpos/include/gpos/common/CDouble.h     |   0
 .../include/gpos/common/CDynamicPtrArray.h    |   0
 .../libgpos/include/gpos/common/CEnumSet.h    |   0
 .../include/gpos/common/CEnumSetIter.h        |   0
 .../libgpos/include/gpos/common/CHashMap.h    |   0
 .../include/gpos/common/CHashMapIter.h        |   0
 .../libgpos/include/gpos/common/CHashSet.h    |   0
 .../include/gpos/common/CHashSetIter.h        |   0
 .../libgpos/include/gpos/common/CHeapObject.h |   0
 .../libgpos/include/gpos/common/CLink.h       |   0
 .../libgpos/include/gpos/common/CList.h       |   0
 .../libgpos/include/gpos/common/CMainArgs.h   |   0
 .../include/gpos/common/CPrintablePointer.h   |   0
 .../libgpos/include/gpos/common/CRandom.h     |   0
 .../libgpos/include/gpos/common/CRefCount.h   |   0
 .../libgpos/include/gpos/common/CStack.h      |   0
 .../include/gpos/common/CStackDescriptor.h    |   0
 .../include/gpos/common/CStackObject.h        |   0
 .../include/gpos/common/CSyncHashtable.h      |   0
 .../gpos/common/CSyncHashtableAccessByIter.h  |   0
 .../gpos/common/CSyncHashtableAccessByKey.h   |   0
 .../gpos/common/CSyncHashtableAccessorBase.h  |   0
 .../include/gpos/common/CSyncHashtableIter.h  |   0
 .../libgpos/include/gpos/common/CSyncList.h   |   0
 .../libgpos/include/gpos/common/CSyncPool.h   |   0
 .../libgpos/include/gpos/common/CTimerUser.h  |   0
 .../libgpos/include/gpos/common/CWallClock.h  |   0
 .../include/gpos/common/DbgPrintMixin.h       |   0
 .../libgpos/include/gpos/common/ITimer.h      |   0
 .../libgpos/include/gpos/common/clibtypes.h   |   0
 .../libgpos/include/gpos/common/clibwrapper.h |   0
 .../include/gpos/common/syslibwrapper.h       |   0
 .../include/gpos/error/CAutoExceptionStack.h  |   0
 .../libgpos/include/gpos/error/CAutoTrace.h   |   0
 .../include/gpos/error/CErrorContext.h        |   0
 .../include/gpos/error/CErrorHandler.h        |   0
 .../gpos/error/CErrorHandlerStandard.h        |   0
 .../libgpos/include/gpos/error/CException.h   |   0
 .../libgpos/include/gpos/error/CLogger.h      |   0
 .../include/gpos/error/CLoggerStream.h        |   0
 .../include/gpos/error/CLoggerSyslog.h        |   0
 .../libgpos/include/gpos/error/CMessage.h     |   0
 .../include/gpos/error/CMessageRepository.h   |   0
 .../include/gpos/error/CMessageTable.h        |   0
 .../libgpos/include/gpos/error/CMiniDumper.h  |   0
 .../include/gpos/error/CSerializable.h        |   0
 .../include/gpos/error/IErrorContext.h        |   0
 .../libgpos/include/gpos/error/ILogger.h      |   0
 .../libgpos/include/gpos/io/CFileDescriptor.h |   0
 .../libgpos/include/gpos/io/CFileReader.h     |   0
 .../libgpos/include/gpos/io/CFileWriter.h     |   0
 .../gporca/libgpos/include/gpos/io/COstream.h |   0
 .../libgpos/include/gpos/io/COstreamBasic.h   |   0
 .../include/gpos/io/COstreamStdString.h       |   0
 .../libgpos/include/gpos/io/COstreamString.h  |   0
 .../gporca/libgpos/include/gpos/io/IOstream.h |   0
 .../gporca/libgpos/include/gpos/io/iotypes.h  |   0
 .../gporca/libgpos/include/gpos/io/ioutils.h  |   0
 .../include/gpos/memory/CAutoMemoryPool.h     |   0
 .../libgpos/include/gpos/memory/CCache.h      |   0
 .../include/gpos/memory/CCacheAccessor.h      |   0
 .../libgpos/include/gpos/memory/CCacheEntry.h |   0
 .../include/gpos/memory/CCacheFactory.h       |   0
 .../libgpos/include/gpos/memory/CMemoryPool.h |   0
 .../include/gpos/memory/CMemoryPoolManager.h  |   0
 .../gpos/memory/CMemoryPoolStatistics.h       |   0
 .../include/gpos/memory/CMemoryPoolTracker.h  |   0
 .../include/gpos/memory/CMemoryVisitorPrint.h |   0
 .../include/gpos/memory/IMemoryVisitor.h      |   0
 .../include/gpos/memory/MemoryPoolAllocator.h |   0
 .../libgpos/include/gpos/memory/README.md     |   0
 .../libgpos/include/gpos/memory/deque.h       |   0
 .../libgpos/include/gpos/memory/queue.h       |   0
 .../libgpos/include/gpos/memory/stack.h       |   0
 .../include/gpos/string/CStringStatic.h       |   0
 .../libgpos/include/gpos/string/CWString.h    |   0
 .../include/gpos/string/CWStringBase.h        |   0
 .../include/gpos/string/CWStringConst.h       |   0
 .../include/gpos/string/CWStringDynamic.h     |   0
 .../include/gpos/string/CWStringStatic.h      |   0
 .../include/gpos/task/CAutoSuspendAbort.h     |   0
 .../include/gpos/task/CAutoTaskProxy.h        |   0
 .../include/gpos/task/CAutoTraceFlag.h        |   0
 .../gporca/libgpos/include/gpos/task/CTask.h  |   0
 .../libgpos/include/gpos/task/CTaskContext.h  |   0
 .../libgpos/include/gpos/task/CTaskId.h       |   0
 .../include/gpos/task/CTaskLocalStorage.h     |   0
 .../gpos/task/CTaskLocalStorageObject.h       |   0
 .../include/gpos/task/CTaskSchedulerFifo.h    |   0
 .../include/gpos/task/CTraceFlagIter.h        |   0
 .../libgpos/include/gpos/task/CWorker.h       |   0
 .../include/gpos/task/CWorkerPoolManager.h    |   0
 .../gporca/libgpos/include/gpos/task/ITask.h  |   0
 .../include/gpos/task/ITaskScheduler.h        |   0
 .../libgpos/include/gpos/task/IWorker.h       |   0
 .../libgpos/include/gpos/task/traceflags.h    |   0
 .../libgpos/include/gpos/test/CUnittest.h     |   0
 .../orca}/gporca/libgpos/include/gpos/types.h |   0
 .../orca}/gporca/libgpos/include/gpos/utils.h |   0
 .../gporca/libgpos/server/CMakeLists.txt      |   0
 .../include/unittest/gpos/common/CAutoPTest.h |   0
 .../unittest/gpos/common/CAutoRefTest.h       |   0
 .../unittest/gpos/common/CAutoRgTest.h        |   0
 .../unittest/gpos/common/CBitSetIterTest.h    |   0
 .../unittest/gpos/common/CBitSetTest.h        |   0
 .../unittest/gpos/common/CBitVectorTest.h     |   0
 .../unittest/gpos/common/CDoubleTest.h        |   0
 .../gpos/common/CDynamicPtrArrayTest.h        |   0
 .../unittest/gpos/common/CEnumSetTest.h       |   0
 .../unittest/gpos/common/CHashMapIterTest.h   |   0
 .../unittest/gpos/common/CHashMapTest.h       |   0
 .../unittest/gpos/common/CHashSetIterTest.h   |   0
 .../unittest/gpos/common/CHashSetTest.h       |   0
 .../include/unittest/gpos/common/CListTest.h  |   0
 .../unittest/gpos/common/CRefCountTest.h      |   0
 .../include/unittest/gpos/common/CStackTest.h |   0
 .../unittest/gpos/common/CSyncHashtableTest.h |   0
 .../unittest/gpos/common/CSyncListTest.h      |   0
 .../unittest/gpos/error/CErrorHandlerTest.h   |   0
 .../unittest/gpos/error/CExceptionTest.h      |   0
 .../include/unittest/gpos/error/CLoggerTest.h |   0
 .../gpos/error/CMessageRepositoryTest.h       |   0
 .../unittest/gpos/error/CMessageTableTest.h   |   0
 .../unittest/gpos/error/CMessageTest.h        |   0
 .../unittest/gpos/error/CMiniDumperTest.h     |   0
 .../include/unittest/gpos/io/CFileTest.h      |   0
 .../unittest/gpos/io/COstreamBasicTest.h      |   0
 .../unittest/gpos/io/COstreamStringTest.h     |   0
 .../include/unittest/gpos/memory/CCacheTest.h |   0
 .../gpos/memory/CMemoryPoolBasicTest.h        |   0
 .../unittest/gpos/string/CStringTest.h        |   0
 .../unittest/gpos/string/CWStringTest.h       |   0
 .../gpos/task/CTaskLocalStorageTest.h         |   0
 .../unittest/gpos/test/CUnittestTest.h        |   0
 .../libgpos/server/src/startup/main.cpp       |   0
 .../src/unittest/gpos/common/CAutoPTest.cpp   |   0
 .../src/unittest/gpos/common/CAutoRefTest.cpp |   0
 .../src/unittest/gpos/common/CAutoRgTest.cpp  |   0
 .../unittest/gpos/common/CBitSetIterTest.cpp  |   0
 .../src/unittest/gpos/common/CBitSetTest.cpp  |   0
 .../unittest/gpos/common/CBitVectorTest.cpp   |   0
 .../src/unittest/gpos/common/CDoubleTest.cpp  |   0
 .../gpos/common/CDynamicPtrArrayTest.cpp      |   0
 .../src/unittest/gpos/common/CEnumSetTest.cpp |   0
 .../unittest/gpos/common/CHashMapIterTest.cpp |   0
 .../src/unittest/gpos/common/CHashMapTest.cpp |   0
 .../unittest/gpos/common/CHashSetIterTest.cpp |   0
 .../src/unittest/gpos/common/CHashSetTest.cpp |   0
 .../src/unittest/gpos/common/CListTest.cpp    |   0
 .../unittest/gpos/common/CRefCountTest.cpp    |   0
 .../src/unittest/gpos/common/CStackTest.cpp   |   0
 .../gpos/common/CSyncHashtableTest.cpp        |   0
 .../unittest/gpos/common/CSyncListTest.cpp    |   0
 .../unittest/gpos/error/CErrorHandlerTest.cpp |   0
 .../unittest/gpos/error/CExceptionTest.cpp    |   0
 .../src/unittest/gpos/error/CLoggerTest.cpp   |   0
 .../gpos/error/CMessageRepositoryTest.cpp     |   0
 .../unittest/gpos/error/CMessageTableTest.cpp |   0
 .../src/unittest/gpos/error/CMessageTest.cpp  |   0
 .../unittest/gpos/error/CMiniDumperTest.cpp   |   0
 .../server/src/unittest/gpos/io/CFileTest.cpp |   0
 .../unittest/gpos/io/COstreamBasicTest.cpp    |   0
 .../unittest/gpos/io/COstreamStringTest.cpp   |   0
 .../src/unittest/gpos/memory/CCacheTest.cpp   |   0
 .../gpos/memory/CMemoryPoolBasicTest.cpp      |   0
 .../src/unittest/gpos/string/CStringTest.cpp  |   0
 .../src/unittest/gpos/string/CWStringTest.cpp |   0
 .../gpos/task/CTaskLocalStorageTest.cpp       |   0
 .../src/unittest/gpos/test/CUnittestTest.cpp  |   0
 .../orca}/gporca/libgpos/src/_api.cpp         |   0
 .../gporca/libgpos/src/common/CAutoTimer.cpp  |   0
 .../gporca/libgpos/src/common/CBitSet.cpp     |   0
 .../gporca/libgpos/src/common/CBitSetIter.cpp |   0
 .../gporca/libgpos/src/common/CBitVector.cpp  |   0
 .../libgpos/src/common/CDebugCounter.cpp      |   0
 .../gporca/libgpos/src/common/CHeapObject.cpp |   0
 .../gporca/libgpos/src/common/CMainArgs.cpp   |   0
 .../gporca/libgpos/src/common/CRandom.cpp     |   0
 .../gporca/libgpos/src/common/CRefCount.cpp   |   0
 .../libgpos/src/common/CStackDescriptor.cpp   |   0
 .../libgpos/src/common/CStackObject.cpp       |   0
 .../gporca/libgpos/src/common/CTimerUser.cpp  |   0
 .../gporca/libgpos/src/common/CWallClock.cpp  |   0
 .../gporca/libgpos/src/common/clibwrapper.cpp |   0
 .../libgpos/src/common/syslibwrapper.cpp      |   0
 .../libgpos/src/error/CAutoExceptionStack.cpp |   0
 .../gporca/libgpos/src/error/CAutoTrace.cpp   |   0
 .../libgpos/src/error/CErrorContext.cpp       |   0
 .../src/error/CErrorHandlerStandard.cpp       |   0
 .../gporca/libgpos/src/error/CException.cpp   |   0
 .../gporca/libgpos/src/error/CLogger.cpp      |   0
 .../libgpos/src/error/CLoggerStream.cpp       |   0
 .../libgpos/src/error/CLoggerSyslog.cpp       |   0
 .../gporca/libgpos/src/error/CMessage.cpp     |   0
 .../libgpos/src/error/CMessageRepository.cpp  |   0
 .../libgpos/src/error/CMessageTable.cpp       |   0
 .../gporca/libgpos/src/error/CMiniDumper.cpp  |   0
 .../libgpos/src/error/CSerializable.cpp       |   0
 .../gporca/libgpos/src/error/ILogger.cpp      |   0
 .../gporca/libgpos/src/io/CFileDescriptor.cpp |   0
 .../gporca/libgpos/src/io/CFileReader.cpp     |   0
 .../gporca/libgpos/src/io/CFileWriter.cpp     |   0
 .../orca}/gporca/libgpos/src/io/COstream.cpp  |   0
 .../gporca/libgpos/src/io/COstreamBasic.cpp   |   0
 .../libgpos/src/io/COstreamStdString.cpp      |   0
 .../gporca/libgpos/src/io/COstreamString.cpp  |   0
 .../orca}/gporca/libgpos/src/io/ioutils.cpp   |   0
 .../libgpos/src/memory/CAutoMemoryPool.cpp    |   0
 .../libgpos/src/memory/CCacheFactory.cpp      |   0
 .../gporca/libgpos/src/memory/CMemoryPool.cpp |   0
 .../libgpos/src/memory/CMemoryPoolManager.cpp |   0
 .../libgpos/src/memory/CMemoryPoolTracker.cpp |   0
 .../src/memory/CMemoryVisitorPrint.cpp        |   0
 .../libgpos/src/string/CStringStatic.cpp      |   0
 .../gporca/libgpos/src/string/CWString.cpp    |   0
 .../libgpos/src/string/CWStringBase.cpp       |   0
 .../libgpos/src/string/CWStringConst.cpp      |   0
 .../libgpos/src/string/CWStringDynamic.cpp    |   0
 .../libgpos/src/string/CWStringStatic.cpp     |   0
 .../libgpos/src/task/CAutoSuspendAbort.cpp    |   0
 .../libgpos/src/task/CAutoTaskProxy.cpp       |   0
 .../libgpos/src/task/CAutoTraceFlag.cpp       |   0
 .../orca}/gporca/libgpos/src/task/CTask.cpp   |   0
 .../gporca/libgpos/src/task/CTaskContext.cpp  |   0
 .../libgpos/src/task/CTaskLocalStorage.cpp    |   0
 .../libgpos/src/task/CTaskSchedulerFifo.cpp   |   0
 .../orca}/gporca/libgpos/src/task/CWorker.cpp |   0
 .../libgpos/src/task/CWorkerPoolManager.cpp   |   0
 .../orca}/gporca/libgpos/src/task/ITask.cpp   |   0
 .../orca}/gporca/libgpos/src/task/IWorker.cpp |   0
 .../gporca/libgpos/src/test/CUnittest.cpp     |   0
 .../orca}/gporca/libgpos/src/utils.cpp        |   0
 .../orca}/gporca/libnaucrates/CMakeLists.txt  |   0
 .../include/naucrates/base/CDatumBoolGPDB.h   |   0
 .../naucrates/base/CDatumGenericGPDB.h        |   0
 .../include/naucrates/base/CDatumInt2GPDB.h   |   0
 .../include/naucrates/base/CDatumInt4GPDB.h   |   0
 .../include/naucrates/base/CDatumInt8GPDB.h   |   0
 .../include/naucrates/base/CDatumOidGPDB.h    |   0
 .../naucrates/base/CQueryToDXLResult.h        |   0
 .../include/naucrates/base/IDatum.h           |   0
 .../include/naucrates/base/IDatumBool.h       |   0
 .../include/naucrates/base/IDatumGeneric.h    |   0
 .../include/naucrates/base/IDatumInt2.h       |   0
 .../include/naucrates/base/IDatumInt4.h       |   0
 .../include/naucrates/base/IDatumInt8.h       |   0
 .../include/naucrates/base/IDatumOid.h        |   0
 .../dxl/CCostModelConfigSerializer.h          |   0
 .../include/naucrates/dxl/CDXLUtils.h         |   0
 .../include/naucrates/dxl/CIdGenerator.h      |   0
 .../include/naucrates/dxl/errorcodes.h        |   0
 .../include/naucrates/dxl/gpdb_types.h        |   0
 .../naucrates/dxl/operators/CDXLColDescr.h    |   0
 .../naucrates/dxl/operators/CDXLColRef.h      |   0
 .../dxl/operators/CDXLCtasStorageOptions.h    |   0
 .../naucrates/dxl/operators/CDXLDatum.h       |   0
 .../naucrates/dxl/operators/CDXLDatumBool.h   |   0
 .../dxl/operators/CDXLDatumGeneric.h          |   0
 .../naucrates/dxl/operators/CDXLDatumInt2.h   |   0
 .../naucrates/dxl/operators/CDXLDatumInt4.h   |   0
 .../naucrates/dxl/operators/CDXLDatumInt8.h   |   0
 .../naucrates/dxl/operators/CDXLDatumOid.h    |   0
 .../operators/CDXLDatumStatsDoubleMappable.h  |   0
 .../operators/CDXLDatumStatsLintMappable.h    |   0
 .../dxl/operators/CDXLDirectDispatchInfo.h    |   0
 .../naucrates/dxl/operators/CDXLIndexDescr.h  |   0
 .../naucrates/dxl/operators/CDXLLogical.h     |   0
 .../naucrates/dxl/operators/CDXLLogicalCTAS.h |   0
 .../dxl/operators/CDXLLogicalCTEAnchor.h      |   0
 .../dxl/operators/CDXLLogicalCTEConsumer.h    |   0
 .../dxl/operators/CDXLLogicalCTEProducer.h    |   0
 .../dxl/operators/CDXLLogicalConstTable.h     |   0
 .../dxl/operators/CDXLLogicalDelete.h         |   0
 .../dxl/operators/CDXLLogicalForeignGet.h     |   0
 .../naucrates/dxl/operators/CDXLLogicalGet.h  |   0
 .../dxl/operators/CDXLLogicalGroupBy.h        |   0
 .../dxl/operators/CDXLLogicalInsert.h         |   0
 .../naucrates/dxl/operators/CDXLLogicalJoin.h |   0
 .../dxl/operators/CDXLLogicalLimit.h          |   0
 .../dxl/operators/CDXLLogicalProject.h        |   0
 .../dxl/operators/CDXLLogicalSelect.h         |   0
 .../dxl/operators/CDXLLogicalSetOp.h          |   0
 .../naucrates/dxl/operators/CDXLLogicalTVF.h  |   0
 .../dxl/operators/CDXLLogicalUpdate.h         |   0
 .../dxl/operators/CDXLLogicalWindow.h         |   0
 .../naucrates/dxl/operators/CDXLNode.h        |   0
 .../naucrates/dxl/operators/CDXLOperator.h    |   0
 .../dxl/operators/CDXLOperatorCost.h          |   0
 .../dxl/operators/CDXLOperatorFactory.h       |   0
 .../naucrates/dxl/operators/CDXLPhysical.h    |   0
 .../CDXLPhysicalAbstractBitmapScan.h          |   0
 .../naucrates/dxl/operators/CDXLPhysicalAgg.h |   0
 .../dxl/operators/CDXLPhysicalAppend.h        |   0
 .../dxl/operators/CDXLPhysicalAssert.h        |   0
 .../operators/CDXLPhysicalBitmapTableScan.h   |   0
 .../operators/CDXLPhysicalBroadcastMotion.h   |   0
 .../dxl/operators/CDXLPhysicalCTAS.h          |   0
 .../dxl/operators/CDXLPhysicalCTEConsumer.h   |   0
 .../dxl/operators/CDXLPhysicalCTEProducer.h   |   0
 .../naucrates/dxl/operators/CDXLPhysicalDML.h |   0
 .../CDXLPhysicalDynamicBitmapTableScan.h      |   0
 .../CDXLPhysicalDynamicForeignScan.h          |   0
 .../CDXLPhysicalDynamicIndexOnlyScan.h        |   0
 .../operators/CDXLPhysicalDynamicIndexScan.h  |   0
 .../operators/CDXLPhysicalDynamicTableScan.h  |   0
 .../dxl/operators/CDXLPhysicalForeignScan.h   |   0
 .../dxl/operators/CDXLPhysicalGatherMotion.h  |   0
 .../dxl/operators/CDXLPhysicalHashJoin.h      |   0
 .../dxl/operators/CDXLPhysicalIndexOnlyScan.h |   0
 .../dxl/operators/CDXLPhysicalIndexScan.h     |   0
 .../dxl/operators/CDXLPhysicalJoin.h          |   0
 .../dxl/operators/CDXLPhysicalLimit.h         |   0
 .../dxl/operators/CDXLPhysicalMaterialize.h   |   0
 .../dxl/operators/CDXLPhysicalMergeJoin.h     |   0
 .../dxl/operators/CDXLPhysicalMotion.h        |   0
 .../dxl/operators/CDXLPhysicalNLJoin.h        |   0
 .../operators/CDXLPhysicalPartitionSelector.h |   0
 .../dxl/operators/CDXLPhysicalProperties.h    |   0
 .../dxl/operators/CDXLPhysicalRandomMotion.h  |   0
 .../CDXLPhysicalRedistributeMotion.h          |   0
 .../dxl/operators/CDXLPhysicalResult.h        |   0
 .../CDXLPhysicalRoutedDistributeMotion.h      |   0
 .../dxl/operators/CDXLPhysicalSequence.h      |   0
 .../dxl/operators/CDXLPhysicalSort.h          |   0
 .../dxl/operators/CDXLPhysicalSplit.h         |   0
 .../naucrates/dxl/operators/CDXLPhysicalTVF.h |   0
 .../dxl/operators/CDXLPhysicalTableScan.h     |   0
 .../dxl/operators/CDXLPhysicalValuesScan.h    |   0
 .../dxl/operators/CDXLPhysicalWindow.h        |   0
 .../naucrates/dxl/operators/CDXLProperties.h  |   0
 .../naucrates/dxl/operators/CDXLScalar.h      |   0
 .../dxl/operators/CDXLScalarAggref.h          |   0
 .../naucrates/dxl/operators/CDXLScalarArray.h |   0
 .../dxl/operators/CDXLScalarArrayCoerceExpr.h |   0
 .../dxl/operators/CDXLScalarArrayComp.h       |   0
 .../dxl/operators/CDXLScalarArrayRef.h        |   0
 .../operators/CDXLScalarArrayRefIndexList.h   |   0
 .../operators/CDXLScalarAssertConstraint.h    |   0
 .../CDXLScalarAssertConstraintList.h          |   0
 .../dxl/operators/CDXLScalarBitmapBoolOp.h    |   0
 .../operators/CDXLScalarBitmapIndexProbe.h    |   0
 .../dxl/operators/CDXLScalarBoolExpr.h        |   0
 .../dxl/operators/CDXLScalarBooleanTest.h     |   0
 .../dxl/operators/CDXLScalarCaseTest.h        |   0
 .../naucrates/dxl/operators/CDXLScalarCast.h  |   0
 .../dxl/operators/CDXLScalarCoalesce.h        |   0
 .../dxl/operators/CDXLScalarCoerceBase.h      |   0
 .../dxl/operators/CDXLScalarCoerceToDomain.h  |   0
 .../dxl/operators/CDXLScalarCoerceViaIO.h     |   0
 .../naucrates/dxl/operators/CDXLScalarComp.h  |   0
 .../dxl/operators/CDXLScalarConstValue.h      |   0
 .../dxl/operators/CDXLScalarDMLAction.h       |   0
 .../dxl/operators/CDXLScalarDistinctComp.h    |   0
 .../dxl/operators/CDXLScalarFieldSelect.h     |   0
 .../dxl/operators/CDXLScalarFilter.h          |   0
 .../dxl/operators/CDXLScalarFuncExpr.h        |   0
 .../dxl/operators/CDXLScalarHashCondList.h    |   0
 .../dxl/operators/CDXLScalarHashExpr.h        |   0
 .../dxl/operators/CDXLScalarHashExprList.h    |   0
 .../naucrates/dxl/operators/CDXLScalarIdent.h |   0
 .../dxl/operators/CDXLScalarIfStmt.h          |   0
 .../dxl/operators/CDXLScalarIndexCondList.h   |   0
 .../dxl/operators/CDXLScalarJoinFilter.h      |   0
 .../dxl/operators/CDXLScalarLimitCount.h      |   0
 .../dxl/operators/CDXLScalarLimitOffset.h     |   0
 .../dxl/operators/CDXLScalarMergeCondList.h   |   0
 .../dxl/operators/CDXLScalarMinMax.h          |   0
 .../dxl/operators/CDXLScalarNullIf.h          |   0
 .../dxl/operators/CDXLScalarNullTest.h        |   0
 .../dxl/operators/CDXLScalarOneTimeFilter.h   |   0
 .../dxl/operators/CDXLScalarOpExpr.h          |   0
 .../dxl/operators/CDXLScalarOpList.h          |   0
 .../naucrates/dxl/operators/CDXLScalarParam.h |   0
 .../dxl/operators/CDXLScalarProjElem.h        |   0
 .../dxl/operators/CDXLScalarProjList.h        |   0
 .../operators/CDXLScalarRecheckCondFilter.h   |   0
 .../dxl/operators/CDXLScalarSortCol.h         |   0
 .../dxl/operators/CDXLScalarSortColList.h     |   0
 .../dxl/operators/CDXLScalarSortGroupClause.h |   0
 .../dxl/operators/CDXLScalarSubPlan.h         |   0
 .../dxl/operators/CDXLScalarSubquery.h        |   0
 .../dxl/operators/CDXLScalarSubqueryAll.h     |   0
 .../dxl/operators/CDXLScalarSubqueryAny.h     |   0
 .../dxl/operators/CDXLScalarSubqueryExists.h  |   0
 .../operators/CDXLScalarSubqueryNotExists.h   |   0
 .../operators/CDXLScalarSubqueryQuantified.h  |   0
 .../dxl/operators/CDXLScalarSwitch.h          |   0
 .../dxl/operators/CDXLScalarSwitchCase.h      |   0
 .../dxl/operators/CDXLScalarValuesList.h      |   0
 .../dxl/operators/CDXLScalarWindowFrameEdge.h |   0
 .../dxl/operators/CDXLScalarWindowRef.h       |   0
 .../naucrates/dxl/operators/CDXLSpoolInfo.h   |   0
 .../naucrates/dxl/operators/CDXLTableDescr.h  |   0
 .../naucrates/dxl/operators/CDXLWindowFrame.h |   0
 .../naucrates/dxl/operators/CDXLWindowKey.h   |   0
 .../naucrates/dxl/operators/CDXLWindowSpec.h  |   0
 .../naucrates/dxl/parser/CParseHandlerAgg.h   |   0
 .../dxl/parser/CParseHandlerAppend.h          |   0
 .../naucrates/dxl/parser/CParseHandlerArray.h |   0
 .../dxl/parser/CParseHandlerAssert.h          |   0
 .../naucrates/dxl/parser/CParseHandlerBase.h  |   0
 .../dxl/parser/CParseHandlerBroadcastMotion.h |   0
 .../dxl/parser/CParseHandlerCTEConfig.h       |   0
 .../dxl/parser/CParseHandlerCTEList.h         |   0
 .../dxl/parser/CParseHandlerColDescr.h        |   0
 .../dxl/parser/CParseHandlerColStats.h        |   0
 .../dxl/parser/CParseHandlerColStatsBucket.h  |   0
 .../dxl/parser/CParseHandlerCondList.h        |   0
 .../naucrates/dxl/parser/CParseHandlerCost.h  |   0
 .../dxl/parser/CParseHandlerCostModel.h       |   0
 .../dxl/parser/CParseHandlerCostParam.h       |   0
 .../dxl/parser/CParseHandlerCostParams.h      |   0
 .../parser/CParseHandlerCtasStorageOptions.h  |   0
 .../naucrates/dxl/parser/CParseHandlerDXL.h   |   0
 .../parser/CParseHandlerDirectDispatchInfo.h  |   0
 .../dxl/parser/CParseHandlerDistinctComp.h    |   0
 .../naucrates/dxl/parser/CParseHandlerDummy.h |   0
 .../parser/CParseHandlerDynamicForeignScan.h  |   0
 .../CParseHandlerDynamicIndexOnlyScan.h       |   0
 .../parser/CParseHandlerDynamicIndexScan.h    |   0
 .../parser/CParseHandlerDynamicTableScan.h    |   0
 .../parser/CParseHandlerEnumeratorConfig.h    |   0
 .../dxl/parser/CParseHandlerExtStats.h        |   0
 .../CParseHandlerExtStatsDependencies.h       |   0
 .../parser/CParseHandlerExtStatsDependency.h  |   0
 .../dxl/parser/CParseHandlerExtStatsInfo.h    |   0
 .../parser/CParseHandlerExtStatsNDistinct.h   |   0
 .../CParseHandlerExtStatsNDistinctList.h      |   0
 .../dxl/parser/CParseHandlerFactory.h         |   0
 .../dxl/parser/CParseHandlerFilter.h          |   0
 .../dxl/parser/CParseHandlerForeignScan.h     |   0
 .../dxl/parser/CParseHandlerGatherMotion.h    |   0
 .../dxl/parser/CParseHandlerGroupingColList.h |   0
 .../dxl/parser/CParseHandlerHashExpr.h        |   0
 .../dxl/parser/CParseHandlerHashExprList.h    |   0
 .../dxl/parser/CParseHandlerHashJoin.h        |   0
 .../naucrates/dxl/parser/CParseHandlerHint.h  |   0
 .../dxl/parser/CParseHandlerIndexCondList.h   |   0
 .../dxl/parser/CParseHandlerIndexDescr.h      |   0
 .../dxl/parser/CParseHandlerIndexOnlyScan.h   |   0
 .../dxl/parser/CParseHandlerIndexScan.h       |   0
 .../naucrates/dxl/parser/CParseHandlerLimit.h |   0
 .../dxl/parser/CParseHandlerLogicalCTAS.h     |   0
 .../parser/CParseHandlerLogicalCTEAnchor.h    |   0
 .../parser/CParseHandlerLogicalCTEConsumer.h  |   0
 .../parser/CParseHandlerLogicalCTEProducer.h  |   0
 .../parser/CParseHandlerLogicalConstTable.h   |   0
 .../dxl/parser/CParseHandlerLogicalDelete.h   |   0
 .../parser/CParseHandlerLogicalForeignGet.h   |   0
 .../dxl/parser/CParseHandlerLogicalGet.h      |   0
 .../dxl/parser/CParseHandlerLogicalGroupBy.h  |   0
 .../dxl/parser/CParseHandlerLogicalInsert.h   |   0
 .../dxl/parser/CParseHandlerLogicalJoin.h     |   0
 .../dxl/parser/CParseHandlerLogicalLimit.h    |   0
 .../dxl/parser/CParseHandlerLogicalOp.h       |   0
 .../dxl/parser/CParseHandlerLogicalProject.h  |   0
 .../dxl/parser/CParseHandlerLogicalSelect.h   |   0
 .../dxl/parser/CParseHandlerLogicalSetOp.h    |   0
 .../dxl/parser/CParseHandlerLogicalTVF.h      |   0
 .../dxl/parser/CParseHandlerLogicalUpdate.h   |   0
 .../dxl/parser/CParseHandlerLogicalWindow.h   |   0
 .../parser/CParseHandlerMDArrayCoerceCast.h   |   0
 .../dxl/parser/CParseHandlerMDCast.h          |   0
 .../dxl/parser/CParseHandlerMDGPDBAgg.h       |   0
 .../CParseHandlerMDGPDBCheckConstraint.h      |   0
 .../dxl/parser/CParseHandlerMDGPDBFunc.h      |   0
 .../dxl/parser/CParseHandlerMDGPDBScalarOp.h  |   0
 .../dxl/parser/CParseHandlerMDIndex.h         |   0
 .../dxl/parser/CParseHandlerMDIndexInfoList.h |   0
 .../dxl/parser/CParseHandlerMDRelation.h      |   0
 .../dxl/parser/CParseHandlerMDRelationCtas.h  |   0
 .../dxl/parser/CParseHandlerMDRequest.h       |   0
 .../dxl/parser/CParseHandlerMDScCmp.h         |   0
 .../dxl/parser/CParseHandlerMDType.h          |   0
 .../dxl/parser/CParseHandlerManager.h         |   0
 .../dxl/parser/CParseHandlerMaterialize.h     |   0
 .../dxl/parser/CParseHandlerMergeJoin.h       |   0
 .../dxl/parser/CParseHandlerMetadata.h        |   0
 .../dxl/parser/CParseHandlerMetadataColumn.h  |   0
 .../dxl/parser/CParseHandlerMetadataColumns.h |   0
 .../dxl/parser/CParseHandlerMetadataIdList.h  |   0
 .../dxl/parser/CParseHandlerMetadataObject.h  |   0
 .../dxl/parser/CParseHandlerNLJIndexParam.h   |   0
 .../parser/CParseHandlerNLJIndexParamList.h   |   0
 .../dxl/parser/CParseHandlerNLJoin.h          |   0
 .../naucrates/dxl/parser/CParseHandlerOp.h    |   0
 .../dxl/parser/CParseHandlerOptimizerConfig.h |   0
 .../parser/CParseHandlerPartitionSelector.h   |   0
 .../CParseHandlerPhysicalAbstractBitmapScan.h |   0
 .../CParseHandlerPhysicalBitmapTableScan.h    |   0
 .../dxl/parser/CParseHandlerPhysicalCTAS.h    |   0
 .../parser/CParseHandlerPhysicalCTEConsumer.h |   0
 .../parser/CParseHandlerPhysicalCTEProducer.h |   0
 .../dxl/parser/CParseHandlerPhysicalDML.h     |   0
 ...rseHandlerPhysicalDynamicBitmapTableScan.h |   0
 .../dxl/parser/CParseHandlerPhysicalOp.h      |   0
 .../dxl/parser/CParseHandlerPhysicalSplit.h   |   0
 .../dxl/parser/CParseHandlerPhysicalTVF.h     |   0
 .../dxl/parser/CParseHandlerPhysicalWindow.h  |   0
 .../naucrates/dxl/parser/CParseHandlerPlan.h  |   0
 .../dxl/parser/CParseHandlerPlanHint.h        |   0
 .../dxl/parser/CParseHandlerProjElem.h        |   0
 .../dxl/parser/CParseHandlerProjList.h        |   0
 .../dxl/parser/CParseHandlerProperties.h      |   0
 .../naucrates/dxl/parser/CParseHandlerQuery.h |   0
 .../dxl/parser/CParseHandlerQueryOutput.h     |   0
 .../dxl/parser/CParseHandlerRandomMotion.h    |   0
 .../parser/CParseHandlerRedistributeMotion.h  |   0
 .../dxl/parser/CParseHandlerRelStats.h        |   0
 .../CParseHandlerRelationExtendedStats.h      |   0
 .../dxl/parser/CParseHandlerResult.h          |   0
 .../dxl/parser/CParseHandlerRoutedMotion.h    |   0
 .../dxl/parser/CParseHandlerScalarAggref.h    |   0
 .../CParseHandlerScalarArrayCoerceExpr.h      |   0
 .../dxl/parser/CParseHandlerScalarArrayComp.h |   0
 .../dxl/parser/CParseHandlerScalarArrayRef.h  |   0
 .../CParseHandlerScalarArrayRefIndexList.h    |   0
 .../CParseHandlerScalarAssertConstraintList.h |   0
 .../parser/CParseHandlerScalarBitmapBoolOp.h  |   0
 .../CParseHandlerScalarBitmapIndexProbe.h     |   0
 .../dxl/parser/CParseHandlerScalarBoolExpr.h  |   0
 .../parser/CParseHandlerScalarBooleanTest.h   |   0
 .../dxl/parser/CParseHandlerScalarCaseTest.h  |   0
 .../dxl/parser/CParseHandlerScalarCast.h      |   0
 .../dxl/parser/CParseHandlerScalarCoalesce.h  |   0
 .../CParseHandlerScalarCoerceToDomain.h       |   0
 .../parser/CParseHandlerScalarCoerceViaIO.h   |   0
 .../dxl/parser/CParseHandlerScalarComp.h      |   0
 .../parser/CParseHandlerScalarConstValue.h    |   0
 .../dxl/parser/CParseHandlerScalarDMLAction.h |   0
 .../dxl/parser/CParseHandlerScalarExpr.h      |   0
 .../parser/CParseHandlerScalarFieldSelect.h   |   0
 .../dxl/parser/CParseHandlerScalarFuncExpr.h  |   0
 .../dxl/parser/CParseHandlerScalarIdent.h     |   0
 .../dxl/parser/CParseHandlerScalarIfStmt.h    |   0
 .../parser/CParseHandlerScalarLimitCount.h    |   0
 .../parser/CParseHandlerScalarLimitOffset.h   |   0
 .../dxl/parser/CParseHandlerScalarMinMax.h    |   0
 .../dxl/parser/CParseHandlerScalarNullIf.h    |   0
 .../dxl/parser/CParseHandlerScalarNullTest.h  |   0
 .../dxl/parser/CParseHandlerScalarOp.h        |   0
 .../dxl/parser/CParseHandlerScalarOpExpr.h    |   0
 .../dxl/parser/CParseHandlerScalarOpList.h    |   0
 .../dxl/parser/CParseHandlerScalarParam.h     |   0
 .../CParseHandlerScalarPartListNullTest.h     |   0
 .../CParseHandlerScalarPartListValues.h       |   0
 .../CParseHandlerScalarSortGroupClause.h      |   0
 .../dxl/parser/CParseHandlerScalarSubPlan.h   |   0
 .../parser/CParseHandlerScalarSubPlanParam.h  |   0
 .../CParseHandlerScalarSubPlanParamList.h     |   0
 .../CParseHandlerScalarSubPlanTestExpr.h      |   0
 .../dxl/parser/CParseHandlerScalarSubquery.h  |   0
 .../CParseHandlerScalarSubqueryExists.h       |   0
 .../CParseHandlerScalarSubqueryQuantified.h   |   0
 .../dxl/parser/CParseHandlerScalarSwitch.h    |   0
 .../parser/CParseHandlerScalarSwitchCase.h    |   0
 .../parser/CParseHandlerScalarValuesList.h    |   0
 .../CParseHandlerScalarWindowFrameEdge.h      |   0
 .../dxl/parser/CParseHandlerScalarWindowRef.h |   0
 .../dxl/parser/CParseHandlerSearchStage.h     |   0
 .../dxl/parser/CParseHandlerSearchStrategy.h  |   0
 .../dxl/parser/CParseHandlerSequence.h        |   0
 .../naucrates/dxl/parser/CParseHandlerSort.h  |   0
 .../dxl/parser/CParseHandlerSortCol.h         |   0
 .../dxl/parser/CParseHandlerSortColList.h     |   0
 .../dxl/parser/CParseHandlerStacktrace.h      |   0
 .../dxl/parser/CParseHandlerStatistics.h      |   0
 .../parser/CParseHandlerStatisticsConfig.h    |   0
 .../dxl/parser/CParseHandlerStatsBound.h      |   0
 .../parser/CParseHandlerStatsDerivedColumn.h  |   0
 .../CParseHandlerStatsDerivedRelation.h       |   0
 .../dxl/parser/CParseHandlerTableDescr.h      |   0
 .../dxl/parser/CParseHandlerTableScan.h       |   0
 .../dxl/parser/CParseHandlerTraceFlags.h      |   0
 .../naucrates/dxl/parser/CParseHandlerUtils.h |   0
 .../dxl/parser/CParseHandlerValuesScan.h      |   0
 .../dxl/parser/CParseHandlerWindowFrame.h     |   0
 .../dxl/parser/CParseHandlerWindowKey.h       |   0
 .../dxl/parser/CParseHandlerWindowKeyList.h   |   0
 .../dxl/parser/CParseHandlerWindowOids.h      |   0
 .../dxl/parser/CParseHandlerWindowSpec.h      |   0
 .../dxl/parser/CParseHandlerWindowSpecList.h  |   0
 .../naucrates/dxl/parser/CParseHandlerXform.h |   0
 .../naucrates/dxl/parser/parsehandlers.h      |   0
 .../naucrates/dxl/xml/CDXLMemoryManager.h     |   0
 .../include/naucrates/dxl/xml/CDXLSections.h  |   0
 .../naucrates/dxl/xml/CXMLSerializer.h        |   0
 .../include/naucrates/dxl/xml/dxltokens.h     |   0
 .../include/naucrates/exception.h             |   0
 .../libnaucrates/include/naucrates/init.h     |   0
 .../include/naucrates/md/CDXLBucket.h         |   0
 .../include/naucrates/md/CDXLColStats.h       |   0
 .../include/naucrates/md/CDXLExtStats.h       |   0
 .../include/naucrates/md/CDXLExtStatsInfo.h   |   0
 .../include/naucrates/md/CDXLRelStats.h       |   0
 .../naucrates/md/CDXLStatsDerivedColumn.h     |   0
 .../naucrates/md/CDXLStatsDerivedRelation.h   |   0
 .../include/naucrates/md/CGPDBTypeHelper.h    |   0
 .../include/naucrates/md/CMDAggregateGPDB.h   |   0
 .../naucrates/md/CMDArrayCoerceCastGPDB.h     |   0
 .../include/naucrates/md/CMDCastGPDB.h        |   0
 .../naucrates/md/CMDCheckConstraintGPDB.h     |   0
 .../include/naucrates/md/CMDColumn.h          |   0
 .../include/naucrates/md/CMDDependency.h      |   0
 .../include/naucrates/md/CMDExtStatsInfo.h    |   0
 .../include/naucrates/md/CMDFunctionGPDB.h    |   0
 .../include/naucrates/md/CMDIdCast.h          |   0
 .../include/naucrates/md/CMDIdColStats.h      |   0
 .../include/naucrates/md/CMDIdGPDB.h          |   0
 .../include/naucrates/md/CMDIdGPDBCtas.h      |   0
 .../include/naucrates/md/CMDIdRelStats.h      |   0
 .../include/naucrates/md/CMDIdScCmp.h         |   0
 .../include/naucrates/md/CMDIndexGPDB.h       |   0
 .../include/naucrates/md/CMDIndexInfo.h       |   0
 .../include/naucrates/md/CMDNDistinct.h       |   0
 .../include/naucrates/md/CMDName.h            |   0
 .../include/naucrates/md/CMDProviderGeneric.h |   0
 .../include/naucrates/md/CMDProviderMemory.h  |   0
 .../naucrates/md/CMDRelationCtasGPDB.h        |   0
 .../include/naucrates/md/CMDRelationGPDB.h    |   0
 .../include/naucrates/md/CMDRequest.h         |   0
 .../include/naucrates/md/CMDScCmpGPDB.h       |   0
 .../include/naucrates/md/CMDScalarOpGPDB.h    |   0
 .../include/naucrates/md/CMDTypeBoolGPDB.h    |   0
 .../include/naucrates/md/CMDTypeGenericGPDB.h |   0
 .../include/naucrates/md/CMDTypeInt2GPDB.h    |   0
 .../include/naucrates/md/CMDTypeInt4GPDB.h    |   0
 .../include/naucrates/md/CMDTypeInt8GPDB.h    |   0
 .../include/naucrates/md/CMDTypeOidGPDB.h     |   0
 .../include/naucrates/md/CSystemId.h          |   0
 .../include/naucrates/md/IMDAggregate.h       |   0
 .../include/naucrates/md/IMDCacheObject.h     |   0
 .../include/naucrates/md/IMDCast.h            |   0
 .../include/naucrates/md/IMDCheckConstraint.h |   0
 .../include/naucrates/md/IMDColStats.h        |   0
 .../include/naucrates/md/IMDColumn.h          |   0
 .../include/naucrates/md/IMDExtStats.h        |   0
 .../include/naucrates/md/IMDExtStatsInfo.h    |   0
 .../include/naucrates/md/IMDFunction.h        |   0
 .../libnaucrates/include/naucrates/md/IMDId.h |   0
 .../include/naucrates/md/IMDIndex.h           |   0
 .../include/naucrates/md/IMDInterface.h       |   0
 .../include/naucrates/md/IMDPartConstraint.h  |   0
 .../include/naucrates/md/IMDProvider.h        |   0
 .../include/naucrates/md/IMDRelStats.h        |   0
 .../include/naucrates/md/IMDRelation.h        |   0
 .../include/naucrates/md/IMDRelationCtas.h    |   0
 .../include/naucrates/md/IMDScCmp.h           |   0
 .../include/naucrates/md/IMDScalarOp.h        |   0
 .../include/naucrates/md/IMDType.h            |   0
 .../include/naucrates/md/IMDTypeBool.h        |   0
 .../include/naucrates/md/IMDTypeGeneric.h     |   0
 .../include/naucrates/md/IMDTypeInt2.h        |   0
 .../include/naucrates/md/IMDTypeInt4.h        |   0
 .../include/naucrates/md/IMDTypeInt8.h        |   0
 .../include/naucrates/md/IMDTypeOid.h         |   0
 .../include/naucrates/statistics/CBucket.h    |   0
 .../statistics/CExtendedStatsProcessor.h      |   0
 .../statistics/CFilterStatsProcessor.h        |   0
 .../statistics/CGroupByStatsProcessor.h       |   0
 .../include/naucrates/statistics/CHistogram.h |   0
 .../statistics/CInnerJoinStatsProcessor.h     |   0
 .../statistics/CJoinStatsProcessor.h          |   0
 .../CLeftAntiSemiJoinStatsProcessor.h         |   0
 .../statistics/CLeftOuterJoinStatsProcessor.h |   0
 .../statistics/CLeftSemiJoinStatsProcessor.h  |   0
 .../statistics/CLimitStatsProcessor.h         |   0
 .../include/naucrates/statistics/CPoint.h     |   0
 .../statistics/CProjectStatsProcessor.h       |   0
 .../naucrates/statistics/CScaleFactorUtils.h  |   0
 .../naucrates/statistics/CStatistics.h        |   0
 .../naucrates/statistics/CStatisticsUtils.h   |   0
 .../include/naucrates/statistics/CStatsPred.h |   0
 .../naucrates/statistics/CStatsPredArrayCmp.h |   0
 .../naucrates/statistics/CStatsPredConj.h     |   0
 .../naucrates/statistics/CStatsPredDisj.h     |   0
 .../naucrates/statistics/CStatsPredJoin.h     |   0
 .../naucrates/statistics/CStatsPredLike.h     |   0
 .../naucrates/statistics/CStatsPredPoint.h    |   0
 .../statistics/CStatsPredUnsupported.h        |   0
 .../naucrates/statistics/CStatsPredUtils.h    |   0
 .../statistics/CUnionAllStatsProcessor.h      |   0
 .../naucrates/statistics/CUpperBoundNDVs.h    |   0
 .../include/naucrates/statistics/IBucket.h    |   0
 .../naucrates/statistics/IStatistics.h        |   0
 .../include/naucrates/traceflags/traceflags.h |   0
 .../src/CCostModelConfigSerializer.cpp        |   0
 .../gporca/libnaucrates/src/CDXLUtils.cpp     |   0
 .../gporca/libnaucrates/src/CIdGenerator.cpp  |   0
 .../libnaucrates/src/base/CDatumBoolGPDB.cpp  |   0
 .../src/base/CDatumGenericGPDB.cpp            |   0
 .../libnaucrates/src/base/CDatumInt2GPDB.cpp  |   0
 .../libnaucrates/src/base/CDatumInt4GPDB.cpp  |   0
 .../libnaucrates/src/base/CDatumInt8GPDB.cpp  |   0
 .../libnaucrates/src/base/CDatumOidGPDB.cpp   |   0
 .../src/base/CQueryToDXLResult.cpp            |   0
 .../gporca/libnaucrates/src/base/IDatum.cpp   |   0
 .../gporca/libnaucrates/src/exception.cpp     |   0
 .../orca}/gporca/libnaucrates/src/init.cpp    |   0
 .../gporca/libnaucrates/src/md/CDXLBucket.cpp |   0
 .../libnaucrates/src/md/CDXLColStats.cpp      |   0
 .../libnaucrates/src/md/CDXLExtStats.cpp      |   0
 .../libnaucrates/src/md/CDXLExtStatsInfo.cpp  |   0
 .../libnaucrates/src/md/CDXLRelStats.cpp      |   0
 .../src/md/CDXLStatsDerivedColumn.cpp         |   0
 .../src/md/CDXLStatsDerivedRelation.cpp       |   0
 .../libnaucrates/src/md/CMDAggregateGPDB.cpp  |   0
 .../src/md/CMDArrayCoerceCastGPDB.cpp         |   0
 .../libnaucrates/src/md/CMDCastGPDB.cpp       |   0
 .../src/md/CMDCheckConstraintGPDB.cpp         |   0
 .../gporca/libnaucrates/src/md/CMDColumn.cpp  |   0
 .../libnaucrates/src/md/CMDExtStatsInfo.cpp   |   0
 .../libnaucrates/src/md/CMDFunctionGPDB.cpp   |   0
 .../gporca/libnaucrates/src/md/CMDIdCast.cpp  |   0
 .../libnaucrates/src/md/CMDIdColStats.cpp     |   0
 .../gporca/libnaucrates/src/md/CMDIdGPDB.cpp  |   0
 .../libnaucrates/src/md/CMDIdGPDBCtas.cpp     |   0
 .../libnaucrates/src/md/CMDIdRelStats.cpp     |   0
 .../gporca/libnaucrates/src/md/CMDIdScCmp.cpp |   0
 .../libnaucrates/src/md/CMDIndexGPDB.cpp      |   0
 .../libnaucrates/src/md/CMDIndexInfo.cpp      |   0
 .../gporca/libnaucrates/src/md/CMDName.cpp    |   0
 .../src/md/CMDProviderGeneric.cpp             |   0
 .../libnaucrates/src/md/CMDProviderMemory.cpp |   0
 .../src/md/CMDRelationCtasGPDB.cpp            |   0
 .../libnaucrates/src/md/CMDRelationGPDB.cpp   |   0
 .../gporca/libnaucrates/src/md/CMDRequest.cpp |   0
 .../libnaucrates/src/md/CMDScCmpGPDB.cpp      |   0
 .../libnaucrates/src/md/CMDScalarOpGPDB.cpp   |   0
 .../libnaucrates/src/md/CMDTypeBoolGPDB.cpp   |   0
 .../src/md/CMDTypeGenericGPDB.cpp             |   0
 .../libnaucrates/src/md/CMDTypeInt2GPDB.cpp   |   0
 .../libnaucrates/src/md/CMDTypeInt4GPDB.cpp   |   0
 .../libnaucrates/src/md/CMDTypeInt8GPDB.cpp   |   0
 .../libnaucrates/src/md/CMDTypeOidGPDB.cpp    |   0
 .../gporca/libnaucrates/src/md/CSystemId.cpp  |   0
 .../libnaucrates/src/md/IMDCacheObject.cpp    |   0
 .../gporca/libnaucrates/src/md/IMDIndex.cpp   |   0
 .../libnaucrates/src/md/IMDProvider.cpp       |   0
 .../libnaucrates/src/md/IMDRelation.cpp       |   0
 .../gporca/libnaucrates/src/md/IMDType.cpp    |   0
 .../src/operators/CDXLColDescr.cpp            |   0
 .../libnaucrates/src/operators/CDXLColRef.cpp |   0
 .../src/operators/CDXLCtasStorageOptions.cpp  |   0
 .../libnaucrates/src/operators/CDXLDatum.cpp  |   0
 .../src/operators/CDXLDatumBool.cpp           |   0
 .../src/operators/CDXLDatumGeneric.cpp        |   0
 .../src/operators/CDXLDatumInt2.cpp           |   0
 .../src/operators/CDXLDatumInt4.cpp           |   0
 .../src/operators/CDXLDatumInt8.cpp           |   0
 .../src/operators/CDXLDatumOid.cpp            |   0
 .../CDXLDatumStatsDoubleMappable.cpp          |   0
 .../operators/CDXLDatumStatsLintMappable.cpp  |   0
 .../src/operators/CDXLDirectDispatchInfo.cpp  |   0
 .../src/operators/CDXLIndexDescr.cpp          |   0
 .../src/operators/CDXLLogical.cpp             |   0
 .../src/operators/CDXLLogicalCTAS.cpp         |   0
 .../src/operators/CDXLLogicalCTEAnchor.cpp    |   0
 .../src/operators/CDXLLogicalCTEConsumer.cpp  |   0
 .../src/operators/CDXLLogicalCTEProducer.cpp  |   0
 .../src/operators/CDXLLogicalConstTable.cpp   |   0
 .../src/operators/CDXLLogicalDelete.cpp       |   0
 .../src/operators/CDXLLogicalForeignGet.cpp   |   0
 .../src/operators/CDXLLogicalGet.cpp          |   0
 .../src/operators/CDXLLogicalGroupBy.cpp      |   0
 .../src/operators/CDXLLogicalInsert.cpp       |   0
 .../src/operators/CDXLLogicalJoin.cpp         |   0
 .../src/operators/CDXLLogicalLimit.cpp        |   0
 .../src/operators/CDXLLogicalProject.cpp      |   0
 .../src/operators/CDXLLogicalSelect.cpp       |   0
 .../src/operators/CDXLLogicalSetOp.cpp        |   0
 .../src/operators/CDXLLogicalTVF.cpp          |   0
 .../src/operators/CDXLLogicalUpdate.cpp       |   0
 .../src/operators/CDXLLogicalWindow.cpp       |   0
 .../libnaucrates/src/operators/CDXLNode.cpp   |   0
 .../src/operators/CDXLOperator.cpp            |   0
 .../src/operators/CDXLOperatorCost.cpp        |   0
 .../src/operators/CDXLOperatorFactory.cpp     |   0
 .../src/operators/CDXLPhysical.cpp            |   0
 .../CDXLPhysicalAbstractBitmapScan.cpp        |   0
 .../src/operators/CDXLPhysicalAgg.cpp         |   0
 .../src/operators/CDXLPhysicalAppend.cpp      |   0
 .../src/operators/CDXLPhysicalAssert.cpp      |   0
 .../operators/CDXLPhysicalBitmapTableScan.cpp |   0
 .../operators/CDXLPhysicalBroadcastMotion.cpp |   0
 .../src/operators/CDXLPhysicalCTAS.cpp        |   0
 .../src/operators/CDXLPhysicalCTEConsumer.cpp |   0
 .../src/operators/CDXLPhysicalCTEProducer.cpp |   0
 .../src/operators/CDXLPhysicalDML.cpp         |   0
 .../CDXLPhysicalDynamicBitmapTableScan.cpp    |   0
 .../CDXLPhysicalDynamicForeignScan.cpp        |   0
 .../CDXLPhysicalDynamicIndexOnlyScan.cpp      |   0
 .../CDXLPhysicalDynamicIndexScan.cpp          |   0
 .../CDXLPhysicalDynamicTableScan.cpp          |   0
 .../src/operators/CDXLPhysicalForeignScan.cpp |   0
 .../operators/CDXLPhysicalGatherMotion.cpp    |   0
 .../src/operators/CDXLPhysicalHashJoin.cpp    |   0
 .../operators/CDXLPhysicalIndexOnlyScan.cpp   |   0
 .../src/operators/CDXLPhysicalIndexScan.cpp   |   0
 .../src/operators/CDXLPhysicalJoin.cpp        |   0
 .../src/operators/CDXLPhysicalLimit.cpp       |   0
 .../src/operators/CDXLPhysicalMaterialize.cpp |   0
 .../src/operators/CDXLPhysicalMergeJoin.cpp   |   0
 .../src/operators/CDXLPhysicalMotion.cpp      |   0
 .../src/operators/CDXLPhysicalNLJoin.cpp      |   0
 .../CDXLPhysicalPartitionSelector.cpp         |   0
 .../src/operators/CDXLPhysicalProperties.cpp  |   0
 .../operators/CDXLPhysicalRandomMotion.cpp    |   0
 .../CDXLPhysicalRedistributeMotion.cpp        |   0
 .../src/operators/CDXLPhysicalResult.cpp      |   0
 .../CDXLPhysicalRoutedDistributeMotion.cpp    |   0
 .../src/operators/CDXLPhysicalSequence.cpp    |   0
 .../src/operators/CDXLPhysicalSort.cpp        |   0
 .../src/operators/CDXLPhysicalSplit.cpp       |   0
 .../src/operators/CDXLPhysicalTVF.cpp         |   0
 .../src/operators/CDXLPhysicalTableScan.cpp   |   0
 .../src/operators/CDXLPhysicalValuesScan.cpp  |   0
 .../src/operators/CDXLPhysicalWindow.cpp      |   0
 .../src/operators/CDXLProperties.cpp          |   0
 .../libnaucrates/src/operators/CDXLScalar.cpp |   0
 .../src/operators/CDXLScalarAggref.cpp        |   0
 .../src/operators/CDXLScalarArray.cpp         |   0
 .../operators/CDXLScalarArrayCoerceExpr.cpp   |   0
 .../src/operators/CDXLScalarArrayComp.cpp     |   0
 .../src/operators/CDXLScalarArrayRef.cpp      |   0
 .../operators/CDXLScalarArrayRefIndexList.cpp |   0
 .../operators/CDXLScalarAssertConstraint.cpp  |   0
 .../CDXLScalarAssertConstraintList.cpp        |   0
 .../src/operators/CDXLScalarBitmapBoolOp.cpp  |   0
 .../operators/CDXLScalarBitmapIndexProbe.cpp  |   0
 .../src/operators/CDXLScalarBoolExpr.cpp      |   0
 .../src/operators/CDXLScalarBooleanTest.cpp   |   0
 .../src/operators/CDXLScalarCaseTest.cpp      |   0
 .../src/operators/CDXLScalarCast.cpp          |   0
 .../src/operators/CDXLScalarCoalesce.cpp      |   0
 .../src/operators/CDXLScalarCoerceBase.cpp    |   0
 .../operators/CDXLScalarCoerceToDomain.cpp    |   0
 .../src/operators/CDXLScalarCoerceViaIO.cpp   |   0
 .../src/operators/CDXLScalarComp.cpp          |   0
 .../src/operators/CDXLScalarConstValue.cpp    |   0
 .../src/operators/CDXLScalarDMLAction.cpp     |   0
 .../src/operators/CDXLScalarDistinctComp.cpp  |   0
 .../src/operators/CDXLScalarFieldSelect.cpp   |   0
 .../src/operators/CDXLScalarFilter.cpp        |   0
 .../src/operators/CDXLScalarFuncExpr.cpp      |   0
 .../src/operators/CDXLScalarHashCondList.cpp  |   0
 .../src/operators/CDXLScalarHashExpr.cpp      |   0
 .../src/operators/CDXLScalarHashExprList.cpp  |   0
 .../src/operators/CDXLScalarIdent.cpp         |   0
 .../src/operators/CDXLScalarIfStmt.cpp        |   0
 .../src/operators/CDXLScalarIndexCondList.cpp |   0
 .../src/operators/CDXLScalarJoinFilter.cpp    |   0
 .../src/operators/CDXLScalarLimitCount.cpp    |   0
 .../src/operators/CDXLScalarLimitOffset.cpp   |   0
 .../src/operators/CDXLScalarMergeCondList.cpp |   0
 .../src/operators/CDXLScalarMinMax.cpp        |   0
 .../src/operators/CDXLScalarNullIf.cpp        |   0
 .../src/operators/CDXLScalarNullTest.cpp      |   0
 .../src/operators/CDXLScalarOneTimeFilter.cpp |   0
 .../src/operators/CDXLScalarOpExpr.cpp        |   0
 .../src/operators/CDXLScalarOpList.cpp        |   0
 .../src/operators/CDXLScalarParam.cpp         |   0
 .../src/operators/CDXLScalarProjElem.cpp      |   0
 .../src/operators/CDXLScalarProjList.cpp      |   0
 .../operators/CDXLScalarRecheckCondFilter.cpp |   0
 .../src/operators/CDXLScalarSortCol.cpp       |   0
 .../src/operators/CDXLScalarSortColList.cpp   |   0
 .../src/operators/CDXLScalarSubPlan.cpp       |   0
 .../src/operators/CDXLScalarSubquery.cpp      |   0
 .../src/operators/CDXLScalarSubqueryAll.cpp   |   0
 .../src/operators/CDXLScalarSubqueryAny.cpp   |   0
 .../operators/CDXLScalarSubqueryExists.cpp    |   0
 .../operators/CDXLScalarSubqueryNotExists.cpp |   0
 .../CDXLScalarSubqueryQuantified.cpp          |   0
 .../src/operators/CDXLScalarSwitch.cpp        |   0
 .../src/operators/CDXLScalarSwitchCase.cpp    |   0
 .../src/operators/CDXLScalarValuesList.cpp    |   0
 .../operators/CDXLScalarWindowFrameEdge.cpp   |   0
 .../src/operators/CDXLScalarWindowRef.cpp     |   0
 .../src/operators/CDXLSpoolInfo.cpp           |   0
 .../src/operators/CDXLTableDescr.cpp          |   0
 .../src/operators/CDXLWindowFrame.cpp         |   0
 .../src/operators/CDXLWindowKey.cpp           |   0
 .../src/operators/CDXLWindowSpec.cpp          |   0
 .../src/parser/CParseHandlerAgg.cpp           |   0
 .../src/parser/CParseHandlerAppend.cpp        |   0
 .../src/parser/CParseHandlerArray.cpp         |   0
 .../src/parser/CParseHandlerAssert.cpp        |   0
 .../src/parser/CParseHandlerBase.cpp          |   0
 .../parser/CParseHandlerBroadcastMotion.cpp   |   0
 .../src/parser/CParseHandlerCTEConfig.cpp     |   0
 .../src/parser/CParseHandlerCTEList.cpp       |   0
 .../src/parser/CParseHandlerColDescr.cpp      |   0
 .../src/parser/CParseHandlerColStats.cpp      |   0
 .../parser/CParseHandlerColStatsBucket.cpp    |   0
 .../src/parser/CParseHandlerCondList.cpp      |   0
 .../src/parser/CParseHandlerCost.cpp          |   0
 .../src/parser/CParseHandlerCostModel.cpp     |   0
 .../src/parser/CParseHandlerCostParam.cpp     |   0
 .../src/parser/CParseHandlerCostParams.cpp    |   0
 .../CParseHandlerCtasStorageOptions.cpp       |   0
 .../src/parser/CParseHandlerDXL.cpp           |   0
 .../CParseHandlerDirectDispatchInfo.cpp       |   0
 .../src/parser/CParseHandlerDistinctComp.cpp  |   0
 .../src/parser/CParseHandlerDummy.cpp         |   0
 .../CParseHandlerDynamicForeignScan.cpp       |   0
 .../CParseHandlerDynamicIndexOnlyScan.cpp     |   0
 .../parser/CParseHandlerDynamicIndexScan.cpp  |   0
 .../parser/CParseHandlerDynamicTableScan.cpp  |   0
 .../parser/CParseHandlerEnumeratorConfig.cpp  |   0
 .../src/parser/CParseHandlerExtStats.cpp      |   0
 .../CParseHandlerExtStatsDependencies.cpp     |   0
 .../CParseHandlerExtStatsDependency.cpp       |   0
 .../src/parser/CParseHandlerExtStatsInfo.cpp  |   0
 .../parser/CParseHandlerExtStatsNDistinct.cpp |   0
 .../CParseHandlerExtStatsNDistinctList.cpp    |   0
 .../src/parser/CParseHandlerFactory.cpp       |   0
 .../src/parser/CParseHandlerFilter.cpp        |   0
 .../src/parser/CParseHandlerForeignScan.cpp   |   0
 .../src/parser/CParseHandlerGatherMotion.cpp  |   0
 .../parser/CParseHandlerGroupingColList.cpp   |   0
 .../src/parser/CParseHandlerHashExpr.cpp      |   0
 .../src/parser/CParseHandlerHashExprList.cpp  |   0
 .../src/parser/CParseHandlerHashJoin.cpp      |   0
 .../src/parser/CParseHandlerHint.cpp          |   0
 .../src/parser/CParseHandlerIndexCondList.cpp |   0
 .../src/parser/CParseHandlerIndexDescr.cpp    |   0
 .../src/parser/CParseHandlerIndexOnlyScan.cpp |   0
 .../src/parser/CParseHandlerIndexScan.cpp     |   0
 .../src/parser/CParseHandlerLimit.cpp         |   0
 .../src/parser/CParseHandlerLogicalCTAS.cpp   |   0
 .../parser/CParseHandlerLogicalCTEAnchor.cpp  |   0
 .../CParseHandlerLogicalCTEConsumer.cpp       |   0
 .../CParseHandlerLogicalCTEProducer.cpp       |   0
 .../parser/CParseHandlerLogicalConstTable.cpp |   0
 .../src/parser/CParseHandlerLogicalDelete.cpp |   0
 .../parser/CParseHandlerLogicalForeignGet.cpp |   0
 .../src/parser/CParseHandlerLogicalGet.cpp    |   0
 .../parser/CParseHandlerLogicalGroupBy.cpp    |   0
 .../src/parser/CParseHandlerLogicalInsert.cpp |   0
 .../src/parser/CParseHandlerLogicalJoin.cpp   |   0
 .../src/parser/CParseHandlerLogicalLimit.cpp  |   0
 .../src/parser/CParseHandlerLogicalOp.cpp     |   0
 .../parser/CParseHandlerLogicalProject.cpp    |   0
 .../src/parser/CParseHandlerLogicalSelect.cpp |   0
 .../src/parser/CParseHandlerLogicalSetOp.cpp  |   0
 .../src/parser/CParseHandlerLogicalTVF.cpp    |   0
 .../src/parser/CParseHandlerLogicalUpdate.cpp |   0
 .../src/parser/CParseHandlerLogicalWindow.cpp |   0
 .../parser/CParseHandlerMDArrayCoerceCast.cpp |   0
 .../src/parser/CParseHandlerMDCast.cpp        |   0
 .../src/parser/CParseHandlerMDGPDBAgg.cpp     |   0
 .../CParseHandlerMDGPDBCheckConstraint.cpp    |   0
 .../src/parser/CParseHandlerMDGPDBFunc.cpp    |   0
 .../parser/CParseHandlerMDGPDBScalarOp.cpp    |   0
 .../src/parser/CParseHandlerMDIndex.cpp       |   0
 .../parser/CParseHandlerMDIndexInfoList.cpp   |   0
 .../src/parser/CParseHandlerMDRelation.cpp    |   0
 .../parser/CParseHandlerMDRelationCtas.cpp    |   0
 .../src/parser/CParseHandlerMDRequest.cpp     |   0
 .../src/parser/CParseHandlerMDScCmp.cpp       |   0
 .../src/parser/CParseHandlerMDType.cpp        |   0
 .../src/parser/CParseHandlerManager.cpp       |   0
 .../src/parser/CParseHandlerMaterialize.cpp   |   0
 .../src/parser/CParseHandlerMergeJoin.cpp     |   0
 .../src/parser/CParseHandlerMetadata.cpp      |   0
 .../parser/CParseHandlerMetadataColumn.cpp    |   0
 .../parser/CParseHandlerMetadataColumns.cpp   |   0
 .../parser/CParseHandlerMetadataIdList.cpp    |   0
 .../parser/CParseHandlerMetadataObject.cpp    |   0
 .../src/parser/CParseHandlerNLJIndexParam.cpp |   0
 .../parser/CParseHandlerNLJIndexParamList.cpp |   0
 .../src/parser/CParseHandlerNLJoin.cpp        |   0
 .../src/parser/CParseHandlerOp.cpp            |   0
 .../parser/CParseHandlerOptimizerConfig.cpp   |   0
 .../parser/CParseHandlerPartitionSelector.cpp |   0
 ...ParseHandlerPhysicalAbstractBitmapScan.cpp |   0
 .../CParseHandlerPhysicalBitmapTableScan.cpp  |   0
 .../src/parser/CParseHandlerPhysicalCTAS.cpp  |   0
 .../CParseHandlerPhysicalCTEConsumer.cpp      |   0
 .../CParseHandlerPhysicalCTEProducer.cpp      |   0
 .../src/parser/CParseHandlerPhysicalDML.cpp   |   0
 ...eHandlerPhysicalDynamicBitmapTableScan.cpp |   0
 .../src/parser/CParseHandlerPhysicalOp.cpp    |   0
 .../src/parser/CParseHandlerPhysicalSplit.cpp |   0
 .../src/parser/CParseHandlerPhysicalTVF.cpp   |   0
 .../parser/CParseHandlerPhysicalWindow.cpp    |   0
 .../src/parser/CParseHandlerPlan.cpp          |   0
 .../src/parser/CParseHandlerPlanHint.cpp      |   0
 .../src/parser/CParseHandlerProjElem.cpp      |   0
 .../src/parser/CParseHandlerProjList.cpp      |   0
 .../src/parser/CParseHandlerProperties.cpp    |   0
 .../src/parser/CParseHandlerQuery.cpp         |   0
 .../src/parser/CParseHandlerQueryOutput.cpp   |   0
 .../src/parser/CParseHandlerRandomMotion.cpp  |   0
 .../CParseHandlerRedistributeMotion.cpp       |   0
 .../src/parser/CParseHandlerRelStats.cpp      |   0
 .../CParseHandlerRelationExtendedStats.cpp    |   0
 .../src/parser/CParseHandlerResult.cpp        |   0
 .../src/parser/CParseHandlerRoutedMotion.cpp  |   0
 .../src/parser/CParseHandlerScalarAggref.cpp  |   0
 .../CParseHandlerScalarArrayCoerceExpr.cpp    |   0
 .../parser/CParseHandlerScalarArrayComp.cpp   |   0
 .../parser/CParseHandlerScalarArrayRef.cpp    |   0
 .../CParseHandlerScalarArrayRefIndexList.cpp  |   0
 ...ParseHandlerScalarAssertConstraintList.cpp |   0
 .../CParseHandlerScalarBitmapBoolOp.cpp       |   0
 .../CParseHandlerScalarBitmapIndexProbe.cpp   |   0
 .../parser/CParseHandlerScalarBoolExpr.cpp    |   0
 .../parser/CParseHandlerScalarBooleanTest.cpp |   0
 .../parser/CParseHandlerScalarCaseTest.cpp    |   0
 .../src/parser/CParseHandlerScalarCast.cpp    |   0
 .../parser/CParseHandlerScalarCoalesce.cpp    |   0
 .../CParseHandlerScalarCoerceToDomain.cpp     |   0
 .../parser/CParseHandlerScalarCoerceViaIO.cpp |   0
 .../src/parser/CParseHandlerScalarComp.cpp    |   0
 .../parser/CParseHandlerScalarConstValue.cpp  |   0
 .../parser/CParseHandlerScalarDMLAction.cpp   |   0
 .../src/parser/CParseHandlerScalarExpr.cpp    |   0
 .../parser/CParseHandlerScalarFieldSelect.cpp |   0
 .../parser/CParseHandlerScalarFuncExpr.cpp    |   0
 .../src/parser/CParseHandlerScalarIdent.cpp   |   0
 .../src/parser/CParseHandlerScalarIfStmt.cpp  |   0
 .../parser/CParseHandlerScalarLimitCount.cpp  |   0
 .../parser/CParseHandlerScalarLimitOffset.cpp |   0
 .../src/parser/CParseHandlerScalarMinMax.cpp  |   0
 .../src/parser/CParseHandlerScalarNullIf.cpp  |   0
 .../parser/CParseHandlerScalarNullTest.cpp    |   0
 .../src/parser/CParseHandlerScalarOp.cpp      |   0
 .../src/parser/CParseHandlerScalarOpExpr.cpp  |   0
 .../src/parser/CParseHandlerScalarOpList.cpp  |   0
 .../src/parser/CParseHandlerScalarParam.cpp   |   0
 .../CParseHandlerScalarSortGroupClause.cpp    |   0
 .../src/parser/CParseHandlerScalarSubPlan.cpp |   0
 .../CParseHandlerScalarSubPlanParam.cpp       |   0
 .../CParseHandlerScalarSubPlanParamList.cpp   |   0
 .../CParseHandlerScalarSubPlanTestExpr.cpp    |   0
 .../parser/CParseHandlerScalarSubquery.cpp    |   0
 .../CParseHandlerScalarSubqueryExists.cpp     |   0
 .../CParseHandlerScalarSubqueryQuantified.cpp |   0
 .../src/parser/CParseHandlerScalarSwitch.cpp  |   0
 .../parser/CParseHandlerScalarSwitchCase.cpp  |   0
 .../parser/CParseHandlerScalarValuesList.cpp  |   0
 .../CParseHandlerScalarWindowFrameEdge.cpp    |   0
 .../parser/CParseHandlerScalarWindowRef.cpp   |   0
 .../src/parser/CParseHandlerSearchStage.cpp   |   0
 .../parser/CParseHandlerSearchStrategy.cpp    |   0
 .../src/parser/CParseHandlerSequence.cpp      |   0
 .../src/parser/CParseHandlerSort.cpp          |   0
 .../src/parser/CParseHandlerSortCol.cpp       |   0
 .../src/parser/CParseHandlerSortColList.cpp   |   0
 .../src/parser/CParseHandlerStackTrace.cpp    |   0
 .../src/parser/CParseHandlerStatistics.cpp    |   0
 .../parser/CParseHandlerStatisticsConfig.cpp  |   0
 .../src/parser/CParseHandlerStatsBound.cpp    |   0
 .../CParseHandlerStatsDerivedColumn.cpp       |   0
 .../CParseHandlerStatsDerivedRelation.cpp     |   0
 .../src/parser/CParseHandlerTableDescr.cpp    |   0
 .../src/parser/CParseHandlerTableScan.cpp     |   0
 .../src/parser/CParseHandlerTraceFlags.cpp    |   0
 .../src/parser/CParseHandlerUtils.cpp         |   0
 .../src/parser/CParseHandlerValuesScan.cpp    |   0
 .../src/parser/CParseHandlerWindowFrame.cpp   |   0
 .../src/parser/CParseHandlerWindowKey.cpp     |   0
 .../src/parser/CParseHandlerWindowKeyList.cpp |   0
 .../src/parser/CParseHandlerWindowOids.cpp    |   0
 .../src/parser/CParseHandlerWindowSpec.cpp    |   0
 .../parser/CParseHandlerWindowSpecList.cpp    |   0
 .../src/parser/CParseHandlerXform.cpp         |   0
 .../libnaucrates/src/statistics/CBucket.cpp   |   0
 .../statistics/CExtendedStatsProcessor.cpp    |   0
 .../src/statistics/CFilterStatsProcessor.cpp  |   0
 .../src/statistics/CGroupByStatsProcessor.cpp |   0
 .../src/statistics/CHistogram.cpp             |   0
 .../statistics/CInnerJoinStatsProcessor.cpp   |   0
 .../src/statistics/CJoinStatsProcessor.cpp    |   0
 .../CLeftAntiSemiJoinStatsProcessor.cpp       |   0
 .../CLeftOuterJoinStatsProcessor.cpp          |   0
 .../CLeftSemiJoinStatsProcessor.cpp           |   0
 .../src/statistics/CLimitStatsProcessor.cpp   |   0
 .../libnaucrates/src/statistics/CPoint.cpp    |   0
 .../src/statistics/CProjectStatsProcessor.cpp |   0
 .../src/statistics/CScaleFactorUtils.cpp      |   0
 .../src/statistics/CStatistics.cpp            |   0
 .../src/statistics/CStatisticsUtils.cpp       |   0
 .../src/statistics/CStatsPredArrayCmp.cpp     |   0
 .../src/statistics/CStatsPredConj.cpp         |   0
 .../src/statistics/CStatsPredDisj.cpp         |   0
 .../src/statistics/CStatsPredLike.cpp         |   0
 .../src/statistics/CStatsPredPoint.cpp        |   0
 .../src/statistics/CStatsPredUnsupported.cpp  |   0
 .../src/statistics/CStatsPredUtils.cpp        |   0
 .../statistics/CUnionAllStatsProcessor.cpp    |   0
 .../src/statistics/CUpperBoundNDVs.cpp        |   0
 .../gporca/libnaucrates/src/traceflags.cpp    |   0
 .../src/xml/CDXLMemoryManager.cpp             |   0
 .../libnaucrates/src/xml/CDXLSections.cpp     |   0
 .../libnaucrates/src/xml/CXMLSerializer.cpp   |   0
 .../gporca/libnaucrates/src/xml/dxltokens.cpp |   0
 .../orca}/gporca/scripts/cal_bitmap_test.py   |   0
 .../scripts/convert_minirepro_5_to_6.py       |   0
 .../scripts/convert_minirepro_6_to_7.py       |   0
 .../scripts/dxl_modify_partitioned_index.py   |   0
 .../gporca/scripts/fix_lookup_failure.py      |   0
 .../orca}/gporca/scripts/fix_mdps.py          |   0
 .../scripts/get_debug_event_counters.py       |   0
 .../scripts/tests/test_cal_bitmap_test.py     |   0
 .../orca}/gporca/server/CMakeLists.txt        |   0
 .../orca}/gporca/server/dxl.xsd               |   0
 .../orca}/gporca/server/fixdxl.sh             |   0
 .../gporca/server/include/unittest/base.h     |   0
 .../unittest/dxl/CDXLMemoryManagerTest.h      |   0
 .../include/unittest/dxl/CDXLUtilsTest.h      |   0
 .../unittest/dxl/CParseHandlerCostModelTest.h |   0
 .../unittest/dxl/CParseHandlerManagerTest.h   |   0
 ...ParseHandlerOptimizerConfigSerializeTest.h |   0
 .../include/unittest/dxl/CParseHandlerTest.h  |   0
 .../include/unittest/dxl/CXMLSerializerTest.h |   0
 .../include/unittest/dxl/base/CDatumTest.h    |   0
 .../unittest/dxl/statistics/CBucketTest.h     |   0
 .../dxl/statistics/CCardinalityTestUtils.h    |   0
 .../dxl/statistics/CFilterCardinalityTest.h   |   0
 .../unittest/dxl/statistics/CHistogramTest.h  |   0
 .../dxl/statistics/CJoinCardinalityTest.h     |   0
 .../unittest/dxl/statistics/CMCVTest.h        |   0
 .../unittest/dxl/statistics/CPointTest.h      |   0
 .../unittest/dxl/statistics/CStatisticsTest.h |   0
 .../gpopt/CConstExprEvaluatorForDates.h       |   0
 .../unittest/gpopt/CSubqueryTestUtils.h       |   0
 .../include/unittest/gpopt/CTestUtils.h       |   0
 .../unittest/gpopt/base/CColRefSetIterTest.h  |   0
 .../unittest/gpopt/base/CColRefSetTest.h      |   0
 .../unittest/gpopt/base/CColumnFactoryTest.h  |   0
 .../unittest/gpopt/base/CConstraintTest.h     |   0
 .../gpopt/base/CDistributionSpecTest.h        |   0
 .../gpopt/base/CEquivalenceClassesTest.h      |   0
 .../gpopt/base/CFunctionalDependencyTest.h    |   0
 .../include/unittest/gpopt/base/CGroupTest.h  |   0
 .../unittest/gpopt/base/CKeyCollectionTest.h  |   0
 .../unittest/gpopt/base/CMaxCardTest.h        |   0
 .../unittest/gpopt/base/COrderSpecTest.h      |   0
 .../include/unittest/gpopt/base/CRangeTest.h  |   0
 .../unittest/gpopt/base/CStateMachineTest.h   |   0
 .../include/unittest/gpopt/cost/CCostTest.h   |   0
 .../gpopt/csq/CCorrelatedExecutionTest.h      |   0
 .../unittest/gpopt/engine/CBindingTest.h      |   0
 .../unittest/gpopt/engine/CEngineTest.h       |   0
 .../unittest/gpopt/engine/CEnumeratorTest.h   |   0
 .../gpopt/eval/CConstExprEvaluatorDXLTest.h   |   0
 .../eval/CConstExprEvaluatorDefaultTest.h     |   0
 .../unittest/gpopt/mdcache/CMDAccessorTest.h  |   0
 .../unittest/gpopt/mdcache/CMDProviderTest.h  |   0
 .../gpopt/metadata/CColumnDescriptorTest.h    |   0
 .../gpopt/metadata/CIndexDescriptorTest.h     |   0
 .../unittest/gpopt/metadata/CNameTest.h       |   0
 .../gpopt/metadata/CTableDescriptorTest.h     |   0
 .../unittest/gpopt/minidump/CAggTest.h        |   0
 .../gpopt/minidump/CArrayExpansionTest.h      |   0
 .../unittest/gpopt/minidump/CBitmapTest.h     |   0
 .../unittest/gpopt/minidump/CCTETest.h        |   0
 .../unittest/gpopt/minidump/CCastTest.h       |   0
 .../gpopt/minidump/CCollapseProjectTest.h     |   0
 .../gpopt/minidump/CConstTblGetTest.h         |   0
 .../unittest/gpopt/minidump/CDMLTest.h        |   0
 .../gpopt/minidump/CDirectDispatchTest.h      |   0
 .../gpopt/minidump/CEscapeMechanismTest.h     |   0
 .../gpopt/minidump/CExternalTableTest.h       |   0
 .../unittest/gpopt/minidump/CICGTest.h        |   0
 .../gpopt/minidump/CJoinOrderDPTest.h         |   0
 .../gpopt/minidump/CMiniDumperDXLTest.h       |   0
 .../CMinidumpWithConstExprEvaluatorTest.h     |   0
 .../gpopt/minidump/CMissingStatsTest.h        |   0
 .../gpopt/minidump/CMultilevelPartitionTest.h |   0
 .../minidump/CPhysicalParallelUnionAllTest.h  |   0
 .../gpopt/minidump/CPruneColumnsTest.h        |   0
 .../minidump/CPullUpProjectElementTest.h      |   0
 .../unittest/gpopt/minidump/CSubqueryTest.h   |   0
 .../unittest/gpopt/minidump/CTVFTest.h        |   0
 .../unittest/gpopt/minidump/CWindowTest.h     |   0
 .../unittest/gpopt/minidump/MinidumpTest.h.in |   0
 .../gpopt/operators/CContradictionTest.h      |   0
 .../operators/CExpressionPreprocessorTest.h   |   0
 .../gpopt/operators/CExpressionTest.h         |   0
 .../gpopt/operators/CLogicalGbAggTest.h       |   0
 .../gpopt/operators/CPredicateUtilsTest.h     |   0
 .../operators/CScalarIsDistinctFromTest.h     |   0
 .../gpopt/search/COptimizationJobsTest.h      |   0
 .../gpopt/search/CSearchStrategyTest.h        |   0
 .../unittest/gpopt/search/CTreeMapTest.h      |   0
 .../translate/CTranslatorDXLToExprTest.h      |   0
 .../translate/CTranslatorExprToDXLTest.h      |   0
 .../unittest/gpopt/xforms/CDecorrelatorTest.h |   0
 .../unittest/gpopt/xforms/CJoinOrderTest.h    |   0
 .../gpopt/xforms/CSubqueryHandlerTest.h       |   0
 .../unittest/gpopt/xforms/CXformFactoryTest.h |   0
 .../CXformRightOuterJoin2HashJoinTest.h       |   0
 .../unittest/gpopt/xforms/CXformTest.h        |   0
 .../orca}/gporca/server/src/startup/main.cpp  |   0
 .../unittest/CConstExprEvaluatorForDates.cpp  |   0
 .../src/unittest/CSubqueryTestUtils.cpp       |   0
 .../gporca/server/src/unittest/CTestUtils.cpp |   0
 .../unittest/dxl/CDXLMemoryManagerTest.cpp    |   0
 .../server/src/unittest/dxl/CDXLUtilsTest.cpp |   0
 .../src/unittest/dxl/CMDProviderTest.cpp      |   0
 .../dxl/CParseHandlerCostModelTest.cpp        |   0
 .../unittest/dxl/CParseHandlerManagerTest.cpp |   0
 ...rseHandlerOptimizerConfigSerializeTest.cpp |   0
 .../src/unittest/dxl/CParseHandlerTest.cpp    |   0
 .../src/unittest/dxl/CXMLSerializerTest.cpp   |   0
 .../src/unittest/dxl/base/CDatumTest.cpp      |   0
 .../unittest/dxl/statistics/CBucketTest.cpp   |   0
 .../dxl/statistics/CCardinalityTestUtils.cpp  |   0
 .../dxl/statistics/CFilterCardinalityTest.cpp |   0
 .../dxl/statistics/CHistogramTest.cpp         |   0
 .../dxl/statistics/CJoinCardinalityTest.cpp   |   0
 .../src/unittest/dxl/statistics/CMCVTest.cpp  |   0
 .../unittest/dxl/statistics/CPointTest.cpp    |   0
 .../dxl/statistics/CStatisticsTest.cpp        |   0
 .../gpopt/base/CColRefSetIterTest.cpp         |   0
 .../unittest/gpopt/base/CColRefSetTest.cpp    |   0
 .../gpopt/base/CColumnFactoryTest.cpp         |   0
 .../unittest/gpopt/base/CConstraintTest.cpp   |   0
 .../gpopt/base/CDistributionSpecTest.cpp      |   0
 .../gpopt/base/CEquivalenceClassesTest.cpp    |   0
 .../gpopt/base/CFunctionalDependencyTest.cpp  |   0
 .../src/unittest/gpopt/base/CGroupTest.cpp    |   0
 .../gpopt/base/CKeyCollectionTest.cpp         |   0
 .../src/unittest/gpopt/base/CMaxCardTest.cpp  |   0
 .../unittest/gpopt/base/COrderSpecTest.cpp    |   0
 .../src/unittest/gpopt/base/CRangeTest.cpp    |   0
 .../unittest/gpopt/base/CStateMachineTest.cpp |   0
 .../src/unittest/gpopt/cost/CCostTest.cpp     |   0
 .../gpopt/csq/CCorrelatedExecutionTest.cpp    |   0
 .../unittest/gpopt/engine/CBindingTest.cpp    |   0
 .../src/unittest/gpopt/engine/CEngineTest.cpp |   0
 .../unittest/gpopt/engine/CEnumeratorTest.cpp |   0
 .../gpopt/eval/CConstExprEvaluatorDXLTest.cpp |   0
 .../eval/CConstExprEvaluatorDefaultTest.cpp   |   0
 .../gpopt/mdcache/CMDAccessorTest.cpp         |   0
 .../gpopt/metadata/CColumnDescriptorTest.cpp  |   0
 .../gpopt/metadata/CIndexDescriptorTest.cpp   |   0
 .../src/unittest/gpopt/metadata/CNameTest.cpp |   0
 .../gpopt/metadata/CTableDescriptorTest.cpp   |   0
 .../src/unittest/gpopt/minidump/CAggTest.cpp  |   0
 .../gpopt/minidump/CArrayExpansionTest.cpp    |   0
 .../unittest/gpopt/minidump/CBitmapTest.cpp   |   0
 .../src/unittest/gpopt/minidump/CCTETest.cpp  |   0
 .../src/unittest/gpopt/minidump/CCastTest.cpp |   0
 .../gpopt/minidump/CCollapseProjectTest.cpp   |   0
 .../gpopt/minidump/CConstTblGetTest.cpp       |   0
 .../src/unittest/gpopt/minidump/CDMLTest.cpp  |   0
 .../gpopt/minidump/CDirectDispatchTest.cpp    |   0
 .../gpopt/minidump/CEscapeMechanismTest.cpp   |   0
 .../gpopt/minidump/CExternalTableTest.cpp     |   0
 .../src/unittest/gpopt/minidump/CICGTest.cpp  |   0
 .../gpopt/minidump/CJoinOrderDPTest.cpp       |   0
 .../gpopt/minidump/CMiniDumperDXLTest.cpp     |   0
 .../CMinidumpWithConstExprEvaluatorTest.cpp   |   0
 .../gpopt/minidump/CMissingStatsTest.cpp      |   0
 .../minidump/CMultilevelPartitionTest.cpp     |   0
 .../CPhysicalParallelUnionAllTest.cpp         |   0
 .../gpopt/minidump/CPruneColumnsTest.cpp      |   0
 .../minidump/CPullUpProjectElementTest.cpp    |   0
 .../unittest/gpopt/minidump/CSubqueryTest.cpp |   0
 .../src/unittest/gpopt/minidump/CTVFTest.cpp  |   0
 .../unittest/gpopt/minidump/CWindowTest.cpp   |   0
 .../gpopt/minidump/MinidumpTest.cpp.in        |   0
 .../gpopt/operators/CContradictionTest.cpp    |   0
 .../operators/CExpressionPreprocessorTest.cpp |   0
 .../gpopt/operators/CExpressionTest.cpp       |   0
 .../gpopt/operators/CLogicalGbAggTest.cpp     |   0
 .../gpopt/operators/CPredicateUtilsTest.cpp   |   0
 .../operators/CScalarIsDistinctFromTest.cpp   |   0
 .../gpopt/search/COptimizationJobsTest.cpp    |   0
 .../gpopt/search/CSearchStrategyTest.cpp      |   0
 .../unittest/gpopt/search/CTreeMapTest.cpp    |   0
 .../translate/CTranslatorDXLToExprTest.cpp    |   0
 .../translate/CTranslatorExprToDXLTest.cpp    |   0
 .../gpopt/xforms/CDecorrelatorTest.cpp        |   0
 .../unittest/gpopt/xforms/CJoinOrderTest.cpp  |   0
 .../gpopt/xforms/CSubqueryHandlerTest.cpp     |   0
 .../gpopt/xforms/CXformFactoryTest.cpp        |   0
 .../CXformRightOuterJoin2HashJoinTest.cpp     |   0
 .../src/unittest/gpopt/xforms/CXformTest.cpp  |   0
 .../orca}/include/gpopt/.clang-format         |   0
 .../orca}/include/gpopt/CGPOptimizer.h        |   0
 .../gpopt/config/CConfigParamMapping.h        |   0
 .../orca}/include/gpopt/gpdbwrappers.h        |   0
 .../gpopt/relcache/CMDProviderRelcache.h      |   0
 .../include/gpopt/translate/CCTEListEntry.h   |   0
 .../gpopt/translate/CContextDXLToPlStmt.h     |   0
 .../gpopt/translate/CContextQueryToDXL.h      |   0
 .../gpopt/translate/CDXLTranslateContext.h    |   0
 .../translate/CDXLTranslateContextBaseTable.h |   0
 .../include/gpopt/translate/CGPDBAttInfo.h    |   0
 .../include/gpopt/translate/CGPDBAttOptCol.h  |   0
 .../include/gpopt/translate/CIndexQualInfo.h  |   0
 .../gpopt/translate/CMappingColIdVar.h        |   0
 .../gpopt/translate/CMappingColIdVarPlStmt.h  |   0
 .../translate/CMappingElementColIdParamId.h   |   0
 .../gpopt/translate/CMappingVarColId.h        |   0
 .../include/gpopt/translate/COptColInfo.h     |   0
 .../gpopt/translate/CPartPruneStepsBuilder.h  |   0
 .../include/gpopt/translate/CQueryMutators.h  |   0
 .../gpopt/translate/CTranslatorDXLToPlStmt.h  |   0
 .../gpopt/translate/CTranslatorDXLToScalar.h  |   0
 .../gpopt/translate/CTranslatorQueryToDXL.h   |   0
 .../translate/CTranslatorRelcacheToDXL.h      |   0
 .../gpopt/translate/CTranslatorScalarToDXL.h  |   0
 .../gpopt/translate/CTranslatorUtils.h        |   0
 .../gpopt/utils/CConstExprEvaluatorProxy.h    |   0
 .../include/gpopt/utils/CMemoryPoolPalloc.h   |   0
 .../gpopt/utils/CMemoryPoolPallocManager.h    |   0
 .../orca}/include/gpopt/utils/COptTasks.h     |   0
 .../include/gpopt/utils/RelationWrapper.h     |   0
 .../orca}/include/gpopt/utils/funcs.h         |   0
 .../orca}/include/gpopt/utils/gpdbdefs.h      |   0
 .../orca}/include/optimizer/orca.h            |   4 +-
 gpcontrib/orca/orca.c                         |   2 +
 .../orca.c => gpcontrib/orca/orca_entry.c     |   2 +-
 {src => gpcontrib/orca}/tools/fmt             |  16 +-
 {src => gpcontrib/orca}/tools/tidy            |  18 +-
 src/backend/Makefile                          |  10 +-
 src/backend/gpopt/Makefile                    |  17 --
 src/backend/gpopt/config/Makefile             |  16 --
 src/backend/gpopt/gpopt.mk                    |  11 -
 src/backend/gpopt/relcache/Makefile           |  16 --
 src/backend/gpopt/translate/Makefile          |  32 ---
 src/backend/gpopt/utils/Makefile              |  16 --
 src/backend/gporca/Makefile                   |  12 --
 src/backend/gporca/gporca.mk                  |  12 --
 src/backend/gporca/libgpdbcost/Makefile       |  13 --
 src/backend/gporca/libgpdbcost/src/Makefile   |  18 --
 src/backend/gporca/libgpopt/Makefile          |  13 --
 src/backend/gporca/libgpopt/src/Makefile      |  17 --
 src/backend/gporca/libgpopt/src/base/Makefile |  80 -------
 .../gporca/libgpopt/src/engine/Makefile       |  19 --
 src/backend/gporca/libgpopt/src/eval/Makefile |  17 --
 .../gporca/libgpopt/src/hints/Makefile        |  16 --
 .../gporca/libgpopt/src/mdcache/Makefile      |  19 --
 .../gporca/libgpopt/src/metadata/Makefile     |  19 --
 .../gporca/libgpopt/src/minidump/Makefile     |  24 ---
 .../gporca/libgpopt/src/operators/Makefile    | 195 -----------------
 .../gporca/libgpopt/src/optimizer/Makefile    |  16 --
 .../gporca/libgpopt/src/search/Makefile       |  36 ----
 .../gporca/libgpopt/src/translate/Makefile    |  19 --
 .../gporca/libgpopt/src/xforms/Makefile       | 144 -------------
 src/backend/gporca/libgpos/Makefile           |  13 --
 src/backend/gporca/libgpos/src/Makefile       |  17 --
 .../gporca/libgpos/src/common/Makefile        |  29 ---
 src/backend/gporca/libgpos/src/error/Makefile |  29 ---
 src/backend/gporca/libgpos/src/io/Makefile    |  23 --
 .../gporca/libgpos/src/memory/Makefile        |  21 --
 .../gporca/libgpos/src/string/Makefile        |  21 --
 src/backend/gporca/libgpos/src/task/Makefile  |  26 ---
 src/backend/gporca/libgpos/src/test/Makefile  |  15 --
 src/backend/gporca/libnaucrates/Makefile      |  13 --
 src/backend/gporca/libnaucrates/src/Makefile  |  22 --
 .../gporca/libnaucrates/src/base/Makefile     |  23 --
 .../gporca/libnaucrates/src/md/Makefile       |  57 -----
 .../libnaucrates/src/operators/Makefile       | 158 --------------
 .../gporca/libnaucrates/src/parser/Makefile   | 200 ------------------
 .../libnaucrates/src/statistics/Makefile      |  40 ----
 .../gporca/libnaucrates/src/xml/Makefile      |  19 --
 src/backend/mock.mk                           |  11 -
 src/backend/optimizer/plan/Makefile           |   4 -
 src/backend/utils/mmgr/mcxt.c                 |   1 -
 src/include/utils/memutils.h                  |   1 -
 src/test/unit/mock/gpopt_mock.c               |  53 -----
 4014 files changed, 116 insertions(+), 1671 deletions(-)
 create mode 100644 .abi-check/7.2.0_arenadata7/postgres.symbols.ignore
 rename .abi-check/{7.2.0_arenadata6 => 7.2.0_arenadata7}/postgres.types.ignore (95%)
 rename {src/backend => gpcontrib/orca}/gpopt/.clang-format (100%)
 rename {src/backend => gpcontrib/orca}/gpopt/CGPOptimizer.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gpopt/README (100%)
 rename {src/backend => gpcontrib/orca}/gpopt/config/CConfigParamMapping.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gpopt/gpdbwrappers.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gpopt/relcache/CMDProviderRelcache.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gpopt/translate/CCTEListEntry.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gpopt/translate/CContextDXLToPlStmt.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gpopt/translate/CContextQueryToDXL.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gpopt/translate/CDXLTranslateContext.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gpopt/translate/CDXLTranslateContextBaseTable.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gpopt/translate/CMappingColIdVar.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gpopt/translate/CMappingColIdVarPlStmt.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gpopt/translate/CMappingElementColIdParamId.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gpopt/translate/CMappingVarColId.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gpopt/translate/CPartPruneStepsBuilder.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gpopt/translate/CQueryMutators.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gpopt/translate/CTranslatorDXLToPlStmt.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gpopt/translate/CTranslatorDXLToScalar.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gpopt/translate/CTranslatorQueryToDXL.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gpopt/translate/CTranslatorRelcacheToDXL.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gpopt/translate/CTranslatorScalarToDXL.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gpopt/translate/CTranslatorUtils.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gpopt/translate/README (100%)
 rename {src/backend => gpcontrib/orca}/gpopt/utils/CConstExprEvaluatorProxy.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gpopt/utils/CMemoryPoolPalloc.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gpopt/utils/CMemoryPoolPallocManager.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gpopt/utils/COptTasks.cpp (99%)
 rename {src/backend => gpcontrib/orca}/gpopt/utils/RelationWrapper.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/.clang-format (100%)
 rename {src/backend => gpcontrib/orca}/gporca/.gitignore (100%)
 rename {src/backend => gpcontrib/orca}/gporca/CMakeLists.txt (100%)
 rename {src/backend => gpcontrib/orca}/gporca/COPYRIGHT (100%)
 rename {src/backend => gpcontrib/orca}/gporca/README.format.md (90%)
 rename {src/backend => gpcontrib/orca}/gporca/README.md (98%)
 rename {src/backend => gpcontrib/orca}/gporca/README.memo.md (100%)
 rename {src/backend => gpcontrib/orca}/gporca/README.tidy.md (79%)
 rename {src/backend => gpcontrib/orca}/gporca/StyleGuide.md (100%)
 rename {src/backend => gpcontrib/orca}/gporca/clang-format.intent.yaml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/cmake/FindXerces.cmake (100%)
 rename {src/backend => gpcontrib/orca}/gporca/concourse/README.md (100%)
 rename {src/backend => gpcontrib/orca}/gporca/concourse/build_and_test.py (100%)
 rename {src/backend => gpcontrib/orca}/gporca/concourse/test_explain_pipeline.yml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/concourse/test_orca_pipeline.yml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/concourse/vars_example.yml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/concourse/xerces-c/build_xerces.py (100%)
 rename {src/backend => gpcontrib/orca}/gporca/concourse/xerces-c/xerces-c-3.1.2.tar.gz.sha256 (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/cost/cost0.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/cost/wrong-cost.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/csq_tests/dxl-q1.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/csq_tests/dxl-q10.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/csq_tests/dxl-q11.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/csq_tests/dxl-q12.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/csq_tests/dxl-q13.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/csq_tests/dxl-q14.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/csq_tests/dxl-q15.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/csq_tests/dxl-q16.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/csq_tests/dxl-q2.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/csq_tests/dxl-q3.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/csq_tests/dxl-q4.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/csq_tests/dxl-q5.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/csq_tests/dxl-q6.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/csq_tests/dxl-q7.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/csq_tests/dxl-q8.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/csq_tests/dxl-q9.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/AggNoGroupByPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/AggNoGroupByQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ArrayCmpPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ArrayCmpQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ArrayPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ArrayQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/BroadcastPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/BroadcastQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/CScalarConstArray.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/CoalescePlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/CoalesceQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ConstPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ConstQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ConstTableGetPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ConstTableGetQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ContradictionPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ContradictionQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/CorrelatedSubqueryBooleanPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/CorrelatedSubqueryBooleanQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/CorrelatedSubqueryFilterPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/CorrelatedSubqueryFilterQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/CorrelatedSubqueryOuterPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/CorrelatedSubqueryOuterQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/CorrelatedSubqueryPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/CorrelatedSubqueryQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/CorrelatedSubqueryResultPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/CorrelatedSubqueryResultQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DifferencePlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DifferenceQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DoubleSortPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DoubleSortQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DynamicGetBooleanNotPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DynamicGetBooleanNotQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DynamicGetBooleanPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DynamicGetBooleanQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DynamicGetCountStarPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DynamicGetCountStarQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DynamicGetHashJoinOtherKeyPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DynamicGetHashJoinOtherKeyQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DynamicGetHashJoinPartKeyPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DynamicGetHashJoinPartKeyQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DynamicGetMultiJoinPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DynamicGetMultiJoinQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DynamicGetNLJoinOtherKeyPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DynamicGetNLJoinOtherKeyQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DynamicGetNLJoinPartKeyPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DynamicGetNLJoinPartKeyQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DynamicGetPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DynamicGetPointPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DynamicGetPointQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DynamicGetQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DynamicGetRangeSelectPlan1.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DynamicGetRangeSelectPlan2.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DynamicGetRangeSelectQuery1.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DynamicGetRangeSelectQuery2.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DynamicGetUnionAllOuterJoinPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/DynamicGetUnionAllOuterJoinQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/FilterLogOpPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/FilterLogOpQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/FilterOnTableWithIndexPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/FilterOnTableWithIndexQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/FilterPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/FilterQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/FuncExprPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/FuncExprQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/GatherMergePlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/GatherMergeQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/GatherPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/GatherQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/GroupByNoAggPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/GroupByNoAggQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/GroupByPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/GroupByQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/HashDistributePlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/HashDistributeQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/HashJoinPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/HashJoinQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/InnerJoinPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/InnerJoinQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/InsertPartitionedPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/InsertPartitionedQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/IntersectAllPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/IntersectAllQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/IntersectPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/IntersectQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q1.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q10.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q11.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q12.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q13.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q14.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q15.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q16.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q2.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q3.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q4.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q5.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q6.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q7.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q8.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q9.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/LeftOuterJoinHJPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/LeftOuterJoinHJQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/LeftOuterJoinNLPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/LeftOuterJoinNLQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/LimitQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/LimitQueryNoOffset.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/MultipleWindowFuncPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/MultipleWindowFuncQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/NAryJoinPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/NAryJoinQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/NLLASJoinPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/NLLASJoinQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/NLLSJoinPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/NLLSJoinQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/NullIfPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/NullIfQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/NullableDroppedColumn.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ProjectPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ProjectQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/RedundantSortPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/RedundantSortQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/RightOuterJoinPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/RightOuterJoinQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ScalarCaseTestPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ScalarCaseTestQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ScalarCastPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ScalarCastQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ScalarDistFromPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ScalarDistFromQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ScalarIfPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ScalarIfQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ScalarNullTestPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ScalarNullTestQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ScalarOpAddPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ScalarOpAddQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ScalarSubqueryAnyAllPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ScalarSubqueryAnyAllQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ScalarSubqueryExistentialPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ScalarSubqueryExistentialQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ScalarSubqueryPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ScalarSubqueryQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ScalarSwitchPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/ScalarSwitchQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/SortPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/SortQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/SpoolPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/SpoolQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/TableScan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/TableScanPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/TableScanQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/TableScanWithFilterPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/TableScanWithFilterQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/TableValuedFunctionJoinPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/TableValuedFunctionJoinQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/TableValuedFunctionPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/TableValuedFunctionQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/UnionAllPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/UnionAllQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/UnionAllRemappedPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/UnionAllRemappedQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/UnionPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/UnionQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/VolatileCSQPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/VolatileCSQQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/VolatileFuncPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/VolatileFuncQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/VolatileHashJoinPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/VolatileHashJoinQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/VolatileNLJoinPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/VolatileNLJoinQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/VolatileTVFPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/VolatileTVFQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/VolatileWithPartTablePlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/VolatileWithPartTableQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/WinFunc-OuterRef-Partition-Order-Frames-Query.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/WinFunc-OuterRef-Partition-Order-Query.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/WinFunc-OuterRef-Partition-Query.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/WinFunc-Tests-MD.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/WindowPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/WindowPlanEmptyPartitionBy.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/WindowQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/WindowQueryEmptyPartitionBy.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/WindowWithFramePlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/WindowWithFrameQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/WindowWithNoLeadingEdgePlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/expressiontests/WindowWithNoLeadingEdgeQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/formatxml.sh (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/indexjoin/positive_04.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/metadata/md.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/3WayJoinOnMultiDistributionColumnsTables.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/3WayJoinOnMultiDistributionColumnsTablesNoMotion.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/3WayJoinUsingOperatorsOfNonDefaultOpfamily.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/4WayJoinInferredPredsRemovedWith2Motion.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AddEqualityPredicates.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AddPredsInSubqueries.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-3.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-4.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-5.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Agg-Limit.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Agg-NonSplittable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AggSubqCollapseFalseFilter.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AggWithSubqArgs.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AggWithVolatileFunc.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AggonExternalTableNoMotion.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AggregateWithSkew.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AggregatesConstraintDeriveNegation.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AllSubqueryWithSubqueryInScalar.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AllowIndexOnlyScanOnAppendOnlyTable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AllowIndexOnlyScanOnMixedAppendOnlyPartitionedTable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AllowIndexOnlyScanOnMixedPartitionedTable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AntiSemiJoin2Select-1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AntiSemiJoin2Select-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AnyPredicate-Over-UnionOfConsts.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-3.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AnySubqueryWithAllSubqueryInScalar.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AnySubqueryWithSubqueryInScalar.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AnySubqueryWithVolatileComp.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AnySubqueryWithVolatileFunc.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ArrayCmp-IN-ManyElements.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ArrayCmpAll-Disjunct.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ArrayCmpAll.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ArrayCmpAllEmpty.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ArrayCmpAnyEmpty.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ArrayCmpAnyEmptyLessThan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ArrayCmpInList.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ArrayCoerceCast.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ArrayCoerceExpr.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ArrayCoerceImplicitCast.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ArrayConcat.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ArrayRef.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AssertMaxOneRow.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AssertOneRowWithCorrelation.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/AvoidConstraintDerivationForLike.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BRINScan-Or.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BTreeIndex-Against-InList.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BTreeIndex-Against-InListLarge.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BTreeIndex-Against-ScalarSubquery.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Backward-IndexOnlyScan-OrderBy-on-MultiCol-Index.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Backward-IndexScan-OrderBy-on-MultiCol-Index.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Backward-IndexScan-OrderBy-on-SingleCol-Index.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BasicQueryParam.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapBoolAnd.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapBoolOp-DeepTree.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapBoolOp-DeepTree2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapBoolOp-DeepTree3.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapBoolOr-BoolColumn.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapBoolOr.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapIndex-Against-InList.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapIndex-ChooseHashJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapIndexApply-Basic-SelfJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapIndexApply-Basic-TwoTables.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapIndexApply-Complex-Condition.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapIndexApply-InnerSelect-Basic.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapIndexApply-InnerSelect-PartTable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapIndexApply-PartTable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapIndexNLJWithProject.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapIndexNLJWithProjectNoFilt.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapIndexNLOJWithProject.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapIndexNLOJWithProjectNonPart.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapIndexScan-WithUnsupportedOperatorFilter.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapIndexScan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapIndexScanChooseIndex.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapIndexScanCost.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapIndexUnsupportedOperator.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapScan-Hetrogeneous-Partitioned.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapTableScan-AO-Btree-PickIndexWithNoGap.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapTableScan-AO-Btree-PickOnlyHighNDV.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapTableScan-AO-Btree.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapTableScan-AO.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapTableScan-AndCondition.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapTableScan-Basic.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapTableScan-ColumnOnRightSide.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapTableScan-ComplexConjDisj.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BitmapTableScan-ConjDisjWithOuterRefs.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Blocking-Spool-Parallel-Union-All.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BpCharMCVCardinalityEquals.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BpCharMCVCardinalityGreaterThan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BroadcastSkewedHashjoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BtreeIndexNLJWithProjectNoPart.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/BtreeIndexNLOJWithProject.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CArrayExpansionTest/JoinWithInListExpand.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CArrayExpansionTest/JoinWithInListNoExpand.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CJoinOrderDPTest/JoinOrderWithDP.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CJoinOrderDPTest/JoinOrderWithOutDP.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/FallBackToSerialAppend.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/NoOpMotionUsesOnlyGroupOutputColumns.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-ConstTable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-Insert.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-Select.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithNoRedistributableColumns.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithNotEqualNumOfDistrColumns.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithSingleNotRedistributableColumn.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/RandomDistributedChildrenUnhashableColumns.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/RedundantMotionParallelUnionAll.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/TwoHashedTables.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfMultipleSetRetFuncs.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfMultipleSetRetFuncsAndUnusedScalar.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfSetRefFuncsOnTopTbl.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfSetRetFuncsAndUnusedScalar.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfSingleSetRetFuncs.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CPruneColumnsTest/AllColsUsed.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CPruneColumnsTest/MultiLevelSubqueryWithSetRetFuncs.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CPruneColumnsTest/MultiLevelSubqueryWithSetRetFuncsAndScalarFuncs.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CPruneColumnsTest/PruneIntermediateUnusedColumns.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CPruneColumnsTest/UnusedSetRetFuncAndUsedScalarFunc.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CPruneColumnsTest/UsedSetRetFuncAndUnusedScalarFunc.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CSQ-VolatileTVF.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTAS-Random.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTAS-With-Global-Local-Agg.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTAS-random-distr.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTAS-random-distributed-from-replicated-distributed-table.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTAS-with-Limit.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTAS-with-hashed-distributed-external-table.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTAS-with-randomly-distributed-external-table.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTAS.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTAS_OrderedAgg_multiple_cols.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTE-1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTE-10.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTE-11.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTE-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTE-3.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTE-4.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTE-5.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTE-6.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTE-7.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTE-8.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTE-9.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTE-Join-Redistribute-Producer.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTE-NestedWithPrunedProducer.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTE-NoPushProperties.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTE-PartTbl.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTE-Preds1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTE-Preds2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTE-PushProperties.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTE-SetOp.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTE-ValuesScan-ProjList.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTE-volatile.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTE-with-random-filter.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTE15HAReplicated.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTE15Replicated.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTE2HAReplicated.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTE2Replicated.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTEConstraintDeriveNegation.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTEMergeGroupsCircularDeriveStats.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTEMisAlignedProducerConsumer.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTEWithMergedGroup.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTEWithOuterReferences.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTEWithVolatileFunction.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTEinlining.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTG-Filter.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CTG-Join.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CannotCollapseCascadeProjects.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CannotPullGrpColAboveAgg.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CapGbCardToSelectCard.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Cascaded-UnionAll-Differing-Cols-Order.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Cascaded-UnionAll-Differing-Cols.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Cascaded-UnionAll-Same-Cols-Order.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CastOnSubquery.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CastedInClauseWithMCV.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CastedScalarIf-On-Index-Key.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Char-Cardinality.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CheckAsUser.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Citext-Cardinality.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Coalesce-With-Subquery.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CoerceToDomain.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CoerceViaIO.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CollapseCascadeProjects2of2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CollapseCascadeProjects2of3.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CollapseGb-MultipleColumn.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CollapseGb-Nested.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CollapseGb-SingleColumn.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CollapseGb-With-Agg-Funcs.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CollapseGb-Without-Agg-Funcs.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CollapseNot.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CollapseProject-SetReturning-CTE.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CollapseProject-SetReturning.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CompositeTypeRelMdId.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ComputedGroupByCol.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ConstScalarFuncNotPushedBelowGather.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ConstTblGetUnderSubqUnderProjectNoOuterRef.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ConstTblGetUnderSubqUnderProjectWithOuterRef.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ConstTblGetUnderSubqWithNoOuterRef.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ConstTblGetUnderSubqWithOuterRef.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ConstraintIntervalIncludesNull.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ConstraintIntervalNotIncludesNull.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ConstraintIntervalWithBoolIncludesNull.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ConstraintIntervalWithBoolNotIncludesNull.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ConstraintIntervalWithInIncludesNull.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ConstraintIntervalWithInIncludesNullArray.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ConstraintIntervalWithInNotIncludesNull.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ConstraintIntervalWithMultiColumnsIncludeNull.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ConstraintIntervalWithMultiColumnsNotIncludeNull.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ConstraintIntervalWithNotIncludesNull.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ConvertBoolConstNullToConstTableFalseFilter.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ConvertHashToRandomInsert.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ConvertHashToRandomSelect.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Correlated-AntiSemiJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Correlated-LASJ-With-Outer-Col.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Correlated-LASJ-With-Outer-Const.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Correlated-LASJ-With-Outer-Expr.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Correlated-SemiJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Correlated-Stat-Function-Dependency-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Correlated-Stat-Function-Dependency-3.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Correlated-Stat-Function-Dependency.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Correlated-Stat-NDistinct-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Correlated-Stat-NDistinct-3.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Correlated-Stat-NDistinct-4.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Correlated-Stat-NDistinct-5.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Correlated-Stat-NDistinct.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CorrelatedAntiSemiJoin-True.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiJoin-Limit.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiJoin-True.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiNotIn-True.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CorrelatedLeftSemiNLJoinWithLimit.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CorrelatedNLJ-PartSelector-Subplan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CorrelatedNLJWithStreamingSpool.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CorrelatedNLJWithTrueCondition.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CorrelatedSemiJoin-True.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CorrelatedSubqueryWithAggWindowFunc.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Correlation-With-Casting-1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Correlation-With-Casting-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CountAny.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CountStar.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CoveringIndex-1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CoveringIndex-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CoveringIndex-3.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CoveringIndex-Cost-1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CoveringIndex-Cost-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CoveringIndex-DoesNotSupport-Gin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/CoveringIndex-DoesSupport-Gist.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DML-ComputeScalar-With-Outerref.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DML-Filter-With-OuterRef.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DML-Replicated-Input.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DML-UnionAll-With-OuterRef.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DML-UnionAll-With-Universal-Child.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DML-Volatile-Function.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DML-With-CoordinatorOnlyTable-1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DML-With-CorrelatedNLJ-With-Universal-Child.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DML-With-HJ-And-UniversalChild.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DML-With-Join-With-Universal-Child.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DML-With-WindowFunc-OuterRef.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DMLCollapseProject.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DPE-IN.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DPE-NOT-IN.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DPE-SemiJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DPE-with-unsupported-pred.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DPv2GreedyOnly.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DPv2MinCardOnly.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DPv2QueryOnly.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DQA-1-RegularAgg.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DQA-2-RegularAgg.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DQA-GroupBy-HashAggregate1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DQA-GroupBy-HashAggregate2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DQA-InnerJoin-GroupBy-HashAggregate.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DQA-KeepOuterReference.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DQA-NonRedistributableCol.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DQA-SplitScalar.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DQA-SplitScalarOnDistCol.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DQA-SplitScalarWithAggAndGuc.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DQA-SplitScalarWithGuc.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DTS-Hetrogeneous-Partitioned.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Date-TimeStamp-HashJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DeduplicatePredicates.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Delete-Check-AssignedQueryIdForTargetRel.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Delete-With-Limit-In-Subquery.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DeleteMismatchedDistribution.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DeleteRandomDistr.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DeleteRandomlyDistributedTable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DeleteRandomlyDistributedTableJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DirectDispatch-DynamicIndexScan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId-MultiCol-Conjunction.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId-SingleCol-Conjunction.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DirectDispatch-IndexScan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DirectDispatch-MultiCol-Disjunction.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DirectDispatch-MultiCol-Negative.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DirectDispatch-MultiCol.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DirectDispatch-RandDistTable-Disjunction.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DirectDispatch-RandDistTable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DirectDispatch-SingleCol-Disjunction-IsNull.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DirectDispatch-SingleCol-Disjunction-Negative.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DirectDispatch-SingleCol-Disjunction.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DirectDispatch-SingleCol.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DisableBroadcastThreshold.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DiscardRedistributeHashJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Distinct-LegacyOpfamily.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DistinctAgg-NonSplittable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DistinctQueryWithMotions.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DonotPushPartConstThruLimit.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DontAddRedistributeBeforeInsert-1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DontAddRedistributeBeforeInsert-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DoubleNDVCardinalityEquals.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DqaHavingMax.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DqaMax.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DqaMin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DqaNoRedistribute.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DqaSubqueryMax.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DuplicateGrpCol.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicBitmapBoolOp.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicBitmapIndexScan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicBitmapTableScan-Basic.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicBitmapTableScan-Heterogeneous.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicBitmapTableScan-UUID.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicIndexGet-OuterRefs.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicIndexGetDroppedCols.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicIndexOnlyScan-Homogenous.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicIndexOnlyScan-InnerJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicIndexOnlyScan-LeftJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicIndexOnlyScanCosting.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicIndexScan-BoolFalse.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicIndexScan-BoolTrue.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicIndexScan-DefaultPartition-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicIndexScan-DefaultPartition.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicIndexScan-DroppedCols.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicIndexScan-DroppedColumns.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-EnabledDateConstraint.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-NoDTS.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-Overlapping.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-PartSelectEquality.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-PartSelectRange.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-Union.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-UnsupportedConstraint.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-UnsupportedPredicate.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicIndexScan-Homogenous-EnabledDateConstraint.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicIndexScan-Homogenous-UnsupportedConstraint.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicIndexScan-Homogenous.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicIndexScan-OpenEndedPartitions.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicIndexScan-Relabel.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/DynamicIndexScanCosting.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/EagerAggEmptyInput.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/EagerAggExpression.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/EagerAggGroupColumnInJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/EagerAggMax.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/EagerAggMaxWithNestedLoop.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/EagerAggMinMax.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/EagerAggSubquery.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/EagerAggUnsupportedAgg.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/EffectOfLocalPredOnJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/EffectOfLocalPredOnJoin3.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/EffectsOfJoinFilter.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/EqualityJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/EqualityPredicateOverDate.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/EquiJoinOnExpr-Supported.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/EquiJoinOnExpr-Unsupported.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Equiv-HashedDistr-1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Equiv-HashedDistr-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/EquivClassesAndOr.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/EquivClassesIntersect.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/EquivClassesLimit.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/EquivClassesUnion.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Equivalence-class-project-over-LOJ.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/EstimateJoinRowsForCastPredicates.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Except-Volatile-Func.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Except.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ExceptAllCompatibleDataType.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ExceptHashCompatibleRange.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ExceptHashIncompatibleRange.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ExistentialSubquriesInsideScalarExpression.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Exists-SuperfluousEquality.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ExistsSubqInsideExpr.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ExpandJoinOrder.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ExpandNAryJoinGreedyWithLOJOnly.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ExprOnScSubqueryWithOuterRef.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ExternalTable1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ExternalTable2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ExternalTable3.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ExternalTable4.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ExternalTableWithFilter.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ExtractOneBindingFromScalarGroups.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ExtractPredicateFromDisjWithComputedColumns.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/FOJ-Condition-False.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Factorized-Preds.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/FieldSelect.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/FilterScalarCast.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/FoldedArrayCmp.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ForeignPartOneTimeFilterDPE.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ForeignPartUniform.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ForeignScanExecLocAnyJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ForeignScanExecLocAnySimpleScan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Forward-IndexOnlyScan-OrderBy-on-MultiCol-Index.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Forward-IndexScan-OrderBy-on-MultiCol-Index.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Forward-IndexScan-OrderBy-on-SingleCol-Index.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/FullJoin-2PredicateOnDistColumns.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/FullJoin-Caps.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/FullJoin-InnerNotOnDistributionColumn.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/FullJoin-NonDefaultOpfamily.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/FullJoin-NotOnDistributionColumn.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/FullJoin-NullPredicate.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/FullJoin-OnDistributionColumn.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/FullJoin-PredicateOnSameTable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/FullJoin-Replicated.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/FullJoin-Subquery-CastedPredicates.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/FullJoin-SubquerySingleton.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/FullJoin-SubqueryWithRedistribute.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/FullJoin-SwappedPredicates.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/FullOuterJoin-NullRejectingLHS1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/FullOuterJoin-NullRejectingLHS2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/FullOuterJoinLeftMultiplyRightMaxCard.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/FullOuterJoinMaxCardLeftChild.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/FullOuterJoinMaxCardRightChild.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/FullOuterJoinZeroMaxCard.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/FunctionWithQueryParam.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Gb-on-keys.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/GinIndex.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/GinIndexPathOpfamily.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/GinIndexSearchModeAll.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Gist-AOCOTable-NonLossy-BitmapIndexPlan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Gist-NestedLoopJoin-Lossy-IndexPlan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Gist-NestedLoopJoin-Postgis-IndexPlan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Gist-NonPart-Lossy-BitmapIndexPlan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Gist-NonPart-Lossy-IndexPlan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Gist-OrderBy-BitmapPlan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Gist-OrderBy-IndexPlan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Gist-PartTable-Lossy-IndexPlan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Gist-PartTable-NonLossy-BitmapIndexPlan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Gist-PartialIndex-TableScan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/GreedyNAryDelayCrossJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/GreedyNAryJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/GreedyNAryJoinWithDisconnectedEdges.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/GreedyNAryOnlyCrossJoins.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/GroupByEmptySetNoAgg.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/GroupByOuterRef.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/GroupingOnSameTblCol-1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/GroupingOnSameTblCol-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/GroupingSets.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/HAWQ-TPCH-Stat-Derivation.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/HJN-DPE-Bitmap-Outer-Child.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/HJN-DeeperOuter.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/HJN-Redistribute-One-Side.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Hash-BitmapScan-InArray.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Hash-BitmapScan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Hash-IndexScan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Hash-TableScan-AllArray.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/HashJoinOnRelabeledColumns.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Hint-AbsoluteRows-Over-Join.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Hint-AddRows-Over-Join.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Hint-BitmapScan-Over-Table.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Hint-IndexOnlyScan-Over-Table.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Hint-IndexScan-Over-Join.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Hint-IndexScan-Over-Table.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Hint-Leading-Directed.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Hint-Leading-Multiple.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Hint-Leading-NonDirected.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Hint-MultiplyRows-Over-Join.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Hint-NoBitmapScan-Over-Table.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Hint-NoIndexOnlyScan-Over-Table.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Hint-NoIndexScan-Over-Table.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Hint-SeqScan-Over-Join.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Hint-SeqScan-Over-Table.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Hint-SubtractRows-Over-Join.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IDF-NotNullConstant.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IDF-NullConstant.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IN-ArrayCmp.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IN-Nulls-ArrayCmpAny.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IN-Numeric.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IN.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/INDF-NotNullConstant.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/INDF-NullConstant.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InClauseWithMCV.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InEqualityJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefColumnIn.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefColumnPlusConstIn.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefConstIn.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InSubqWithPrjListReturnSet.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InSubqueryWithNotNullCol.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Index-Join-With-Subquery-In-Pred.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply-Heterogeneous-BothSidesPartitioned.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply-Heterogeneous-DTS.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply-Heterogeneous-NoDTS.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply-IndexCondDisjointWithHashedDistr.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply-IndexCondIntersectWithHashedDistr.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply-IndexCondMatchHashedDistr.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply-IndexCondSubsetOfHashedDistr.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply-IndexCondSupersetOfHashedDistr.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply-IndexOnCoordinatorOnlyTable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply-InnerSelect-Basic.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply-InnerSelect-Heterogeneous-DTS.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply-InnerSelect-PartTable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply-InnerSelect-PartTable2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply-LeftOuter-NLJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply-MultiDistKey-WithComplexPreds.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply-MultiDistKeys-Bitmap-WithComplexPreds.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply-MultiDistKeys-Bitmap.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply-MultiDistKeys-IncompletePDS-3-DistCols.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply-No-Motion-Below-Join.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply-PartKey-Is-IndexKey.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply-PartResolverExpand.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply-PartTable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply-Redistribute-Const-Table.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply1-CalibratedCostModel.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply3.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply4.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexApply_NestLoopWithNestParamTrue.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexConstraintsMDidCache.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexGet-OuterRefs.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexNLJ-IndexGet-OuterRef.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexNLJoin_Cast_NoMotion.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexOnLeaf-AddNewPartitionToRootTableContainingHeterogenousIndex.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexOnLeaf-AddPartitionToRootWithHomogenousIndex.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexOnLeaf-IndexOnPartitionsWithDifferentStorageTypes.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHeterogenousIndex-ANDPredicate-AO.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHeterogenousIndex-ANDPredicate-HEAP.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHomogenousIndexesOnRoot-ANDPredicate-AO.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHomogenousIndexesOnRoot-ORPredicate-AO.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ANDPredicate-AO.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ANDPredicate-HEAP.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHeterogenousIndex-ORPredicate-AO.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHomogenousIndexesOnRoot-ANDPredicate-AO.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHomogenousIndexesOnRoot-AO.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexOnLeaf-OverlappingHomogenousIndexesOnRoot-ORPredicate-AO.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-1-AO.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-1-HEAP.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-2-AO.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-2-HEAP.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexOnlyScan-CTE.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexOnlyScan-NoDistKeyInIndex.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexOnlyScan-OrderBy-on-MultiCol-NonIndex.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexOnlyScanCosting.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexScan-AOTable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexScan-AndedIn.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexScan-BoolFalse.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexScan-BoolTrue.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexScan-DroppedColumns.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexScan-IsNotNullPred.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexScan-IsNullPred.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexScan-ORPredsAOPart.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexScan-ORPredsNonPart.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexScan-OrderBy-on-MultiCol-NonIndex.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexScan-OrderBy-on-Multiple-IndexCols.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexScan-OrderBy-on-NonIndexCol.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexScan-OrderBy-on-Single-IndexCol.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexScan-Relabel.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexScanCosting.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexScanWithNestedCTEAndSetOp.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IndexedNLJBitmap.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InferPredicates.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InferPredicatesBCC-oid-oid.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InferPredicatesBCC-txt-txt.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InferPredicatesBCC-vc-txt.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InferPredicatesBCC-vc-vc.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InferPredicatesBCC-vcpart-txt.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InferPredicatesForLimit.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InferPredicatesForPartSQ.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InferPredicatesForProcessedColumn.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InferPredicatesForQuantifiedSQ.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InferPredicatesFromExistsSubquery.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InferPredicatesFromMultiSubquery.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InferPredicatesInnerOfLOJ.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InferPredicatesIntFromExistsSubquery.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InferPredicatesIntFromSubquery.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InferPredicatesJoinSubquery.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InferPredicatesMultiColumns.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InferredPredicatesConstraintSimplification.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InnerJoin-With-OuterRefs.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InnerJoinBroadcastTableHashSpec.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InnerJoinOverJoinExcept.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InnerJoinOverJoinExceptAll.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InnerJoinReplicatedTableHashSpec.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Insert-AO-Partitioned-SortDisabled.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Insert-AO-Partitioned.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Insert-AO.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Insert-With-HJ-CTE-Agg.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Insert.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InsertAssertSort.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InsertCheckConstraint.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InsertConstTuple.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InsertConstTupleRandomDistribution.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InsertConstTupleVolatileFunction.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InsertConstTupleVolatileFunctionMOTable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InsertCoordinatorOnlyTable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InsertCoordinatorOnlyTableConstTuple.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InsertDirectedDispatchNullValue.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InsertIntoNonNullAfterDroppingColumn.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InsertMismatchedDistrubution-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InsertMismatchedDistrubution.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InsertNULLNotNULLConstraint.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InsertNoEnforceConstraints.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InsertNonSingleton.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InsertNotNullCols.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InsertPrimaryKeyFromMOTable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InsertProjectSort.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InsertRandomDistr.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InsertReplicatedIntoSerialHashDistributedTable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InsertSort.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InsertSortDistributed2CoordinatorOnly.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InsertWithDroppedCol.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Int2Predicate.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Intersect-OuterRefs.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Intersect-Volatile-Func.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InvalidDeleteGather.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InvalidPlan_CTE-2-all-plans.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InvalidPlan_IncompatibleDistributionOnJoinBranches.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InvalidPlan_MotionGatherFromCoordinatorToCoordinator-ScalarDQA.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InvalidPlan_MotionGatherFromCoordinatorToCoordinator.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/InvalidUpdatePlan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/IsNullUnionAllIsNotNull.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JOIN-NonRedistributableCol.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JOIN-Pred-Cast-Int4.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JOIN-Pred-Cast-Varchar.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JOIN-cast2text-int4-Eq-cast2text-double.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JOIN-int4-Eq-double.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JOIN-int4-Eq-int2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Join-Disj-Subqs.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Join-IDF.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Join-INDF-NoBroadcast.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Join-INDF-Nulls-Not-Collocated.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Join-INDF.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Join-Varchar-Equality.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Join-WinFunc-Preds.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Join-With-Subq-Preds-1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Join-With-Subq-Preds-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JoinAbsEqWithoutOpfamilies.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityAboveLimit.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityAtLimit.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityBelowLimit.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JoinBelowUnionAll.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JoinCitextVarchar.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JoinColWithOnlyNDV.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JoinCombinedHashSpecNullsNotColocated.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JoinDefaultOpfamiliesUsingNonDefaultOpfamilyOp.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JoinNDVRemain.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JoinOnReplicatedUniversal.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JoinOnViewWithCastedColumn.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JoinOnViewWithCastedColumnAndSubqueryInPredicate.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JoinOnViewWithMixOfPushableAndNonpushablePredicates.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JoinOnViewWithSetReturningColumn.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JoinOnViewWithVolatileColumn.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JoinOptimizationLevelGreedyNonPartTblInnerJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JoinOptimizationLevelQuery3WayHashJoinPartTbl.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JoinOptimizationLevelQueryNonPartTblInnerJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JoinOrderDPE.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JoinPlan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JoinPlanWithRedistribute.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JoinPredFalseFilter.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JoinTinterval.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JoinWithSingletonAndSingletonBranches.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JoinWithSingletonAndUniversalBranches.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/JoinWithSubqueryProjectColumn.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Join_OuterChild_DistUniversal.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LASJ-Not-In-Force-Broadcast.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LIKE-Pattern-Empty.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LIKE-Pattern-green-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LIKE-Pattern-green.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ-Condition-False.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ-DynBitmapIndex.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ-DynBitmapIndexWithSelect.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ-DynBtreeIndex.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ-DynBtreeIndexWithSelect.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ-HashJoin-MultiDistKeys-WithComplexPreds.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ-IndexApply-CompsiteKey-Equiv.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ-IndexApply-CompsiteKey-NoMotion.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ-IndexApply-CoordinatorOnly-Table.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ-IndexApply-DistKey-Multiple-Predicates.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKey-MultiIndexKey-NoExtraFilter.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKey-MultiIndexKey.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-Bitmap-WithComplexPreds.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-Bitmap.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-IndexKeys.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ-IndexApply-MultiDistKeys-WithComplexPreds.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ-IndexApply-MultiIndexes.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ-IndexApply-Negative-NonEqual-Predicate.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ-IndexApply-NonDistKey.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ-IndexApply-WithComplexPredicates.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ-IsNullPred.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ-PushDown.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ-With-Agg.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ-With-Single-Pred-On-Outer.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJNonNullRejectingPredicates.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJNullRejectingPredicates.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJNullRejectingZeroPlacePredicates.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJReorderComplexNestedLOJs.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJReorderWithComplexPredicate.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJReorderWithIDF.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJReorderWithNestedLOJAndFilter.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJReorderWithOneSidedFilter.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJReorderWithSimplePredicate.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJWithFalsePred.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ_IDF_no_convert_outer_ref_predicate_with_NULL.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ_IDF_no_convert_outer_ref_predicate_with_inner_ref.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ_NULLTEST-On-SelfCheck-Pred.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ_bb_mpph.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ_convert_to_inner_with_and_predicate.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ_convert_to_inner_with_inner_predicate_IDF.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ_convert_to_inner_with_or_predicate.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ_dont_convert_to_inner_with_inner_predicate_IDF_const.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ_dont_convert_to_inner_with_outer_predicate_INDF.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LOJ_dont_convert_to_inner_with_outer_predicate_INDF_const.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LargeJoins.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LargeMultiColumnInList.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Lead-Lag-WinFuncs.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Least-Greatest-Subselect.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Least-Greatest.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LeftJoin-DPv2-With-Select.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LeftJoin-UnsupportedFilter-Cardinality.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LeftJoin-With-Coalesce.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LeftJoin-With-Col-Const-Pred.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LeftJoin-With-Pred-On-Inner.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LeftJoin-With-Pred-On-Inner2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LeftJoinBroadcastTableHashSpec.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LeftJoinDPv2JoinOrder.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LeftJoinNullsNotColocated.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LeftJoinPruning.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LeftJoinPruningInOuterInnerQuery.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LeftJoinPruningInnerQuery.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LeftJoinPruningOuterQuery.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LeftOuter2InnerUnionAllAntiSemiJoin-Tpcds.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LeftOuter2InnerUnionAllAntiSemiJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LeftSemiJoinCE.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LeftSemiJoinWithRepOuterTab.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LikePredStatsNotComparable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ListPartLossyCastEq.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ListPartLossyCastLT.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ListPartLossyCastNEq.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/LogicalIndexGetDroppedCols.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MDQA-SameDQAColumn.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MDQAs-Grouping-OrderBy.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MDQAs-Grouping.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MDQAs-Union.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MDQAs1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ManyTextUnionsInSubquery.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Max-Aggregate-uses-IndexScan-and-Limit.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Min-Aggregate-uses-IndexScan-and-Limit.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Minidump.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MissingBoolColStats.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MissingStats.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MotionHazard-MaterializeUnderResult.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MotionHazard-NoMaterializeGatherUnderResult.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MotionHazard-NoMaterializeHashAggUnderResult.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MotionHazard-NoMaterializeSortUnderResult.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MultiColumnAggWithDefaultOpfamilies.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MultiColumnDQA-InnerJoin-GroupBy-HashAggregate.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MultiDistKeyJoinCardinality.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MultiDistKeyWithOtherPredsJoinCardinality.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MultiLevel-CorrelatedExec.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MultiLevel-IN-Subquery.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MultiLevel-NOT-IN-Subquery.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MultiLevelDecorrelationWithSemiJoins.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MultiLevelPartLossyCastNEq.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MultipleDampedPredJoinCardinality.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MultipleIndependentPredJoinCardinality.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MultipleIndexPredicate.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MultipleSetReturningFunction-1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MultipleSetReturningFunction-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MultipleSetReturningFunction-3.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MultipleSubqueriesInSelectClause.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/MultipleUpdateWithJoinOnDistCol.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NLJ-BC-Outer-Spool-Inner.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NLJ-Broadcast-DPE-Outer-Child.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NLJ-DistCol-No-Broadcast.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NLJ-EqAllCol-No-Broadcast.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NLJ-EqDistCol-InEqNonDistCol-No-Broadcast.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NLJ-InEqDistCol-EqNonDistCol-Redistribute.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NLJ-Rewindability-CTAS.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NLJ-Rewindability.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NOT-IN-ArrayCmp.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NOT-IN-NotNullBoth.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NOT-IN-NullInner.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NOT-IN-NullOuter.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Name-Cardinality.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NaryWithLojAndNonLojChilds.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NdvPreservingExprProjectionEquiJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NdvPreservingExprProjectionNonEquiJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Negative-IndexApply1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Negative-IndexApply2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Nested-Or-Predicates.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Nested-Setops-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Nested-Setops.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NestedInSubqWithPrjListOuterRefNoInnerRef.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NestedJoinWithCastedColumn.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NestedNLJWithBlockingSpool.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NestedProjectCountStarWithOuterRefs.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NestedSubqLimitBindings.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NewBtreeIndexScanCost.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NoBroadcastUnderGatherForWindowFunction.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NoDistKeyMultiPredJoinCardinality.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NoHashAggWithoutPrelimFunc.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NoMissingStats.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NoMissingStatsAfterDroppedCol.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NoMissingStatsAskingForSystemColFOJ.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NoMissingStatsForEmptyTable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NoMotionsPlan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NoPartConstraint-WhenNoDefaultPartsAndIndices.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NoPartPropagationPlan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NoPushdownPredicateWithCTEAnchor.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NoRedistributeOnAppend.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NoSortPlan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Non-Hashjoinable-Pred-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Non-Hashjoinable-Pred.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NonOverlappingHomogenousIndexesOnRoot-ANDPredicate-HEAP.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NonSingleton.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NonSplittableAgg.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NotExists-SuperflousOuterRefWithGbAgg.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NotExists-SuperfluousEquality.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NotInToLASJ.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NotWellDefinedDisjunctConjunctPredicates.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NullConstant-INDF-Col.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/NullIf-With-Subquery.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/OR-WithIsNullPred.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/OR.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/OneDistKeyMultiPredJoinCardinality.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/OneLevel-CorrelatedExec.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/OneSegmentGather.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/OptimizerConfigWithSegmentsForCosting.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/OrderByNoRedundantSort.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/OrderByNullsFirst.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/OrderByOuterRef.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/OrderedAggUsingGroupColumnInDirectArg.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/OrderedAgg_array_fraction.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/OrderedAgg_computed_col.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/OrderedAgg_multiple_diffcol.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/OrderedAgg_multiple_samecol.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/OrderedAgg_multiple_samecol_difforderespec.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/OrderedAgg_single.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/OrderedAgg_skewed_data.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/OrderedAgg_with_groupby.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/OrderedAgg_with_nonOrderedAgg.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/OrderedAgg_with_nonconst_fraction.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/OuterJoin-With-OuterRefs.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/OuterJoinOnViewWithCastedColumn.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/OverlappingHomogenousIndexesOnRoot-ANDPredicate-HEAP.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/OverlappingHomogenousIndexesOnRoot-HEAP.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ParallelUnionAllWithJson.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Part-Selection-ConstArray-1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Part-Selection-ConstArray-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Part-Selection-IN.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Part-Selection-NOT-IN.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartConstraint-WhenDefaultPartsAndIndices.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartConstraint-WhenIndicesAndNoDefaultParts.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartConstraint-WithOnlyDefaultPartInfo.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartForeignDifferentExecLocation.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartForeignDifferentServer.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartForeignMixed.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartForeignMixedDPE.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartForeignMixedSPE.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartForeignUniformSPE.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartPredsWithRandom.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartSelectorOnJoinSide.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartSelectorOnJoinSide2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-AggWithExistentialSubquery.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-ArrayCoerce.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-ArrayIn.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-AsymmetricRangePredicate.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-AvoidRangePred-DPE.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-CSQ-NonPartKey.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-CSQ-PartKey.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-ComplexPredicate1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-ComplexPredicate2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-ComplexPredicate3.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-ComplexPredicate4.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-ComplexPredicate5.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-ComplexRangePredicate-DefaultPart.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-ComplexRangePredicate-NoDefaultPart.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-DPE-Correlated-NLOuter.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-DPE-DynamicIndexOnlyScan-Range.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-DPE-GroupBy.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-DPE-Limit.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-DPE-Opfamily.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-DPE-WindowFunction.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-DPE.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-DTS.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-DTSEq.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-DTSLessThan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-DateTime.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-DisablePartSelection.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-DisablePartSelectionJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-Disjunction.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-EqPredicateWithCastRange.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-HJ1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-HJ2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-HJ3.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-HJ4.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-HJ5.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-IDFList.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-IDFNull.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-IDFWithCast.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-IndexOnDefPartOnly.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-IsNotNullPredicate.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-IsNullPredicate.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-JoinOverExcept.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-JoinOverGbAgg-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-JoinOverGbAgg.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-JoinOverIntersect.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-JoinOverUnion-1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-JoinOverUnion-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-LASJ.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-LeftOuterHashJoin-DPE-IsNull.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-LeftOuterNLJoin-DPE-IsNull.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-List-DPE-Int-Predicates.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-List-DPE-Varchar-Predicates.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-MultiWayJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-MultiWayJoinWithDPE-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-MultipleEqPredicates.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-NEqPredicate.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-NLJ.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-NonConstSelect.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-PredicateWithCast.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-PredicateWithCastList.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-PredicateWithCastMultiLevelList.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-RangeJoinPred.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-Relabel-Equality.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-Relabel-Range.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-RightOuterHashJoin-DPE-IsNull-V2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-SPE-Boolean1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-SPE-Boolean2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost3.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost4.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-List-Cost5.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost3.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost4.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-SPE-DynamicTableScan-Range-Cost5.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-SQAll.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-SQAny.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-SQExists.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-SQNotExists.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-SQScalar.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-SubqueryOuterRef.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-VolatileFunc.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-WindowFuncNoDisjunctPredPushDown.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-WindowFuncNoPredPushDown.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-WindowFuncPartialPredPushDown.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-WindowFuncPredPushDown.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-WindowFuncSinglePredPushDown.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PartTbl-WindowFunction.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PredStatsNotComparable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PredicateWithConjunctsAndDisjuncts.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PredicateWithConjunctsOfDisjuncts.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PredicateWithLongConjunction.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Preds-Over-WinFunc1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Preds-Over-WinFunc2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Preds-Over-WinFunc3.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Preds-Over-WinFunc4.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Preds-Over-WinFunc5.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PreventIndexOnlyScanOnAppendOnlyVersion6UpgradedTable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PreventIndexOnlyScanOnMixedAppendOnlyPartitionedTableContainingAppendOnlyVersion6Child.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PreventIndexOnlyScanOnMixedPartitionedTableContainingAppendOnlyVersion6Child.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Project-With-NonScalar-Func.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ProjectCountStar.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ProjectCountStarWithOuterRefs.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ProjectOutsideCountStar.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ProjectRepeatedColumn1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ProjectRepeatedColumn2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ProjectSetFunction.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ProjectUnderSubq.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ProjectWithConstant.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ProjectWithTextConstant.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Push-Subplan-Below-Union.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-10.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-11.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-12.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-13.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-14.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-15.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-16.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-17.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-3.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-4.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-5.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-6.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-7.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-8.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-9.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PushFilterToSemiJoinLeftChild.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PushGbBelowJoin-NegativeCase.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PushGbBelowNaryUnion-1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PushGbBelowNaryUnion-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PushGbBelowNaryUnionAll.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PushGbBelowUnion.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PushGbBelowUnionAll.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PushSelectDownUnionAllOfCTG.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/PushSelectWithOuterRefBelowUnion.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Query.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/QueryMismatchedDistribution-DynamicIndexScan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/QueryMismatchedDistribution.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/RTErequiredPerms.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/RangePartLossyCastEqInPartitionRange.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/RangePartLossyCastEqOnEndPartitionRange.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/RangePartLossyCastLTEqInPartitionRange.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/RangePartLossyCastLTEqOnEndPartitionRange.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/RangePartLossyCastLTInPartitionRange.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/RangePartLossyCastLTOnEndPartitionRange.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Remove-Distinct-From-Subquery.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/RemoveImpliedPredOnBCCPredicates.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/RemoveUnusedProjElements.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/RemoveUnusedProjElementsInGbAgg.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ReplicatedHashJoinReplicated.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ReplicatedJoinHashDistributedTable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ReplicatedJoinPartitionedTable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ReplicatedJoinRandomDistributedTable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ReplicatedLOJHashDistributedTable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ReplicatedLOJRandomDistributedTable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ReplicatedLOJReplicated.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ReplicatedNLJReplicated.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ReplicatedTable-CTAS.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ReplicatedTableAggregate.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ReplicatedTableCTE.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ReplicatedTableGroupBy.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ReplicatedTableInClause.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ReplicatedTableInsert.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ReplicatedTableSelect.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ReplicatedTableSequenceInsert.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ReplicatedTableWithAggNoMotion.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/RightJoinBothReplicated.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/RightJoinDPE.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/RightJoinDpeWithWhereClause.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/RightJoinHashed.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/RightJoinNoDPSNonDistKey.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/RightJoinRedistribute.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/RightJoinReplicated.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/RightJoinTVF.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/RollupNoAgg.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ScSubqueryWithOuterRef.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ScalarCorrelatedSubqueryCountStar.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ScalarDQAWithNonScalarAgg.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ScalarFuncPushedBelowGather.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ScalarSubq-Eq-SubqAll-1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ScalarSubq-Eq-SubqAll-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ScalarSubqueryCountStar.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ScalarSubqueryCountStarInJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Select-Over-CTEAnchor.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Select-Over-PartTbl.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Select-Proj-OuterJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SelectCheckConstraint.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SelectOnBpchar.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SelectOnCastedCol.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Self-Comparison-Nullable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Self-Comparison.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SelfJoinDampedPredJoinCardinality.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SelfUpdate.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SemiJoin2InnerJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SemiJoin2Select-1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SemiJoin2Select-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SemiJoin2Select-EnforceSubplan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SemiJoinDPE.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SemiJoinWithWindowsFuncInSubquery.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Sequence-With-Universal-Outer.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SimpleArrayCoerceCast.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SimplifyExistsSubquery2Limit.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SingleColumnHomogenousIndexOnRoot-AO.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SingleColumnHomogenousIndexOnRoot-HEAP.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SixWayDPv2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SortOverStreamAgg.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SpoolShouldInvalidateUnresolvedDynamicScans.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SqlFuncDmlScalar.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SqlFuncDmlTvf.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SqlFuncNullReject.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SqlFuncPredFactorize.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Stat-Derivation-Leaf-Pattern.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Stats-For-Select-With-Outer-Refs.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/StatsFilter-AnyWithNewColStats.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Subq-JoinWithOuterRef.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Subq-NoParams.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Subq-On-OuterRef.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Subq-With-OuterRefCol.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Subq2CorrSQInLOJOn.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Subq2NotInWhereLOJ.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Subq2OuterRef2InJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Subq2OuterRefMultiLevelInOn.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Subq2PartialDecorrelate.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SubqAll-InsideScalarExpression.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SubqAll-Limit1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SubqAll-To-ScalarSubq.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SubqAny-InsideScalarExpression.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SubqEnforceSubplan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SubqExists-With-External-Corrs.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SubqExists-Without-External-Corrs.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SubqInIndexPred.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SubqOuterReferenceInClause.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Subquery-AnyAllAggregates.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Subquery-ExistsAllAggregates.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Subquery-ExistsAllAggregatesWithDisjuncts.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SubqueryInsideArrayRef.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SubqueryInsideArrayRefIndexList.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SubqueryInsideScalarIf.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SubqueryNoPullUpTableValueFunction.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SubqueryNullTest.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SubqueryOuterRefLimit.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SubqueryOuterRefTVF.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Switch-With-Subquery.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SystemColCtidStats.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/SystemColSegIdStats.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/TPCDS-39-InnerJoin-JoinEstimate.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/TPCH-Partitioned-256GB.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/TVF-With-Deep-Subq-Args.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/TVF.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/TVFAnyelement.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/TVFCorrelatedExecution.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/TVFGenerateSeries.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/TVFRandom.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/TVFVolatileJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/TaintedReplicatedAgg.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/TaintedReplicatedFilter.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/TaintedReplicatedLimit.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/TaintedReplicatedTablesCTE.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/TaintedReplicatedWindowAgg.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/TextMCVCardinalityEquals.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/TextMCVCardinalityGreaterThan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ThreeStageAgg-DistinctOnComputedCol.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ThreeStageAgg-DistinctOnDistrCol.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ThreeStageAgg-DistinctOnSameNonDistrCol.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ThreeStageAgg-GbMultipleCol-DistinctOnDistrCol.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ThreeStageAgg-GbandDistinctOnDistrCol.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ThreeStageAgg-ScalarAgg-DistinctComputedCol.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ThreeStageAgg-ScalarAgg-DistinctDistrCol.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ThreeStageAgg-ScalarAgg-DistinctNonDistrCol.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ThreeStageAgg.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/TimeStamp-Date-HashJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Tpcds-10TB-Q37-NoIndexJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Tpcds-NonPart-Q70a.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/TranslateFilterDisjunctQuals.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/TranslateFilterWithCTEAndTableScanIntoFilterAndOneTimeFilter.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/TranslateOneTimeFilterConjunctQuals.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/TypeModifierArrayRef.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/TypeModifierCast.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/TypeModifierColumn.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/TypeModifierConst.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/TypeModifierDoubleMappableConst.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UDA-AnyArray.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UDA-AnyElement-1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UDA-AnyElement-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Union-Distributed-Table-With-Const-Table.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Union-NOT-Plus-OR-Constraint.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Union-OuterRefs-Casting-Output.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Union-OuterRefs-InnerChild.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Union-OuterRefs-Output.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Union-Over-UnionAll.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/Union-Volatile-Func.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UnionAll.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UnionAllCompatibleDataType.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UnionAllWithTruncatedOutput.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UnionGbSubquery.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UnionOfDQAQueries.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UnionWithCTE.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UnionWithOuterRefs.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UnnestSQJoins.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UnsupportedStatsPredicate.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UpdateCardinalityAssert.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UpdateCheckConstraint.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UpdateDistKeyMismatchedDistribution.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UpdateDistKeyWithNestedJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UpdateDistrKey.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UpdateDroppedCols.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UpdateNoCardinalityAssert.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UpdateNoDistKeyMismatchedDistribution.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UpdateNoEnforceConstraints.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UpdateNotNullCols.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UpdatePartTable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UpdateRandomDistr.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UpdateUniqueConstraint-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UpdateUniqueConstraint.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UpdateVolatileFunction.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UpdateWindowGatherMerge.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UpdateWithHashJoin.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UpdateZeroRows.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UpdatingDistributionColumn.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UpdatingMultipleColumn.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UpdatingNonDistColSameTable.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UpdatingNonDistributionColumnFunc.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/UseDistributionSatisfactionForUniversalInnerChild.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/ValueScanWithDuplicateAndSelfComparison.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/VarcharMCVCardinalityEquals.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/VarcharMCVCardinalityGreaterThan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/VariadicFlagWithFormatQuery.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/VariadicFlagWithJson.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/VariadicFlagWithUnionAll.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/VolatileFunctionsBelowScalarAgg.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/WinFunc-Redistribute-Sort-CTE-Producer.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/WinFunc-Simple.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/WinFuncWithSubqArgs.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/WindowFrame-SingleEdged.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/WindowFrameExcludeCurrentRow.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/WindowFrameExcludeGroup.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/WindowFrameExcludeTies.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/WindowFrameGroups.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/WindowFrameRangePrecedingAndFollowing.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/cte-duplicate-columns-1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/cte-duplicate-columns-2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/cte-duplicate-columns-3.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/cte-duplicate-columns-4.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/retail_28.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/sql/BitmapIndexScan.sql (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/sql/DynamicBitmapIndexScan.sql (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/minidump/window-count-gpdb6.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-cast_boundary_value_to_date.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-cast_partition_column_to_text.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-no_casting.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-predicate-on-all-levels.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-predicate-on-non-leaf-levels.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/multilevel-partitioning/Multilevel-Casting-predicate-on-non-root-levels.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-AllLevels-Default.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-AllLevels-NoDefault.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-Level1-Default.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-Level1-NoDefault.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-Level2-Default.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/multilevel-partitioning/Multilevel-ConstPred-Level2-NoDefault.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/multilevel-partitioning/Multilevel-FullScan.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/multilevel-partitioning/Multilevel-JoinPred-AllLevels.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/multilevel-partitioning/Multilevel-JoinPred-Level1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/multilevel-partitioning/Multilevel-JoinPred-Level2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/multilevel-partitioning/Multilevel-Nary-Join.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/CostModelConfigCalibrated.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/MDRequest.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/OptimizerConfig.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/f1-MissingAttribute.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/f10-BoolExpr-MissingChild.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/f11-BoolExpr-ExtraChild.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/f12-Const-MissingAttribute.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/f13-Case-Noelse.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/f14-Case-IncorrectCondition.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/f15-Case-MultipleElse.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/f16-Case-NoResultClause.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/f17-Limit-MissingCount.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/f2-UnrecognizedOp.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/f3-UnexpectedTag.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/f4-InvalidAttrValue.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/f5-UnexpectedTag.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/f6-UnexpectedTag.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/f7-UnexpectedTag.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/f8-UnexpectedTag.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/f9-UnexpectedTag.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q1-TS.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q10-Case.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q11-Limit.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q12-Limit-NoOffset.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q13-AGG-TS.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q14-FuncExpr-NoArg.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q15-FuncExpr-WithArgs.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q16-FuncExpr-WithNestedFuncExpr.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q17-AggRef.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q18-Sort-TS.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q19-DistinctFrom.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q2-HJ.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q20-DistinctFrom-HJ.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q22-Result.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q23-MJ.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q25-AppendPartTable.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q26-Metadata.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q28-Materialize.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q3-HJ2.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q30-LogicalOrderBy.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q31-LogicalLimit.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q32-ScalarSubquery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q33-ScalarSubqueryAny.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q34-SubqueryExists.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q35-ConstTable.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q36-Statistics.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q37-IndexScan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q39-Array.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q4-NLJ-GM.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q40-SubPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q41-LogicalTVF.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q41-SetOp.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q42-TableValuedFunction.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q43-LogicalCTE.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q44-Window.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q45-WindowWithFraming.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q46-LogicalWindow.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q47-WindowWithFraming.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q48-IndexOnlyScan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q49-Coalesce.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q5-HJ-RM.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q50-Switch.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q51-SwitchNoDefault.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q52-CaseTest.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q53-NullIf.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q54-WindowWithNoLeadingFrameEdge.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q55-Insert.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q56-Delete.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q57-DMLDelete.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q59-Update.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q6-opexpr.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q60-DMLUpdate.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q61-PlanWithStats.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q62-CTEPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q63-LogicalForeignGet.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q64-ExternalScan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q65-LogicalCTASHash.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q66-LogicalCTASRandom.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q67-PhysicalCTAS.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q68-ArrayRef1.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q69-ArrayRef2.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q7-boolexpr.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q70-BitmapIndexProbe.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q72-BitmapBoolOp.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q73-LogicalLimit-NonRemovable.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q74-DirectDispatchInfo.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q75-MinMax.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q76-ValuesScan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q8-boolexpr-not.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/q9-constval.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/s01-ConstValue.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/s02-NestedFuncExpr.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/parse_tests/sax-fail.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/query/dxl-q17.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/query/dxl-q18.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/query/dxl-q19.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/query/dxl-q23.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/search/strategy0.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/search/timeout-strategy.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/search/wrong-strategy.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/ArrayCmpAny-Input-1.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/ArrayCmpAny-Output-1.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Basic-Statistics-Input.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Basic-Statistics-Output.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Disj-Input-1.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Disj-Input-2.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Disj-Output-1.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Disj-Output-2-1.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Disj-Output-2-2.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Disj-Output-2-3.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Disj-Output-2-4.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Disj-Output-2-5.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Disj-Output-8.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Join-Statistics-DDistinct-Input.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Join-Statistics-DDistinct-Output.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Join-Statistics-Input-Null-Bucket.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Join-Statistics-Input-Only-Nulls.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Join-Statistics-Input.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Join-Statistics-Output-LOJ-Only-Nulls.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Join-Statistics-Output-Null-Bucket.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Join-Statistics-Output-Only-Nulls.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Join-Statistics-Output.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/LOJ-Input.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/LOJ-Output.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/MCV-Sort-Output.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Merge-Input-Histogram-Int.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Merge-Input-Histogram-Numeric.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Merge-Input-MCV-Int.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Merge-Input-MCV-Numeric.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Merge-Output-Int.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Merge-Output-Numeric.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/NestedPred-Input-1.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/NestedPred-Input-10.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/NestedPred-Input-2.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/NestedPred-Input-3.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/NestedPred-Input-8.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/NestedPred-Input-9.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/NestedPred-Output-1.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/NestedPred-Output-10.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/NestedPred-Output-2.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/NestedPred-Output-3.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/NestedPred-Output-4.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/NestedPred-Output-5.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/NestedPred-Output-6.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/NestedPred-Output-7.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/NestedPred-Output-8.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/NestedPred-Output-9.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Numeric-Input.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Numeric-Input2.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Numeric-Output-2-E-MaxBoundary.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Numeric-Output-2-E-MinBoundary.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Numeric-Output-2-GT-MaxBoundary.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Numeric-Output-2-GT-MinBoundary.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Numeric-Output-2-GTE-MaxBoundary.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Numeric-Output-2-GTE-MinBoundary.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Numeric-Output-2-LT-MaxBoundary.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Numeric-Output-2-LT-MinBoundary.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Numeric-Output-2-LTE-MaxBoundary.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Numeric-Output-2-LTE-MinBoundary.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Numeric-Output-E-MaxBoundary.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Numeric-Output-E-MinBoundary.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Numeric-Output-GT-MaxBoundary.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Numeric-Output-GTE-MaxBoundary.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Numeric-Output-LT-MinBoundary.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Numeric-Output-LTE-MinBoundary.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Select-Statistics-Input-Null-Bucket.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Select-Statistics-Output-NotNull-Constant.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Select-Statistics-Output-Null-Bucket.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/Select-Statistics-Output-Null-Constant.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/SelectPlan.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/SelectQuery.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/UnionAll-Input-1.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/statistics/UnionAll-Output-1.xml (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/tpch/q1-partitioned.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/tpch/q1.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/tpch/q10.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/tpch/q11.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/tpch/q12.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/tpch/q13.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/tpch/q14.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/tpch/q15.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/tpch/q16.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/tpch/q17.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/tpch/q18.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/tpch/q19.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/tpch/q2.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/tpch/q20.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/tpch/q21.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/tpch/q22.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/tpch/q3.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/tpch/q4.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/tpch/q5.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/tpch/q6.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/tpch/q7.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/tpch/q8.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/data/dxl/tpch/q9.mdp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpdbcost/CMakeLists.txt (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpdbcost/include/gpdbcost/CCostModelGPDB.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpdbcost/include/gpdbcost/CCostModelParamsGPDB.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpdbcost/src/CCostModelGPDB.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpdbcost/src/CCostModelParamsGPDB.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpdbcost/src/ICostModel.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/CMakeLists.txt (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CAutoOptCtxt.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CCTEInfo.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CCTEMap.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CCTEReq.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CCastUtils.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CColConstraintsArrayMapper.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CColConstraintsHashMapper.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CColRef.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CColRefComputed.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CColRefSet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CColRefSetIter.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CColRefTable.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CColumnFactory.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CConstraint.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CConstraintConjunction.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CConstraintDisjunction.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CConstraintInterval.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CConstraintNegation.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CCostContext.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CDatumSortedSet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CDefaultComparator.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CDistributionSpec.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CDistributionSpecAny.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CDistributionSpecHashed.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CDistributionSpecHashedNoOp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CDistributionSpecNonReplicated.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CDistributionSpecNonSingleton.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CDistributionSpecRandom.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CDistributionSpecReplicated.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CDistributionSpecRouted.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CDistributionSpecSingleton.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CDistributionSpecStrictHashed.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CDistributionSpecStrictRandom.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CDistributionSpecStrictSingleton.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CDistributionSpecUniversal.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CDrvdProp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CDrvdPropCtxt.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CDrvdPropCtxtPlan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CDrvdPropCtxtRelational.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CDrvdPropPlan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CDrvdPropRelational.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CDrvdPropScalar.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CEnfdDistribution.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CEnfdOrder.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CEnfdPartitionPropagation.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CEnfdProp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CEnfdRewindability.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CFunctionProp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CFunctionalDependency.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CIOUtils.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CKHeap.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CKeyCollection.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CMaxCard.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/COptCtxt.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/COptimizationContext.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/COrderSpec.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CPartInfo.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CPartKeys.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CPartitionPropagationSpec.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CPrintPrefix.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CPropConstraint.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CPropSpec.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CQueryContext.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CRange.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CReqdProp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CReqdPropPlan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CReqdPropRelational.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CRewindabilitySpec.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CStateMachine.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CUtils.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CWindowFrame.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/CWindowOids.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/IColConstraintsMapper.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/IComparator.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/base/SPartSelectorInfo.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/cost/CCost.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/cost/ICostModel.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/cost/ICostModelParams.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/engine/CCTEConfig.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/engine/CEngine.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/engine/CEnumeratorConfig.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/engine/CHint.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/engine/CPartialPlan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/engine/CStatisticsConfig.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/eval/CConstExprEvaluatorDXL.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/eval/CConstExprEvaluatorDefault.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/eval/IConstDXLNodeEvaluator.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/eval/IConstExprEvaluator.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/exception.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/hints/CHintUtils.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/hints/CJoinHint.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/hints/CPlanHint.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/hints/CRowHint.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/hints/CScanHint.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/hints/IHint.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/init.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/mdcache/CAutoMDAccessor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/mdcache/CMDAccessor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/mdcache/CMDAccessorUtils.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/mdcache/CMDCache.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/mdcache/CMDKey.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/metadata/CColumnDescriptor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/metadata/CIndexDescriptor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/metadata/CName.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/metadata/CTableDescriptor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/minidump/CDXLMinidump.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/minidump/CMetadataAccessorFactory.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/minidump/CMiniDumperDXL.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/minidump/CMinidumperUtils.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/minidump/CSerializableMDAccessor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/minidump/CSerializableOptimizerConfig.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/minidump/CSerializablePlan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/minidump/CSerializableQuery.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/minidump/CSerializableStackTrace.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CExpression.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CExpressionFactorizer.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CExpressionHandle.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CExpressionPreprocessor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CExpressionUtils.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CHashedDistributions.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CJoinOrderHintsPreprocessor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLeftJoinPruningPreprocessor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogical.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalApply.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalAssert.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalBitmapTableGet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalCTEAnchor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalCTEConsumer.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalCTEProducer.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalConstTableGet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalDML.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalDelete.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalDifference.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalDifferenceAll.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicBitmapTableGet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicForeignGet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicGet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicGetBase.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicIndexGet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicIndexOnlyGet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalForeignGet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalFullOuterJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalGbAgg.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalGbAggDeduplicate.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalGet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalIndexApply.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalIndexGet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalIndexOnlyGet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalInnerApply.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalInnerCorrelatedApply.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalInnerJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalInsert.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalIntersect.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalIntersectAll.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiApply.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiApplyNotIn.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiCorrelatedApply.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiCorrelatedApplyNotIn.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiJoinNotIn.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalLeftOuterApply.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalLeftOuterCorrelatedApply.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalLeftOuterJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiApply.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiApplyIn.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiCorrelatedApply.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiCorrelatedApplyIn.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalLimit.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalMaxOneRow.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalNAryJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalProject.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalRightOuterJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalSelect.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalSequence.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalSequenceProject.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalSetOp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalSplit.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalTVF.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalUnary.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalUnion.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalUnionAll.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CLogicalUpdate.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CNormalizer.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/COperator.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/COrderedAggPreprocessor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPattern.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPatternLeaf.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPatternMultiLeaf.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPatternMultiTree.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPatternNode.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPatternTree.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysical.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalAgg.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalAssert.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalBitmapTableScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalCTEConsumer.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalCTEProducer.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalComputeScalar.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalConstTableGet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedInLeftSemiNLJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedInnerNLJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedLeftAntiSemiNLJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedLeftOuterNLJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedLeftSemiNLJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedNotInLeftAntiSemiNLJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalDML.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicBitmapTableScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicForeignScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicIndexOnlyScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicIndexScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicTableScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalFilter.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalForeignScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalFullHashJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalFullMergeJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalHashAgg.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalHashAggDeduplicate.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalHashJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalIndexOnlyScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalIndexScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalInnerHashJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalInnerIndexNLJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalInnerNLJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiHashJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiHashJoinNotIn.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiNLJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiNLJoinNotIn.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftOuterHashJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftOuterIndexNLJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftOuterNLJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftSemiHashJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftSemiNLJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalLimit.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalMotion.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionBroadcast.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionGather.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionHashDistribute.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionRandom.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionRoutedDistribute.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalNLJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalParallelUnionAll.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalPartitionSelector.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalRightOuterHashJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalScalarAgg.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalSequence.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalSequenceProject.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalSerialUnionAll.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalSort.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalSplit.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalSpool.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalStreamAgg.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalStreamAggDeduplicate.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalTVF.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalTableScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalUnionAll.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPhysicalUnionAllFactory.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CPredicateUtils.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalar.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarAggFunc.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarArray.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarArrayCmp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarArrayCoerceExpr.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarArrayRef.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarArrayRefIndexList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarAssertConstraint.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarAssertConstraintList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarBitmapBoolOp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarBitmapIndexProbe.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarBoolOp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarBooleanTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarCaseTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarCast.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarCmp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarCoalesce.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarCoerceBase.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarCoerceToDomain.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarCoerceViaIO.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarConst.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarDMLAction.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarFieldSelect.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarFunc.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarIdent.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarIf.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarIsDistinctFrom.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarMinMax.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarNAryJoinPredList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarNullIf.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarNullTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarOp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarParam.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarProjectElement.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarProjectList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarSortGroupClause.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarSubquery.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryAll.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryAny.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryExistential.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryExists.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryNotExists.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryQuantified.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarSwitch.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarSwitchCase.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarValuesList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CScalarWindowFunc.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/operators/CStrictHashedDistributions.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/optimizer/COptimizer.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/optimizer/COptimizerConfig.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/search/CBinding.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/search/CGroup.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/search/CGroupExpression.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/search/CGroupProxy.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/search/CJob.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/search/CJobFactory.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/search/CJobGroup.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/search/CJobGroupExploration.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/search/CJobGroupExpression.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/search/CJobGroupExpressionExploration.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/search/CJobGroupExpressionImplementation.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/search/CJobGroupExpressionOptimization.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/search/CJobGroupImplementation.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/search/CJobGroupOptimization.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/search/CJobQueue.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/search/CJobStateMachine.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/search/CJobTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/search/CJobTransformation.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/search/CMemo.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/search/CScheduler.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/search/CSchedulerContext.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/search/CSearchStage.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/search/CTreeMap.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/translate/CTranslatorDXLToExpr.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/translate/CTranslatorDXLToExprUtils.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/translate/CTranslatorExprToDXL.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/translate/CTranslatorExprToDXLUtils.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CDecorrelator.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CJoinOrder.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CJoinOrderDP.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CJoinOrderDPv2.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CJoinOrderGreedy.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CJoinOrderMinCard.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CSubqueryHandler.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXform.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinAntiSemiJoinNotInSwap.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinAntiSemiJoinSwap.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinInnerJoinSwap.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInAntiSemiJoinNotInSwap.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInAntiSemiJoinSwap.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInInnerJoinSwap.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInSemiJoinSwap.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinSemiJoinSwap.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformApply2Join.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformCTEAnchor2Sequence.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformCTEAnchor2TrivialSelect.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformCollapseGbAgg.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformCollapseProject.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformContext.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformDelete2DML.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformDifference2LeftAntiSemiJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformDifferenceAll2LeftAntiSemiJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformDynamicForeignGet2DynamicForeignScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformDynamicGet2DynamicTableScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformDynamicIndexGet2DynamicIndexScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformDynamicIndexOnlyGet2DynamicIndexOnlyScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformEagerAgg.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformExpandDynamicGetWithForeignPartitions.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformExpandFullOuterJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinDP.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinDPv2.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinGreedy.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinMinCard.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformExploration.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformFactory.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformForeignGet2ForeignScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformFullJoinCommutativity.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformFullOuterJoin2HashJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2Apply.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2HashAgg.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2ScalarAgg.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2StreamAgg.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformGbAggDedup2HashAggDedup.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformGbAggDedup2StreamAggDedup.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformGbAggWithMDQA2Join.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformGet2TableScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformImplementAssert.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformImplementBitmapTableGet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformImplementCTEConsumer.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformImplementCTEProducer.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformImplementConstTableGet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformImplementCorrelatedApply.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformImplementDML.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformImplementDynamicBitmapTableGet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformImplementFullOuterMergeJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformImplementIndexApply.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformImplementInnerCorrelatedApply.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformImplementInnerJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftAntiSemiCorrelatedApply.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftAntiSemiCorrelatedApplyNotIn.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftOuterCorrelatedApply.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftSemiCorrelatedApply.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftSemiCorrelatedApplyIn.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformImplementLimit.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformImplementSequence.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformImplementSequenceProject.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformImplementSplit.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformImplementTVF.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformImplementTVFNoArgs.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformImplementUnionAll.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformImplementation.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformIndexGet2IndexScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformIndexOnlyGet2IndexOnlyScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformInlineCTEConsumer.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformInlineCTEConsumerUnderSelect.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformInnerApply2InnerJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformInnerApply2InnerJoinNoCorrelations.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformInnerApplyWithOuterKey2InnerJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinAntiSemiJoinNotInSwap.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinAntiSemiJoinSwap.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinCommutativity.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinSemiJoinSwap.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformInsert2DML.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformIntersect2Join.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformIntersectAll2LeftSemiJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformJoin2BitmapIndexGetApply.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformJoin2IndexApply.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformJoin2IndexApplyGeneric.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformJoin2IndexGetApply.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformJoinAssociativity.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformJoinSwap.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoinNoCorrelations.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotIn.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotInNoCorrelations.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoin2CrossProduct.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoin2HashJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoin2NLJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoinNotIn2CrossProduct.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoinNotIn2HashJoinNotIn.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoinNotIn2NLJoinNotIn.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLeftJoin2RightJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuter2InnerUnionAllLeftAntiSemiJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterApply2LeftOuterJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterApply2LeftOuterJoinNoCorrelations.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterJoin2HashJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterJoin2NLJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApply2LeftSemiJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApply2LeftSemiJoinNoCorrelations.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyIn2LeftSemiJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyIn2LeftSemiJoinNoCorrelations.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyInWithExternalCorrs2InnerJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyWithExternalCorrs2InnerJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2CrossProduct.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2HashJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2InnerJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2InnerJoinUnderGb.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2NLJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLimit2IndexGet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformLimit2IndexOnlyGet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformMaxOneRow2Assert.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformMinMax2IndexGet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformMinMax2IndexOnlyGet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformProject2Apply.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformProject2ComputeScalar.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformPushDownLeftOuterJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowSetOp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowUnion.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowUnionAll.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformPushGbDedupBelowJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformPushGbWithHavingBelowJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformPushJoinBelowLeftUnionAll.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformPushJoinBelowRightUnionAll.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformPushJoinBelowUnionAll.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformRemoveSubqDistinct.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformResult.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformRightOuterJoin2HashJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformSelect2Apply.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformSelect2BitmapBoolOp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformSelect2DynamicBitmapBoolOp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformSelect2DynamicIndexGet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformSelect2DynamicIndexOnlyGet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformSelect2Filter.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformSelect2IndexGet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformSelect2IndexOnlyGet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinAntiSemiJoinNotInSwap.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinAntiSemiJoinSwap.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinInnerJoinSwap.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinSemiJoinSwap.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformSequenceProject2Apply.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformSimplifyGbAgg.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformSimplifyLeftOuterJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformSimplifyProjectWithSubquery.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformSimplifySelectWithSubquery.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformSimplifySubquery.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformSplitDQA.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformSplitGbAgg.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformSplitGbAggDedup.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformSplitLimit.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformSubqJoin2Apply.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformSubqNAryJoin2Apply.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformSubqueryUnnest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformUnion2UnionAll.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformUnnestTVF.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformUpdate2DML.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/CXformUtils.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/include/gpopt/xforms/xforms.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CAutoOptCtxt.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CCTEInfo.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CCTEMap.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CCTEReq.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CCastUtils.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CColConstraintsArrayMapper.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CColConstraintsHashMapper.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CColRef.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CColRefComputed.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CColRefSet.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CColRefSetIter.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CColRefTable.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CColumnFactory.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CConstraint.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CConstraintConjunction.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CConstraintDisjunction.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CConstraintInterval.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CConstraintNegation.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CCostContext.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CDatumSortedSet.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CDefaultComparator.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CDistributionSpecHashed.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CDistributionSpecHashedNoOp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CDistributionSpecNonSingleton.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CDistributionSpecRandom.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CDistributionSpecReplicated.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CDistributionSpecRouted.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CDistributionSpecSingleton.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CDistributionSpecStrictHashed.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CDistributionSpecStrictRandom.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CDistributionSpecStrictSingleton.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CDistributionSpecUniversal.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CDrvdProp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CDrvdPropCtxt.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CDrvdPropCtxtPlan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CDrvdPropPlan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CDrvdPropRelational.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CDrvdPropScalar.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CEnfdDistribution.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CEnfdOrder.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CEnfdPartitionPropagation.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CEnfdProp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CEnfdRewindability.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CFunctionProp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CFunctionalDependency.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CIOUtils.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CKeyCollection.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/COptCtxt.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/COptimizationContext.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/COrderSpec.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CPartInfo.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CPartKeys.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CPartitionPropagationSpec.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CPrintPrefix.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CPropConstraint.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CQueryContext.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CRange.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CReqdProp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CReqdPropPlan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CReqdPropRelational.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CRewindabilitySpec.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CUtils.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CWindowFrame.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/CWindowOids.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/base/IColConstraintsMapper.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/engine/CEngine.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/engine/CEnumeratorConfig.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/engine/CPartialPlan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/engine/CStatisticsConfig.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/eval/CConstExprEvaluatorDXL.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/eval/CConstExprEvaluatorDefault.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/exception.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/hints/CHintUtils.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/hints/CJoinHint.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/hints/CPlanHint.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/hints/CRowHint.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/hints/CScanHint.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/hints/README (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/init.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/mdcache/CMDAccessor.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/mdcache/CMDAccessorUtils.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/mdcache/CMDCache.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/mdcache/CMDKey.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/metadata/CColumnDescriptor.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/metadata/CIndexDescriptor.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/metadata/CName.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/metadata/CTableDescriptor.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/minidump/CDXLMinidump.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/minidump/CMetadataAccessorFactory.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/minidump/CMiniDumperDXL.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/minidump/CMinidumperUtils.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/minidump/CSerializableMDAccessor.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/minidump/CSerializableOptimizerConfig.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/minidump/CSerializablePlan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/minidump/CSerializableQuery.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/minidump/CSerializableStackTrace.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CExpression.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CExpressionFactorizer.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CExpressionHandle.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CExpressionPreprocessor.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CExpressionUtils.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CHashedDistributions.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CJoinOrderHintsPreprocessor.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLeftJoinPruningPreprocessor.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogical.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalApply.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalAssert.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalBitmapTableGet.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalCTEAnchor.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalCTEConsumer.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalCTEProducer.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalConstTableGet.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalDML.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalDelete.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalDifference.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalDifferenceAll.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalDynamicBitmapTableGet.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalDynamicForeignGet.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalDynamicGet.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalDynamicGetBase.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalDynamicIndexGet.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalForeignGet.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalFullOuterJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalGbAgg.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalGbAggDeduplicate.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalGet.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalIndexApply.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalIndexGet.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalInnerApply.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalInnerCorrelatedApply.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalInnerJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalInsert.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalIntersect.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalIntersectAll.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiApply.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiApplyNotIn.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiCorrelatedApply.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiCorrelatedApplyNotIn.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiJoinNotIn.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalLeftOuterApply.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalLeftOuterCorrelatedApply.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalLeftOuterJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalLeftSemiApply.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalLeftSemiApplyIn.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalLeftSemiCorrelatedApply.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalLeftSemiCorrelatedApplyIn.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalLeftSemiJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalLimit.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalMaxOneRow.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalNAryJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalProject.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalRightOuterJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalSelect.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalSequence.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalSequenceProject.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalSetOp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalSplit.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalTVF.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalUnary.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalUnion.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalUnionAll.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CLogicalUpdate.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CNormalizer.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/COperator.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/COrderedAggPreprocessor.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPattern.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysical.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalAgg.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalAssert.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalBitmapTableScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalCTEConsumer.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalCTEProducer.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalComputeScalar.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalConstTableGet.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalDML.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalDynamicBitmapTableScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalDynamicForeignScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalDynamicIndexOnlyScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalDynamicIndexScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalDynamicScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalDynamicTableScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalFilter.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalForeignScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalFullHashJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalFullMergeJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalHashAgg.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalHashAggDeduplicate.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalHashJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalIndexOnlyScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalIndexScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalInnerHashJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalInnerIndexNLJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalInnerNLJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiHashJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiHashJoinNotIn.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiNLJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalLeftOuterHashJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalLeftOuterIndexNLJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalLeftOuterNLJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalLeftSemiHashJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalLeftSemiNLJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalLimit.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalMotion.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalMotionBroadcast.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalMotionGather.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalMotionHashDistribute.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalMotionRandom.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalMotionRoutedDistribute.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalNLJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalParallelUnionAll.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalPartitionSelector.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalRightOuterHashJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalScalarAgg.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalSequence.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalSequenceProject.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalSerialUnionAll.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalSort.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalSplit.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalSpool.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalStreamAgg.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalStreamAggDeduplicate.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalTVF.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalTableScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalUnionAll.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPhysicalUnionAllFactory.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CPredicateUtils.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalar.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarAggFunc.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarArray.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarArrayCmp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarArrayCoerceExpr.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarArrayRef.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarArrayRefIndexList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarAssertConstraint.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarAssertConstraintList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarBitmapBoolOp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarBitmapIndexProbe.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarBoolOp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarBooleanTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarCaseTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarCast.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarCmp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarCoalesce.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarCoerceBase.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarCoerceToDomain.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarCoerceViaIO.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarConst.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarDMLAction.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarFieldSelect.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarFunc.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarIdent.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarIf.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarIsDistinctFrom.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarMinMax.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarNAryJoinPredList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarNullIf.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarNullTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarOp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarParam.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarProjectElement.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarProjectList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarSortGroupClause.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarSubquery.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarSubqueryAll.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarSubqueryAny.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarSubqueryExistential.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarSubqueryQuantified.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarSwitch.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarSwitchCase.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarValuesList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CScalarWindowFunc.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/operators/CStrictHashedDistributions.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/optimizer/COptimizer.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/optimizer/COptimizerConfig.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/search/CBinding.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/search/CGroup.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/search/CGroupExpression.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/search/CGroupProxy.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/search/CJob.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/search/CJobFactory.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/search/CJobGroup.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/search/CJobGroupExploration.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/search/CJobGroupExpression.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/search/CJobGroupExpressionExploration.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/search/CJobGroupExpressionImplementation.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/search/CJobGroupExpressionOptimization.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/search/CJobGroupImplementation.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/search/CJobGroupOptimization.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/search/CJobQueue.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/search/CJobTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/search/CJobTransformation.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/search/CMemo.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/search/CScheduler.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/search/CSchedulerContext.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/search/CSearchStage.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/translate/CTranslatorDXLToExpr.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/translate/CTranslatorDXLToExprUtils.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/translate/CTranslatorExprToDXL.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/translate/CTranslatorExprToDXLUtils.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CDecorrelator.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CJoinOrder.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CJoinOrderDP.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CJoinOrderDPv2.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CJoinOrderGreedy.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CJoinOrderMinCard.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CSubqueryHandler.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXform.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformCTEAnchor2Sequence.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformCTEAnchor2TrivialSelect.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformCollapseGbAgg.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformCollapseProject.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformDelete2DML.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformDifference2LeftAntiSemiJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformDifferenceAll2LeftAntiSemiJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformDynamicForeignGet2DynamicForeignScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformDynamicGet2DynamicTableScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformDynamicIndexGet2DynamicIndexScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformDynamicIndexOnlyGet2DynamicIndexOnlyScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformEagerAgg.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformExpandDynamicGetWithForeignPartitions.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformExpandFullOuterJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformExpandNAryJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformExpandNAryJoinDP.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformExpandNAryJoinDPv2.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformExpandNAryJoinGreedy.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformExpandNAryJoinMinCard.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformExploration.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformFactory.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformForeignGet2ForeignScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformFullJoinCommutativity.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformFullOuterJoin2HashJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformGbAgg2Apply.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformGbAgg2HashAgg.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformGbAgg2ScalarAgg.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformGbAgg2StreamAgg.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformGbAggDedup2HashAggDedup.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformGbAggDedup2StreamAggDedup.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformGbAggWithMDQA2Join.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformGet2TableScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformImplementAssert.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformImplementBitmapTableGet.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformImplementCTEConsumer.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformImplementCTEProducer.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformImplementConstTableGet.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformImplementDML.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformImplementDynamicBitmapTableGet.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformImplementFullOuterMergeJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformImplementInnerJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformImplementLimit.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformImplementSequence.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformImplementSequenceProject.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformImplementSplit.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformImplementTVF.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformImplementTVFNoArgs.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformImplementUnionAll.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformImplementation.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformIndexGet2IndexScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformIndexOnlyGet2IndexOnlyScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformInlineCTEConsumer.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformInlineCTEConsumerUnderSelect.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformInnerApply2InnerJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformInnerApply2InnerJoinNoCorrelations.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformInnerApplyWithOuterKey2InnerJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformInnerJoinCommutativity.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformInsert2DML.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformIntersect2Join.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformIntersectAll2LeftSemiJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformJoin2IndexApply.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformJoin2IndexApplyGeneric.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformJoinAssociativity.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoinNoCorrelations.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotIn.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotInNoCorrelations.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2CrossProduct.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2HashJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2NLJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoinNotIn2HashJoinNotIn.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoinNotIn2NLJoinNotIn.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformLeftJoin2RightJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformLeftOuter2InnerUnionAllLeftAntiSemiJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformLeftOuterApply2LeftOuterJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformLeftOuterApply2LeftOuterJoinNoCorrelations.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformLeftOuterJoin2HashJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformLeftOuterJoin2NLJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformLeftSemiApply2LeftSemiJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformLeftSemiApply2LeftSemiJoinNoCorrelations.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformLeftSemiApplyWithExternalCorrs2InnerJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2CrossProduct.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2HashJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2InnerJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2InnerJoinUnderGb.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2NLJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformLimit2IndexGet.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformMaxOneRow2Assert.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformMinMax2IndexGet.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformProject2Apply.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformProject2ComputeScalar.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformPushDownLeftOuterJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformPushGbBelowJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformPushGbDedupBelowJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformPushGbWithHavingBelowJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformPushJoinBelowUnionAll.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformRemoveSubqDistinct.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformResult.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformRightOuterJoin2HashJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformSelect2Apply.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformSelect2BitmapBoolOp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformSelect2DynamicIndexGet.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformSelect2DynamicIndexOnlyGet.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformSelect2Filter.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformSelect2IndexGet.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformSelect2IndexOnlyGet.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformSequenceProject2Apply.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformSimplifyGbAgg.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformSimplifyLeftOuterJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformSimplifySubquery.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformSplitDQA.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformSplitGbAgg.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformSplitGbAggDedup.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformSplitLimit.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformSubqJoin2Apply.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformSubqueryUnnest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformUnion2UnionAll.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformUnnestTVF.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformUpdate2DML.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CXformUtils.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpopt/src/xforms/CxformSelect2DynamicBitmapBoolOp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/CMakeLists.txt (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/_api.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/assert.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/attributes.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/base.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CAutoP.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CAutoRef.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CAutoRg.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CAutoTimer.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CBitSet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CBitSetIter.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CBitVector.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CDebugCounter.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CDouble.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CDynamicPtrArray.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CEnumSet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CEnumSetIter.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CHashMap.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CHashMapIter.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CHashSet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CHashSetIter.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CHeapObject.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CLink.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CMainArgs.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CPrintablePointer.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CRandom.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CRefCount.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CStack.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CStackDescriptor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CStackObject.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CSyncHashtable.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CSyncHashtableAccessByIter.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CSyncHashtableAccessByKey.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CSyncHashtableAccessorBase.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CSyncHashtableIter.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CSyncList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CSyncPool.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CTimerUser.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/CWallClock.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/DbgPrintMixin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/ITimer.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/clibtypes.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/clibwrapper.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/common/syslibwrapper.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/error/CAutoExceptionStack.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/error/CAutoTrace.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/error/CErrorContext.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/error/CErrorHandler.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/error/CErrorHandlerStandard.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/error/CException.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/error/CLogger.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/error/CLoggerStream.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/error/CLoggerSyslog.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/error/CMessage.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/error/CMessageRepository.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/error/CMessageTable.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/error/CMiniDumper.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/error/CSerializable.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/error/IErrorContext.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/error/ILogger.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/io/CFileDescriptor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/io/CFileReader.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/io/CFileWriter.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/io/COstream.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/io/COstreamBasic.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/io/COstreamStdString.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/io/COstreamString.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/io/IOstream.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/io/iotypes.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/io/ioutils.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/memory/CAutoMemoryPool.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/memory/CCache.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/memory/CCacheAccessor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/memory/CCacheEntry.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/memory/CCacheFactory.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/memory/CMemoryPool.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/memory/CMemoryPoolManager.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/memory/CMemoryPoolStatistics.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/memory/CMemoryPoolTracker.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/memory/CMemoryVisitorPrint.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/memory/IMemoryVisitor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/memory/MemoryPoolAllocator.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/memory/README.md (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/memory/deque.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/memory/queue.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/memory/stack.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/string/CStringStatic.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/string/CWString.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/string/CWStringBase.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/string/CWStringConst.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/string/CWStringDynamic.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/string/CWStringStatic.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/task/CAutoSuspendAbort.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/task/CAutoTaskProxy.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/task/CAutoTraceFlag.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/task/CTask.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/task/CTaskContext.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/task/CTaskId.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/task/CTaskLocalStorage.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/task/CTaskLocalStorageObject.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/task/CTaskSchedulerFifo.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/task/CTraceFlagIter.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/task/CWorker.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/task/CWorkerPoolManager.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/task/ITask.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/task/ITaskScheduler.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/task/IWorker.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/task/traceflags.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/test/CUnittest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/types.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/include/gpos/utils.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/CMakeLists.txt (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/common/CAutoPTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/common/CAutoRefTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/common/CAutoRgTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/common/CBitSetIterTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/common/CBitSetTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/common/CBitVectorTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/common/CDoubleTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/common/CDynamicPtrArrayTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/common/CEnumSetTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/common/CHashMapIterTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/common/CHashMapTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/common/CHashSetIterTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/common/CHashSetTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/common/CListTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/common/CRefCountTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/common/CStackTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/common/CSyncHashtableTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/common/CSyncListTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/error/CErrorHandlerTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/error/CExceptionTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/error/CLoggerTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/error/CMessageRepositoryTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/error/CMessageTableTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/error/CMessageTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/error/CMiniDumperTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/io/CFileTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/io/COstreamBasicTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/io/COstreamStringTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/memory/CCacheTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/memory/CMemoryPoolBasicTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/string/CStringTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/string/CWStringTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/task/CTaskLocalStorageTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/include/unittest/gpos/test/CUnittestTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/startup/main.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/common/CAutoPTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/common/CAutoRefTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/common/CAutoRgTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/common/CBitSetIterTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/common/CBitSetTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/common/CBitVectorTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/common/CDoubleTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/common/CDynamicPtrArrayTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/common/CEnumSetTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/common/CHashMapIterTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/common/CHashMapTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/common/CHashSetIterTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/common/CHashSetTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/common/CListTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/common/CRefCountTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/common/CStackTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/common/CSyncHashtableTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/common/CSyncListTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/error/CErrorHandlerTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/error/CExceptionTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/error/CLoggerTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/error/CMessageRepositoryTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/error/CMessageTableTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/error/CMessageTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/error/CMiniDumperTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/io/CFileTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/io/COstreamBasicTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/io/COstreamStringTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/memory/CCacheTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/memory/CMemoryPoolBasicTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/string/CStringTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/string/CWStringTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/task/CTaskLocalStorageTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/server/src/unittest/gpos/test/CUnittestTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/_api.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/common/CAutoTimer.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/common/CBitSet.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/common/CBitSetIter.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/common/CBitVector.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/common/CDebugCounter.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/common/CHeapObject.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/common/CMainArgs.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/common/CRandom.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/common/CRefCount.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/common/CStackDescriptor.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/common/CStackObject.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/common/CTimerUser.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/common/CWallClock.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/common/clibwrapper.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/common/syslibwrapper.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/error/CAutoExceptionStack.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/error/CAutoTrace.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/error/CErrorContext.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/error/CErrorHandlerStandard.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/error/CException.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/error/CLogger.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/error/CLoggerStream.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/error/CLoggerSyslog.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/error/CMessage.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/error/CMessageRepository.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/error/CMessageTable.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/error/CMiniDumper.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/error/CSerializable.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/error/ILogger.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/io/CFileDescriptor.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/io/CFileReader.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/io/CFileWriter.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/io/COstream.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/io/COstreamBasic.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/io/COstreamStdString.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/io/COstreamString.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/io/ioutils.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/memory/CAutoMemoryPool.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/memory/CCacheFactory.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/memory/CMemoryPool.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/memory/CMemoryPoolManager.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/memory/CMemoryPoolTracker.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/memory/CMemoryVisitorPrint.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/string/CStringStatic.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/string/CWString.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/string/CWStringBase.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/string/CWStringConst.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/string/CWStringDynamic.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/string/CWStringStatic.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/task/CAutoSuspendAbort.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/task/CAutoTaskProxy.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/task/CAutoTraceFlag.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/task/CTask.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/task/CTaskContext.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/task/CTaskLocalStorage.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/task/CTaskSchedulerFifo.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/task/CWorker.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/task/CWorkerPoolManager.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/task/ITask.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/task/IWorker.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/test/CUnittest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libgpos/src/utils.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/CMakeLists.txt (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/base/CDatumBoolGPDB.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/base/CDatumGenericGPDB.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/base/CDatumInt2GPDB.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/base/CDatumInt4GPDB.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/base/CDatumInt8GPDB.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/base/CDatumOidGPDB.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/base/CQueryToDXLResult.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/base/IDatum.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/base/IDatumBool.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/base/IDatumGeneric.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/base/IDatumInt2.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/base/IDatumInt4.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/base/IDatumInt8.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/base/IDatumOid.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/CCostModelConfigSerializer.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/CDXLUtils.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/CIdGenerator.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/errorcodes.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/gpdb_types.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLColDescr.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLColRef.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLCtasStorageOptions.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatum.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumBool.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumGeneric.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumInt2.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumInt4.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumInt8.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumOid.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumStatsDoubleMappable.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumStatsLintMappable.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDirectDispatchInfo.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLIndexDescr.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogical.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTAS.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTEAnchor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTEConsumer.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTEProducer.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalConstTable.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalDelete.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalForeignGet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalGet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalGroupBy.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalInsert.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalLimit.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalProject.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalSelect.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalSetOp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalTVF.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalUpdate.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalWindow.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLNode.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLOperator.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLOperatorCost.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLOperatorFactory.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysical.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAbstractBitmapScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAgg.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAppend.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAssert.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalBitmapTableScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalBroadcastMotion.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTAS.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTEConsumer.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTEProducer.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDML.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicBitmapTableScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicForeignScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicIndexOnlyScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicIndexScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicTableScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalForeignScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalGatherMotion.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalHashJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalIndexOnlyScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalIndexScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalLimit.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalMaterialize.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalMergeJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalMotion.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalNLJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalPartitionSelector.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalProperties.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalRandomMotion.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalRedistributeMotion.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalResult.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalRoutedDistributeMotion.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalSequence.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalSort.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalSplit.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalTVF.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalTableScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalValuesScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalWindow.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLProperties.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalar.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarAggref.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArray.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayCoerceExpr.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayComp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayRef.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayRefIndexList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarAssertConstraint.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarAssertConstraintList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBitmapBoolOp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBitmapIndexProbe.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBoolExpr.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBooleanTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCaseTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCast.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoalesce.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoerceBase.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoerceToDomain.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoerceViaIO.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarComp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarConstValue.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarDMLAction.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarDistinctComp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarFieldSelect.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarFilter.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarFuncExpr.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarHashCondList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarHashExpr.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarHashExprList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarIdent.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarIfStmt.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarIndexCondList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarJoinFilter.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarLimitCount.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarLimitOffset.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarMergeCondList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarMinMax.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarNullIf.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarNullTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarOneTimeFilter.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarOpExpr.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarOpList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarParam.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarProjElem.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarProjList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarRecheckCondFilter.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSortCol.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSortColList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSortGroupClause.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubPlan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubquery.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryAll.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryAny.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryExists.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryNotExists.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryQuantified.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSwitch.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSwitchCase.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarValuesList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarWindowFrameEdge.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarWindowRef.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLSpoolInfo.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLTableDescr.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLWindowFrame.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLWindowKey.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLWindowSpec.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerAgg.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerAppend.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerArray.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerAssert.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerBase.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerBroadcastMotion.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCTEConfig.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCTEList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerColDescr.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerColStats.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerColStatsBucket.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCondList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCost.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCostModel.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCostParam.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCostParams.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCtasStorageOptions.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDXL.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDirectDispatchInfo.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDistinctComp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDummy.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicForeignScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicIndexOnlyScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicIndexScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicTableScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerEnumeratorConfig.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStats.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsDependencies.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsDependency.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsInfo.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsNDistinct.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsNDistinctList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerFactory.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerFilter.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerForeignScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerGatherMotion.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerGroupingColList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHashExpr.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHashExprList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHashJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHint.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexCondList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexDescr.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexOnlyScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLimit.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTAS.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTEAnchor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTEConsumer.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTEProducer.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalConstTable.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalDelete.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalForeignGet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalGet.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalGroupBy.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalInsert.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalLimit.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalOp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalProject.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalSelect.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalSetOp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalTVF.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalUpdate.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalWindow.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDArrayCoerceCast.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDCast.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBAgg.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBCheckConstraint.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBFunc.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBScalarOp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDIndex.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDIndexInfoList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDRelation.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDRelationCtas.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDRequest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDScCmp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDType.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerManager.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMaterialize.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMergeJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadata.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataColumn.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataColumns.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataIdList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataObject.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerNLJIndexParam.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerNLJIndexParamList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerNLJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerOp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerOptimizerConfig.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPartitionSelector.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalAbstractBitmapScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalBitmapTableScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalCTAS.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalCTEConsumer.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalCTEProducer.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalDML.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalDynamicBitmapTableScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalOp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalSplit.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalTVF.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalWindow.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPlan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPlanHint.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerProjElem.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerProjList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerProperties.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerQuery.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerQueryOutput.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRandomMotion.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRedistributeMotion.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRelStats.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRelationExtendedStats.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerResult.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRoutedMotion.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarAggref.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayCoerceExpr.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayComp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayRef.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayRefIndexList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarAssertConstraintList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBitmapBoolOp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBitmapIndexProbe.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBoolExpr.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBooleanTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCaseTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCast.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCoalesce.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCoerceToDomain.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCoerceViaIO.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarComp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarConstValue.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarDMLAction.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarExpr.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarFieldSelect.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarFuncExpr.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarIdent.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarIfStmt.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarLimitCount.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarLimitOffset.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarMinMax.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarNullIf.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarNullTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarOp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarOpExpr.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarOpList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarParam.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarPartListNullTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarPartListValues.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSortGroupClause.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlanParam.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlanParamList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlanTestExpr.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubquery.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubqueryExists.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubqueryQuantified.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSwitch.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSwitchCase.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarValuesList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarWindowFrameEdge.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarWindowRef.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSearchStage.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSearchStrategy.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSequence.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSort.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSortCol.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSortColList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStacktrace.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatistics.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatisticsConfig.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatsBound.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatsDerivedColumn.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatsDerivedRelation.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerTableDescr.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerTableScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerTraceFlags.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerUtils.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerValuesScan.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowFrame.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowKey.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowKeyList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowOids.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowSpec.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowSpecList.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerXform.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/parser/parsehandlers.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/xml/CDXLMemoryManager.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/xml/CDXLSections.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/xml/CXMLSerializer.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/dxl/xml/dxltokens.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/exception.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/init.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CDXLBucket.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CDXLColStats.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CDXLExtStats.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CDXLExtStatsInfo.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CDXLRelStats.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CDXLStatsDerivedColumn.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CDXLStatsDerivedRelation.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CGPDBTypeHelper.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDAggregateGPDB.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDArrayCoerceCastGPDB.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDCastGPDB.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDCheckConstraintGPDB.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDColumn.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDDependency.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDExtStatsInfo.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDFunctionGPDB.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDIdCast.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDIdColStats.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDIdGPDB.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDIdGPDBCtas.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDIdRelStats.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDIdScCmp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDIndexGPDB.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDIndexInfo.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDNDistinct.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDName.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDProviderGeneric.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDProviderMemory.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDRelationCtasGPDB.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDRelationGPDB.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDRequest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDScCmpGPDB.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDScalarOpGPDB.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDTypeBoolGPDB.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDTypeGenericGPDB.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDTypeInt2GPDB.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDTypeInt4GPDB.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDTypeInt8GPDB.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CMDTypeOidGPDB.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/CSystemId.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/IMDAggregate.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/IMDCacheObject.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/IMDCast.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/IMDCheckConstraint.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/IMDColStats.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/IMDColumn.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/IMDExtStats.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/IMDExtStatsInfo.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/IMDFunction.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/IMDId.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/IMDIndex.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/IMDInterface.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/IMDPartConstraint.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/IMDProvider.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/IMDRelStats.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/IMDRelation.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/IMDRelationCtas.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/IMDScCmp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/IMDScalarOp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/IMDType.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/IMDTypeBool.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/IMDTypeGeneric.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/IMDTypeInt2.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/IMDTypeInt4.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/IMDTypeInt8.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/md/IMDTypeOid.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/CBucket.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/CExtendedStatsProcessor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/CFilterStatsProcessor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/CGroupByStatsProcessor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/CHistogram.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/CInnerJoinStatsProcessor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/CJoinStatsProcessor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/CLeftAntiSemiJoinStatsProcessor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/CLeftOuterJoinStatsProcessor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/CLeftSemiJoinStatsProcessor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/CLimitStatsProcessor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/CPoint.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/CProjectStatsProcessor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/CScaleFactorUtils.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/CStatistics.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/CStatisticsUtils.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/CStatsPred.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/CStatsPredArrayCmp.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/CStatsPredConj.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/CStatsPredDisj.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/CStatsPredJoin.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/CStatsPredLike.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/CStatsPredPoint.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/CStatsPredUnsupported.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/CStatsPredUtils.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/CUnionAllStatsProcessor.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/CUpperBoundNDVs.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/IBucket.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/statistics/IStatistics.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/include/naucrates/traceflags/traceflags.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/CCostModelConfigSerializer.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/CDXLUtils.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/CIdGenerator.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/base/CDatumBoolGPDB.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/base/CDatumGenericGPDB.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/base/CDatumInt2GPDB.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/base/CDatumInt4GPDB.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/base/CDatumInt8GPDB.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/base/CDatumOidGPDB.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/base/CQueryToDXLResult.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/base/IDatum.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/exception.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/init.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CDXLBucket.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CDXLColStats.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CDXLExtStats.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CDXLExtStatsInfo.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CDXLRelStats.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CDXLStatsDerivedColumn.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CDXLStatsDerivedRelation.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDAggregateGPDB.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDArrayCoerceCastGPDB.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDCastGPDB.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDCheckConstraintGPDB.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDColumn.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDExtStatsInfo.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDFunctionGPDB.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDIdCast.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDIdColStats.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDIdGPDB.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDIdGPDBCtas.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDIdRelStats.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDIdScCmp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDIndexGPDB.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDIndexInfo.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDName.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDProviderGeneric.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDProviderMemory.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDRelationCtasGPDB.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDRelationGPDB.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDRequest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDScCmpGPDB.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDScalarOpGPDB.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDTypeBoolGPDB.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDTypeGenericGPDB.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDTypeInt2GPDB.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDTypeInt4GPDB.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDTypeInt8GPDB.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CMDTypeOidGPDB.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/CSystemId.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/IMDCacheObject.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/IMDIndex.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/IMDProvider.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/IMDRelation.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/md/IMDType.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLColDescr.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLColRef.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLCtasStorageOptions.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLDatum.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLDatumBool.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLDatumGeneric.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLDatumInt2.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLDatumInt4.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLDatumInt8.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLDatumOid.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLDatumStatsDoubleMappable.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLDatumStatsLintMappable.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLDirectDispatchInfo.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLIndexDescr.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLLogical.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLLogicalCTAS.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLLogicalCTEAnchor.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLLogicalCTEConsumer.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLLogicalCTEProducer.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLLogicalConstTable.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLLogicalDelete.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLLogicalForeignGet.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLLogicalGet.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLLogicalGroupBy.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLLogicalInsert.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLLogicalJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLLogicalLimit.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLLogicalProject.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLLogicalSelect.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLLogicalSetOp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLLogicalTVF.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLLogicalUpdate.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLLogicalWindow.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLNode.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLOperator.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLOperatorCost.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLOperatorFactory.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysical.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalAbstractBitmapScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalAgg.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalAppend.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalAssert.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalBitmapTableScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalBroadcastMotion.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalCTAS.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalCTEConsumer.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalCTEProducer.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalDML.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicBitmapTableScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicForeignScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicIndexOnlyScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicIndexScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicTableScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalForeignScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalGatherMotion.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalHashJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalIndexOnlyScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalIndexScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalLimit.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalMaterialize.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalMergeJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalMotion.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalNLJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalPartitionSelector.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalProperties.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalRandomMotion.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalRedistributeMotion.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalResult.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalRoutedDistributeMotion.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalSequence.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalSort.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalSplit.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalTVF.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalTableScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalValuesScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLPhysicalWindow.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLProperties.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalar.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarAggref.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarArray.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarArrayCoerceExpr.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarArrayComp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarArrayRef.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarArrayRefIndexList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarAssertConstraint.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarAssertConstraintList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarBitmapBoolOp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarBitmapIndexProbe.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarBoolExpr.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarBooleanTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarCaseTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarCast.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarCoalesce.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarCoerceBase.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarCoerceToDomain.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarCoerceViaIO.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarComp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarConstValue.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarDMLAction.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarDistinctComp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarFieldSelect.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarFilter.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarFuncExpr.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarHashCondList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarHashExpr.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarHashExprList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarIdent.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarIfStmt.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarIndexCondList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarJoinFilter.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarLimitCount.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarLimitOffset.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarMergeCondList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarMinMax.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarNullIf.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarNullTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarOneTimeFilter.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarOpExpr.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarOpList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarParam.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarProjElem.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarProjList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarRecheckCondFilter.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarSortCol.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarSortColList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarSubPlan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarSubquery.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarSubqueryAll.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarSubqueryAny.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarSubqueryExists.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarSubqueryNotExists.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarSubqueryQuantified.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarSwitch.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarSwitchCase.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarValuesList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarWindowFrameEdge.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLScalarWindowRef.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLSpoolInfo.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLTableDescr.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLWindowFrame.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLWindowKey.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/operators/CDXLWindowSpec.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerAgg.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerAppend.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerArray.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerAssert.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerBase.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerBroadcastMotion.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerCTEConfig.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerCTEList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerColDescr.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerColStats.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerColStatsBucket.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerCondList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerCost.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerCostModel.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerCostParam.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerCostParams.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerCtasStorageOptions.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerDXL.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerDirectDispatchInfo.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerDistinctComp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerDummy.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerDynamicForeignScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerDynamicIndexOnlyScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerDynamicIndexScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerDynamicTableScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerEnumeratorConfig.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerExtStats.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerExtStatsDependencies.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerExtStatsDependency.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerExtStatsInfo.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerExtStatsNDistinct.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerExtStatsNDistinctList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerFactory.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerFilter.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerForeignScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerGatherMotion.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerGroupingColList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerHashExpr.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerHashExprList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerHashJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerHint.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerIndexCondList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerIndexDescr.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerIndexOnlyScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerIndexScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerLimit.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTAS.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEAnchor.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEConsumer.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEProducer.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerLogicalConstTable.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerLogicalDelete.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerLogicalForeignGet.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerLogicalGet.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerLogicalGroupBy.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerLogicalInsert.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerLogicalJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerLogicalLimit.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerLogicalOp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerLogicalProject.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerLogicalSelect.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerLogicalSetOp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerLogicalTVF.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerLogicalUpdate.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerLogicalWindow.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerMDArrayCoerceCast.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerMDCast.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBAgg.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBCheckConstraint.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBFunc.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBScalarOp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerMDIndex.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerMDIndexInfoList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerMDRelation.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerMDRelationCtas.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerMDRequest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerMDScCmp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerMDType.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerManager.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerMaterialize.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerMergeJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerMetadata.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerMetadataColumn.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerMetadataColumns.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerMetadataIdList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerMetadataObject.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerNLJIndexParam.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerNLJIndexParamList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerNLJoin.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerOp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerOptimizerConfig.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerPartitionSelector.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerPhysicalAbstractBitmapScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerPhysicalBitmapTableScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTAS.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEConsumer.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEProducer.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerPhysicalDML.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerPhysicalDynamicBitmapTableScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerPhysicalOp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerPhysicalSplit.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerPhysicalTVF.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerPhysicalWindow.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerPlan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerPlanHint.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerProjElem.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerProjList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerProperties.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerQuery.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerQueryOutput.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerRandomMotion.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerRedistributeMotion.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerRelStats.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerRelationExtendedStats.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerResult.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerRoutedMotion.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarAggref.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayCoerceExpr.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayComp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayRef.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayRefIndexList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarAssertConstraintList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarBitmapBoolOp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarBitmapIndexProbe.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarBoolExpr.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarBooleanTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarCaseTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarCast.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarCoalesce.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarCoerceToDomain.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarCoerceViaIO.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarComp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarConstValue.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarDMLAction.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarExpr.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarFieldSelect.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarFuncExpr.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarIdent.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarIfStmt.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarLimitCount.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarLimitOffset.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarMinMax.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarNullIf.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarNullTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarOp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarOpExpr.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarOpList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarParam.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarSortGroupClause.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanParam.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanParamList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanTestExpr.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarSubquery.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarSubqueryExists.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarSubqueryQuantified.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarSwitch.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarSwitchCase.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarValuesList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarWindowFrameEdge.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerScalarWindowRef.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerSearchStage.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerSearchStrategy.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerSequence.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerSort.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerSortCol.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerSortColList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerStackTrace.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerStatistics.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerStatisticsConfig.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerStatsBound.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedColumn.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedRelation.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerTableDescr.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerTableScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerTraceFlags.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerUtils.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerValuesScan.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerWindowFrame.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerWindowKey.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerWindowKeyList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerWindowOids.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerWindowSpec.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerWindowSpecList.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/parser/CParseHandlerXform.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/statistics/CBucket.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/statistics/CExtendedStatsProcessor.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/statistics/CFilterStatsProcessor.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/statistics/CGroupByStatsProcessor.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/statistics/CHistogram.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/statistics/CInnerJoinStatsProcessor.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/statistics/CJoinStatsProcessor.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/statistics/CLeftAntiSemiJoinStatsProcessor.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/statistics/CLeftOuterJoinStatsProcessor.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/statistics/CLeftSemiJoinStatsProcessor.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/statistics/CLimitStatsProcessor.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/statistics/CPoint.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/statistics/CProjectStatsProcessor.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/statistics/CScaleFactorUtils.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/statistics/CStatistics.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/statistics/CStatisticsUtils.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/statistics/CStatsPredArrayCmp.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/statistics/CStatsPredConj.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/statistics/CStatsPredDisj.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/statistics/CStatsPredLike.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/statistics/CStatsPredPoint.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/statistics/CStatsPredUnsupported.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/statistics/CStatsPredUtils.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/statistics/CUnionAllStatsProcessor.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/statistics/CUpperBoundNDVs.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/traceflags.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/xml/CDXLMemoryManager.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/xml/CDXLSections.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/xml/CXMLSerializer.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/libnaucrates/src/xml/dxltokens.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/scripts/cal_bitmap_test.py (100%)
 rename {src/backend => gpcontrib/orca}/gporca/scripts/convert_minirepro_5_to_6.py (100%)
 rename {src/backend => gpcontrib/orca}/gporca/scripts/convert_minirepro_6_to_7.py (100%)
 rename {src/backend => gpcontrib/orca}/gporca/scripts/dxl_modify_partitioned_index.py (100%)
 rename {src/backend => gpcontrib/orca}/gporca/scripts/fix_lookup_failure.py (100%)
 rename {src/backend => gpcontrib/orca}/gporca/scripts/fix_mdps.py (100%)
 rename {src/backend => gpcontrib/orca}/gporca/scripts/get_debug_event_counters.py (100%)
 rename {src/backend => gpcontrib/orca}/gporca/scripts/tests/test_cal_bitmap_test.py (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/CMakeLists.txt (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/dxl.xsd (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/fixdxl.sh (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/base.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/dxl/CDXLMemoryManagerTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/dxl/CDXLUtilsTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/dxl/CParseHandlerCostModelTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/dxl/CParseHandlerManagerTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/dxl/CParseHandlerOptimizerConfigSerializeTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/dxl/CParseHandlerTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/dxl/CXMLSerializerTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/dxl/base/CDatumTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/dxl/statistics/CBucketTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/dxl/statistics/CCardinalityTestUtils.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/dxl/statistics/CFilterCardinalityTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/dxl/statistics/CHistogramTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/dxl/statistics/CJoinCardinalityTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/dxl/statistics/CMCVTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/dxl/statistics/CPointTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/dxl/statistics/CStatisticsTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/CConstExprEvaluatorForDates.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/CSubqueryTestUtils.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/CTestUtils.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/base/CColRefSetIterTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/base/CColRefSetTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/base/CColumnFactoryTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/base/CConstraintTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/base/CDistributionSpecTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/base/CEquivalenceClassesTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/base/CFunctionalDependencyTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/base/CGroupTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/base/CKeyCollectionTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/base/CMaxCardTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/base/COrderSpecTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/base/CRangeTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/base/CStateMachineTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/cost/CCostTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/csq/CCorrelatedExecutionTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/engine/CBindingTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/engine/CEngineTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/engine/CEnumeratorTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/eval/CConstExprEvaluatorDXLTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/eval/CConstExprEvaluatorDefaultTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/mdcache/CMDAccessorTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/mdcache/CMDProviderTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/metadata/CColumnDescriptorTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/metadata/CIndexDescriptorTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/metadata/CNameTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/metadata/CTableDescriptorTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/minidump/CAggTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/minidump/CArrayExpansionTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/minidump/CBitmapTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/minidump/CCTETest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/minidump/CCastTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/minidump/CCollapseProjectTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/minidump/CConstTblGetTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/minidump/CDMLTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/minidump/CDirectDispatchTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/minidump/CEscapeMechanismTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/minidump/CExternalTableTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/minidump/CICGTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/minidump/CJoinOrderDPTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/minidump/CMiniDumperDXLTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/minidump/CMinidumpWithConstExprEvaluatorTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/minidump/CMissingStatsTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/minidump/CMultilevelPartitionTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/minidump/CPhysicalParallelUnionAllTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/minidump/CPruneColumnsTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/minidump/CPullUpProjectElementTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/minidump/CSubqueryTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/minidump/CTVFTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/minidump/CWindowTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/minidump/MinidumpTest.h.in (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/operators/CContradictionTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/operators/CExpressionPreprocessorTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/operators/CExpressionTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/operators/CLogicalGbAggTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/operators/CPredicateUtilsTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/operators/CScalarIsDistinctFromTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/search/COptimizationJobsTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/search/CSearchStrategyTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/search/CTreeMapTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/translate/CTranslatorDXLToExprTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/translate/CTranslatorExprToDXLTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/xforms/CDecorrelatorTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/xforms/CJoinOrderTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/xforms/CSubqueryHandlerTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/xforms/CXformFactoryTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/xforms/CXformRightOuterJoin2HashJoinTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/include/unittest/gpopt/xforms/CXformTest.h (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/startup/main.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/CConstExprEvaluatorForDates.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/CSubqueryTestUtils.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/CTestUtils.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/dxl/CDXLMemoryManagerTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/dxl/CDXLUtilsTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/dxl/CMDProviderTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/dxl/CParseHandlerCostModelTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/dxl/CParseHandlerManagerTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/dxl/CParseHandlerOptimizerConfigSerializeTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/dxl/CParseHandlerTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/dxl/CXMLSerializerTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/dxl/base/CDatumTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/dxl/statistics/CBucketTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/dxl/statistics/CCardinalityTestUtils.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/dxl/statistics/CFilterCardinalityTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/dxl/statistics/CHistogramTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/dxl/statistics/CJoinCardinalityTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/dxl/statistics/CMCVTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/dxl/statistics/CPointTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/dxl/statistics/CStatisticsTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/base/CColRefSetIterTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/base/CColRefSetTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/base/CColumnFactoryTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/base/CConstraintTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/base/CDistributionSpecTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/base/CEquivalenceClassesTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/base/CFunctionalDependencyTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/base/CGroupTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/base/CKeyCollectionTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/base/CMaxCardTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/base/COrderSpecTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/base/CRangeTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/base/CStateMachineTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/cost/CCostTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/csq/CCorrelatedExecutionTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/engine/CBindingTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/engine/CEngineTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/engine/CEnumeratorTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/eval/CConstExprEvaluatorDXLTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/eval/CConstExprEvaluatorDefaultTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/mdcache/CMDAccessorTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/metadata/CColumnDescriptorTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/metadata/CIndexDescriptorTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/metadata/CNameTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/metadata/CTableDescriptorTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/minidump/CAggTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/minidump/CArrayExpansionTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/minidump/CBitmapTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/minidump/CCTETest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/minidump/CCastTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/minidump/CCollapseProjectTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/minidump/CConstTblGetTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/minidump/CDMLTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/minidump/CDirectDispatchTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/minidump/CEscapeMechanismTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/minidump/CExternalTableTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/minidump/CICGTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/minidump/CJoinOrderDPTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/minidump/CMiniDumperDXLTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/minidump/CMinidumpWithConstExprEvaluatorTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/minidump/CMissingStatsTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/minidump/CMultilevelPartitionTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/minidump/CPhysicalParallelUnionAllTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/minidump/CPruneColumnsTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/minidump/CPullUpProjectElementTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/minidump/CSubqueryTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/minidump/CTVFTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/minidump/CWindowTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/minidump/MinidumpTest.cpp.in (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/operators/CContradictionTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/operators/CExpressionPreprocessorTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/operators/CExpressionTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/operators/CLogicalGbAggTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/operators/CPredicateUtilsTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/operators/CScalarIsDistinctFromTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/search/COptimizationJobsTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/search/CSearchStrategyTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/search/CTreeMapTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/translate/CTranslatorDXLToExprTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/translate/CTranslatorExprToDXLTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/xforms/CDecorrelatorTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/xforms/CJoinOrderTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/xforms/CSubqueryHandlerTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/xforms/CXformFactoryTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/xforms/CXformRightOuterJoin2HashJoinTest.cpp (100%)
 rename {src/backend => gpcontrib/orca}/gporca/server/src/unittest/gpopt/xforms/CXformTest.cpp (100%)
 rename {src => gpcontrib/orca}/include/gpopt/.clang-format (100%)
 rename {src => gpcontrib/orca}/include/gpopt/CGPOptimizer.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/config/CConfigParamMapping.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/gpdbwrappers.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/relcache/CMDProviderRelcache.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/translate/CCTEListEntry.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/translate/CContextDXLToPlStmt.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/translate/CContextQueryToDXL.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/translate/CDXLTranslateContext.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/translate/CDXLTranslateContextBaseTable.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/translate/CGPDBAttInfo.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/translate/CGPDBAttOptCol.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/translate/CIndexQualInfo.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/translate/CMappingColIdVar.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/translate/CMappingColIdVarPlStmt.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/translate/CMappingElementColIdParamId.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/translate/CMappingVarColId.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/translate/COptColInfo.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/translate/CPartPruneStepsBuilder.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/translate/CQueryMutators.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/translate/CTranslatorDXLToPlStmt.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/translate/CTranslatorDXLToScalar.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/translate/CTranslatorQueryToDXL.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/translate/CTranslatorRelcacheToDXL.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/translate/CTranslatorScalarToDXL.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/translate/CTranslatorUtils.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/utils/CConstExprEvaluatorProxy.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/utils/CMemoryPoolPalloc.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/utils/CMemoryPoolPallocManager.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/utils/COptTasks.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/utils/RelationWrapper.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/utils/funcs.h (100%)
 rename {src => gpcontrib/orca}/include/gpopt/utils/gpdbdefs.h (100%)
 rename {src => gpcontrib/orca}/include/optimizer/orca.h (93%)
 rename src/backend/optimizer/plan/orca.c => gpcontrib/orca/orca_entry.c (99%)
 rename {src => gpcontrib/orca}/tools/fmt (85%)
 rename {src => gpcontrib/orca}/tools/tidy (76%)
 delete mode 100644 src/backend/gpopt/Makefile
 delete mode 100644 src/backend/gpopt/config/Makefile
 delete mode 100644 src/backend/gpopt/gpopt.mk
 delete mode 100644 src/backend/gpopt/relcache/Makefile
 delete mode 100644 src/backend/gpopt/translate/Makefile
 delete mode 100644 src/backend/gpopt/utils/Makefile
 delete mode 100644 src/backend/gporca/Makefile
 delete mode 100644 src/backend/gporca/gporca.mk
 delete mode 100644 src/backend/gporca/libgpdbcost/Makefile
 delete mode 100644 src/backend/gporca/libgpdbcost/src/Makefile
 delete mode 100644 src/backend/gporca/libgpopt/Makefile
 delete mode 100644 src/backend/gporca/libgpopt/src/Makefile
 delete mode 100644 src/backend/gporca/libgpopt/src/base/Makefile
 delete mode 100644 src/backend/gporca/libgpopt/src/engine/Makefile
 delete mode 100644 src/backend/gporca/libgpopt/src/eval/Makefile
 delete mode 100644 src/backend/gporca/libgpopt/src/hints/Makefile
 delete mode 100644 src/backend/gporca/libgpopt/src/mdcache/Makefile
 delete mode 100644 src/backend/gporca/libgpopt/src/metadata/Makefile
 delete mode 100644 src/backend/gporca/libgpopt/src/minidump/Makefile
 delete mode 100644 src/backend/gporca/libgpopt/src/operators/Makefile
 delete mode 100644 src/backend/gporca/libgpopt/src/optimizer/Makefile
 delete mode 100644 src/backend/gporca/libgpopt/src/search/Makefile
 delete mode 100644 src/backend/gporca/libgpopt/src/translate/Makefile
 delete mode 100644 src/backend/gporca/libgpopt/src/xforms/Makefile
 delete mode 100644 src/backend/gporca/libgpos/Makefile
 delete mode 100644 src/backend/gporca/libgpos/src/Makefile
 delete mode 100644 src/backend/gporca/libgpos/src/common/Makefile
 delete mode 100644 src/backend/gporca/libgpos/src/error/Makefile
 delete mode 100644 src/backend/gporca/libgpos/src/io/Makefile
 delete mode 100644 src/backend/gporca/libgpos/src/memory/Makefile
 delete mode 100644 src/backend/gporca/libgpos/src/string/Makefile
 delete mode 100644 src/backend/gporca/libgpos/src/task/Makefile
 delete mode 100644 src/backend/gporca/libgpos/src/test/Makefile
 delete mode 100644 src/backend/gporca/libnaucrates/Makefile
 delete mode 100644 src/backend/gporca/libnaucrates/src/Makefile
 delete mode 100644 src/backend/gporca/libnaucrates/src/base/Makefile
 delete mode 100644 src/backend/gporca/libnaucrates/src/md/Makefile
 delete mode 100644 src/backend/gporca/libnaucrates/src/operators/Makefile
 delete mode 100644 src/backend/gporca/libnaucrates/src/parser/Makefile
 delete mode 100644 src/backend/gporca/libnaucrates/src/statistics/Makefile
 delete mode 100644 src/backend/gporca/libnaucrates/src/xml/Makefile
 delete mode 100644 src/test/unit/mock/gpopt_mock.c

diff --git a/.abi-check/7.2.0_arenadata7/postgres.symbols.ignore b/.abi-check/7.2.0_arenadata7/postgres.symbols.ignore
new file mode 100644
index 000000000000..e2b55ff6c813
--- /dev/null
+++ b/.abi-check/7.2.0_arenadata7/postgres.symbols.ignore
@@ -0,0 +1,5 @@
+OptimizerMemoryContext
+optimize_query
+transformGroupedWindows
+optopt@@GLIBC_2.2.5
+optopt
diff --git a/.abi-check/7.2.0_arenadata6/postgres.types.ignore b/.abi-check/7.2.0_arenadata7/postgres.types.ignore
similarity index 95%
rename from .abi-check/7.2.0_arenadata6/postgres.types.ignore
rename to .abi-check/7.2.0_arenadata7/postgres.types.ignore
index 1550c4f921ad..68428bc6a3b6 100644
--- a/.abi-check/7.2.0_arenadata6/postgres.types.ignore
+++ b/.abi-check/7.2.0_arenadata7/postgres.types.ignore
@@ -1,2 +1 @@
 struct PlannedStmt
-
diff --git a/.travis.yml b/.travis.yml
index 0708f97c2a68..7853a1f5bdf0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -121,9 +121,9 @@ matrix:
                 --enable-orca \
                 --without-zstd --disable-gpfdist \
                 CC="ccache clang-11" CXX="ccache clang++-11" CFLAGS=-O0 CXXFLAGS=-O0
-              bear --append make -s -C src/backend/gpopt
+              bear --append -- make -s -C gpcontrib/orca
               )
-              CLANG_TIDY=clang-tidy-11 src/tools/tidy chk-gpopt ../vpath.debug
+              CLANG_TIDY=clang-tidy-11 gpcontrib/orca/tools/tidy chk-gpopt ../vpath.debug
             - |
               (
               set -e
@@ -135,13 +135,13 @@ matrix:
                 --enable-orca \
                 --without-zstd --disable-gpfdist \
                 CC="ccache clang-11" CXX="ccache clang++-11" CFLAGS=-O0 CXXFLAGS=-O0
-              bear --append make -s -C src/backend/gpopt
+              bear --append -- make -s -C gpcontrib/orca
               )
-              CLANG_TIDY=clang-tidy-11 src/tools/tidy chk-gpopt ../vpath.release
-            - CXX=clang++-11 cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -GNinja -DCMAKE_BUILD_TYPE=Debug -Hsrc/backend/gporca -Bbuild.debug
-            - CLANG_TIDY=clang-tidy-11 src/tools/tidy chk-orca build.debug
-            - CXX=clang++-11 cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -Hsrc/backend/gporca -Bbuild.relwithdebinfo
-            - CLANG_TIDY=clang-tidy-11 src/tools/tidy chk-orca build.relwithdebinfo
+              CLANG_TIDY=clang-tidy-11 gpcontrib/orca/tools/tidy chk-gpopt ../vpath.release
+            - CXX=clang++-11 cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -GNinja -DCMAKE_BUILD_TYPE=Debug -Hgpcontrib/orca/gporca -Bbuild.debug
+            - CLANG_TIDY=clang-tidy-11 gpcontrib/orca/tools/tidy chk-orca build.debug
+            - CXX=clang++-11 cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -Hgpcontrib/orca/gporca -Bbuild.relwithdebinfo
+            - CLANG_TIDY=clang-tidy-11 gpcontrib/orca/tools/tidy chk-orca build.relwithdebinfo
 
         - name: check-format
           stage: lint
@@ -157,9 +157,9 @@ matrix:
           before_script: ~
           after_script: ~
           script:
-            - env CLANG_FORMAT=clang-format-11 src/tools/fmt gen
+            - env CLANG_FORMAT=clang-format-11 gpcontrib/orca/tools/fmt gen
             - git diff --exit-code
-            - env CLANG_FORMAT=clang-format-11 src/tools/fmt chk
+            - env CLANG_FORMAT=clang-format-11 gpcontrib/orca/tools/fmt chk
 
 stages:
   - lint
diff --git a/arenadata/Dockerfile.linter b/arenadata/Dockerfile.linter
index 24089aab3bc9..3f528204ba0a 100644
--- a/arenadata/Dockerfile.linter
+++ b/arenadata/Dockerfile.linter
@@ -9,4 +9,4 @@ COPY . /opt/gpdb_src
 
 ENV CLANG_FORMAT=clang-format-11
 
-ENTRYPOINT src/tools/fmt gen && git diff --exit-code && src/tools/fmt chk
+ENTRYPOINT gpcontrib/orca/tools/fmt gen && git diff --exit-code && gpcontrib/orca/tools/fmt chk
diff --git a/concourse/scripts/unit_tests_gporca.bash b/concourse/scripts/unit_tests_gporca.bash
index c7b6956cdd4f..39f3aaa369e7 100755
--- a/concourse/scripts/unit_tests_gporca.bash
+++ b/concourse/scripts/unit_tests_gporca.bash
@@ -7,7 +7,7 @@ function build_xerces
 {
     OUTPUT_DIR="gpdb_src/gpAux/ext/${BLD_ARCH}"
     mkdir -p xerces_patch/concourse
-    cp -r gpdb_src/src/backend/gporca/concourse/xerces-c xerces_patch/concourse
+    cp -r gpdb_src/gpcontrib/orca/gporca/concourse/xerces-c xerces_patch/concourse
     /usr/bin/python3 xerces_patch/concourse/xerces-c/build_xerces.py --output_dir=${OUTPUT_DIR}
     rm -rf build
 }
@@ -18,7 +18,7 @@ function test_orca
         return
     fi
     OUTPUT_DIR="../../../../gpAux/ext/${BLD_ARCH}"
-    pushd ${GPDB_SRC_PATH}/src/backend/gporca
+    pushd ${GPDB_SRC_PATH}/gpcontrib/orca/gporca
     concourse/build_and_test.py --build_type=RelWithDebInfo --output_dir=${OUTPUT_DIR}
     concourse/build_and_test.py --build_type=Debug --output_dir=${OUTPUT_DIR}
     popd
diff --git a/concourse/tasks/check_format.yml b/concourse/tasks/check_format.yml
index 5c6541298f70..27a3cf3f8c93 100644
--- a/concourse/tasks/check_format.yml
+++ b/concourse/tasks/check_format.yml
@@ -9,7 +9,7 @@ inputs:
   - name: gpdb_src
     path: .
 run:
-  path: src/tools/fmt
+  path: gpcontrib/orca/tools/fmt
   args: [ chk ]
 params:
   CLANG_FORMAT: clang-format-11
diff --git a/concourse/tasks/clang_tidy.yml b/concourse/tasks/clang_tidy.yml
index 8175c1397817..f432b5ea5aa7 100644
--- a/concourse/tasks/clang_tidy.yml
+++ b/concourse/tasks/clang_tidy.yml
@@ -21,7 +21,7 @@ run:
         --enable-orca \
         --without-python --without-readline --without-zlib --without-zstd --without-libbz2 --disable-gpfdist --disable-gpcloud --without-libcurl \
         CC="ccache clang-11" CXX="ccache clang++-11" CFLAGS=-O0 CXXFLAGS=-O0
-      bear --append make -s -C src/backend/gpopt
+      bear --append -- make -s -C gpcontrib/orca
     )
     (
       mkdir vpath.release
@@ -31,17 +31,17 @@ run:
         --enable-orca \
         --without-python --without-readline --without-zlib --without-zstd --without-libbz2 --disable-gpfdist --disable-gpcloud --without-libcurl \
         CC="ccache clang-11" CXX="ccache clang++-11" CFLAGS=-O0 CXXFLAGS=-O0
-      bear --append make -s -C src/backend/gpopt
+      bear --append -- make -s -C gpcontrib/orca
     )
     (
       cd gpdb_src
-      src/tools/tidy chk-gpopt ../vpath.debug
-      src/tools/tidy chk-gpopt ../vpath.release
+      gpcontrib/orca/tools/tidy chk-gpopt ../vpath.debug
+      gpcontrib/orca/tools/tidy chk-gpopt ../vpath.release
 
-      CXX=clang++-11 cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -GNinja -DCMAKE_BUILD_TYPE=Debug -Hsrc/backend/gporca -Bbuild.debug
-      src/tools/tidy chk-orca build.debug
-      CXX=clang++-11 cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -Hsrc/backend/gporca -Bbuild.relwithdebinfo
-      src/tools/tidy chk-orca build.relwithdebinfo
+      CXX=clang++-11 cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -GNinja -DCMAKE_BUILD_TYPE=Debug -Hgpcontrib/orca/gporca -Bbuild.debug
+      gpcontrib/orca/tools/tidy chk-orca build.debug
+      CXX=clang++-11 cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -GNinja -DCMAKE_BUILD_TYPE=RelWithDebInfo -Hgpcontrib/orca/gporca -Bbuild.relwithdebinfo
+      gpcontrib/orca/tools/tidy chk-orca build.relwithdebinfo
     )
 
 params:
diff --git a/gpcontrib/orca/Makefile b/gpcontrib/orca/Makefile
index b3074f6afd63..55c04f2ca309 100644
--- a/gpcontrib/orca/Makefile
+++ b/gpcontrib/orca/Makefile
@@ -1,13 +1,55 @@
 MODULE_big = orca
 
-OBJS = orca.o \
+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/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) \
+	orca.o \
 	funcs.o \
+	orca_entry.o \
 
 PG_CPPFLAGS = \
-	-I$(top_srcdir)/src/backend/gporca/libgpos/include $(CPPFLAGS) \
-	-I$(top_srcdir)/src/backend/gporca/libgpopt/include $(CPPFLAGS) \
-	-I$(top_srcdir)/src/backend/gporca/libnaucrates/include $(CPPFLAGS) \
-	-I$(top_srcdir)/src/backend/gporca/libgpdbcost/include $(CPPFLAGS) \
+	-I$(top_srcdir)/gpcontrib/orca/gporca/libgpos/include \
+	-I$(top_srcdir)/gpcontrib/orca/gporca/libgpopt/include \
+	-I$(top_srcdir)/gpcontrib/orca/gporca/libnaucrates/include \
+	-I$(top_srcdir)/gpcontrib/orca/gporca/libgpdbcost/include \
+	-I$(top_srcdir)/gpcontrib/orca/include \
+
+PG_CXXFLAGS = -Werror -Wextra -Wpedantic -fno-omit-frame-pointer
+
+SHLIB_LINK += -lxerces-c
 
 ifdef USE_PGXS
 PG_CONFIG = pg_config
diff --git a/src/backend/gpopt/.clang-format b/gpcontrib/orca/gpopt/.clang-format
similarity index 100%
rename from src/backend/gpopt/.clang-format
rename to gpcontrib/orca/gpopt/.clang-format
diff --git a/src/backend/gpopt/CGPOptimizer.cpp b/gpcontrib/orca/gpopt/CGPOptimizer.cpp
similarity index 100%
rename from src/backend/gpopt/CGPOptimizer.cpp
rename to gpcontrib/orca/gpopt/CGPOptimizer.cpp
diff --git a/src/backend/gpopt/README b/gpcontrib/orca/gpopt/README
similarity index 100%
rename from src/backend/gpopt/README
rename to gpcontrib/orca/gpopt/README
diff --git a/src/backend/gpopt/config/CConfigParamMapping.cpp b/gpcontrib/orca/gpopt/config/CConfigParamMapping.cpp
similarity index 100%
rename from src/backend/gpopt/config/CConfigParamMapping.cpp
rename to gpcontrib/orca/gpopt/config/CConfigParamMapping.cpp
diff --git a/src/backend/gpopt/gpdbwrappers.cpp b/gpcontrib/orca/gpopt/gpdbwrappers.cpp
similarity index 100%
rename from src/backend/gpopt/gpdbwrappers.cpp
rename to gpcontrib/orca/gpopt/gpdbwrappers.cpp
diff --git a/src/backend/gpopt/relcache/CMDProviderRelcache.cpp b/gpcontrib/orca/gpopt/relcache/CMDProviderRelcache.cpp
similarity index 100%
rename from src/backend/gpopt/relcache/CMDProviderRelcache.cpp
rename to gpcontrib/orca/gpopt/relcache/CMDProviderRelcache.cpp
diff --git a/src/backend/gpopt/translate/CCTEListEntry.cpp b/gpcontrib/orca/gpopt/translate/CCTEListEntry.cpp
similarity index 100%
rename from src/backend/gpopt/translate/CCTEListEntry.cpp
rename to gpcontrib/orca/gpopt/translate/CCTEListEntry.cpp
diff --git a/src/backend/gpopt/translate/CContextDXLToPlStmt.cpp b/gpcontrib/orca/gpopt/translate/CContextDXLToPlStmt.cpp
similarity index 100%
rename from src/backend/gpopt/translate/CContextDXLToPlStmt.cpp
rename to gpcontrib/orca/gpopt/translate/CContextDXLToPlStmt.cpp
diff --git a/src/backend/gpopt/translate/CContextQueryToDXL.cpp b/gpcontrib/orca/gpopt/translate/CContextQueryToDXL.cpp
similarity index 100%
rename from src/backend/gpopt/translate/CContextQueryToDXL.cpp
rename to gpcontrib/orca/gpopt/translate/CContextQueryToDXL.cpp
diff --git a/src/backend/gpopt/translate/CDXLTranslateContext.cpp b/gpcontrib/orca/gpopt/translate/CDXLTranslateContext.cpp
similarity index 100%
rename from src/backend/gpopt/translate/CDXLTranslateContext.cpp
rename to gpcontrib/orca/gpopt/translate/CDXLTranslateContext.cpp
diff --git a/src/backend/gpopt/translate/CDXLTranslateContextBaseTable.cpp b/gpcontrib/orca/gpopt/translate/CDXLTranslateContextBaseTable.cpp
similarity index 100%
rename from src/backend/gpopt/translate/CDXLTranslateContextBaseTable.cpp
rename to gpcontrib/orca/gpopt/translate/CDXLTranslateContextBaseTable.cpp
diff --git a/src/backend/gpopt/translate/CMappingColIdVar.cpp b/gpcontrib/orca/gpopt/translate/CMappingColIdVar.cpp
similarity index 100%
rename from src/backend/gpopt/translate/CMappingColIdVar.cpp
rename to gpcontrib/orca/gpopt/translate/CMappingColIdVar.cpp
diff --git a/src/backend/gpopt/translate/CMappingColIdVarPlStmt.cpp b/gpcontrib/orca/gpopt/translate/CMappingColIdVarPlStmt.cpp
similarity index 100%
rename from src/backend/gpopt/translate/CMappingColIdVarPlStmt.cpp
rename to gpcontrib/orca/gpopt/translate/CMappingColIdVarPlStmt.cpp
diff --git a/src/backend/gpopt/translate/CMappingElementColIdParamId.cpp b/gpcontrib/orca/gpopt/translate/CMappingElementColIdParamId.cpp
similarity index 100%
rename from src/backend/gpopt/translate/CMappingElementColIdParamId.cpp
rename to gpcontrib/orca/gpopt/translate/CMappingElementColIdParamId.cpp
diff --git a/src/backend/gpopt/translate/CMappingVarColId.cpp b/gpcontrib/orca/gpopt/translate/CMappingVarColId.cpp
similarity index 100%
rename from src/backend/gpopt/translate/CMappingVarColId.cpp
rename to gpcontrib/orca/gpopt/translate/CMappingVarColId.cpp
diff --git a/src/backend/gpopt/translate/CPartPruneStepsBuilder.cpp b/gpcontrib/orca/gpopt/translate/CPartPruneStepsBuilder.cpp
similarity index 100%
rename from src/backend/gpopt/translate/CPartPruneStepsBuilder.cpp
rename to gpcontrib/orca/gpopt/translate/CPartPruneStepsBuilder.cpp
diff --git a/src/backend/gpopt/translate/CQueryMutators.cpp b/gpcontrib/orca/gpopt/translate/CQueryMutators.cpp
similarity index 100%
rename from src/backend/gpopt/translate/CQueryMutators.cpp
rename to gpcontrib/orca/gpopt/translate/CQueryMutators.cpp
diff --git a/src/backend/gpopt/translate/CTranslatorDXLToPlStmt.cpp b/gpcontrib/orca/gpopt/translate/CTranslatorDXLToPlStmt.cpp
similarity index 100%
rename from src/backend/gpopt/translate/CTranslatorDXLToPlStmt.cpp
rename to gpcontrib/orca/gpopt/translate/CTranslatorDXLToPlStmt.cpp
diff --git a/src/backend/gpopt/translate/CTranslatorDXLToScalar.cpp b/gpcontrib/orca/gpopt/translate/CTranslatorDXLToScalar.cpp
similarity index 100%
rename from src/backend/gpopt/translate/CTranslatorDXLToScalar.cpp
rename to gpcontrib/orca/gpopt/translate/CTranslatorDXLToScalar.cpp
diff --git a/src/backend/gpopt/translate/CTranslatorQueryToDXL.cpp b/gpcontrib/orca/gpopt/translate/CTranslatorQueryToDXL.cpp
similarity index 100%
rename from src/backend/gpopt/translate/CTranslatorQueryToDXL.cpp
rename to gpcontrib/orca/gpopt/translate/CTranslatorQueryToDXL.cpp
diff --git a/src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp b/gpcontrib/orca/gpopt/translate/CTranslatorRelcacheToDXL.cpp
similarity index 100%
rename from src/backend/gpopt/translate/CTranslatorRelcacheToDXL.cpp
rename to gpcontrib/orca/gpopt/translate/CTranslatorRelcacheToDXL.cpp
diff --git a/src/backend/gpopt/translate/CTranslatorScalarToDXL.cpp b/gpcontrib/orca/gpopt/translate/CTranslatorScalarToDXL.cpp
similarity index 100%
rename from src/backend/gpopt/translate/CTranslatorScalarToDXL.cpp
rename to gpcontrib/orca/gpopt/translate/CTranslatorScalarToDXL.cpp
diff --git a/src/backend/gpopt/translate/CTranslatorUtils.cpp b/gpcontrib/orca/gpopt/translate/CTranslatorUtils.cpp
similarity index 100%
rename from src/backend/gpopt/translate/CTranslatorUtils.cpp
rename to gpcontrib/orca/gpopt/translate/CTranslatorUtils.cpp
diff --git a/src/backend/gpopt/translate/README b/gpcontrib/orca/gpopt/translate/README
similarity index 100%
rename from src/backend/gpopt/translate/README
rename to gpcontrib/orca/gpopt/translate/README
diff --git a/src/backend/gpopt/utils/CConstExprEvaluatorProxy.cpp b/gpcontrib/orca/gpopt/utils/CConstExprEvaluatorProxy.cpp
similarity index 100%
rename from src/backend/gpopt/utils/CConstExprEvaluatorProxy.cpp
rename to gpcontrib/orca/gpopt/utils/CConstExprEvaluatorProxy.cpp
diff --git a/src/backend/gpopt/utils/CMemoryPoolPalloc.cpp b/gpcontrib/orca/gpopt/utils/CMemoryPoolPalloc.cpp
similarity index 100%
rename from src/backend/gpopt/utils/CMemoryPoolPalloc.cpp
rename to gpcontrib/orca/gpopt/utils/CMemoryPoolPalloc.cpp
diff --git a/src/backend/gpopt/utils/CMemoryPoolPallocManager.cpp b/gpcontrib/orca/gpopt/utils/CMemoryPoolPallocManager.cpp
similarity index 100%
rename from src/backend/gpopt/utils/CMemoryPoolPallocManager.cpp
rename to gpcontrib/orca/gpopt/utils/CMemoryPoolPallocManager.cpp
diff --git a/src/backend/gpopt/utils/COptTasks.cpp b/gpcontrib/orca/gpopt/utils/COptTasks.cpp
similarity index 99%
rename from src/backend/gpopt/utils/COptTasks.cpp
rename to gpcontrib/orca/gpopt/utils/COptTasks.cpp
index 5e09e901bea4..cd9d8cac6325 100644
--- a/src/backend/gpopt/utils/COptTasks.cpp
+++ b/gpcontrib/orca/gpopt/utils/COptTasks.cpp
@@ -829,7 +829,7 @@ COptTasks::OptimizeTask(void *ptr)
 				!optimizer_enable_motions ||
 				(!optimizer_enable_motions_coordinatoronly_queries &&
 				 !query_to_dxl_translator->HasDistributedTables());
-			// See NoteDistributionPolicyOpclasses() in src/backend/gpopt/translate/CTranslatorQueryToDXL.cpp
+			// See NoteDistributionPolicyOpclasses() in gpcontrib/orca/gpopt/translate/CTranslatorQueryToDXL.cpp
 			BOOL use_legacy_opfamilies =
 				(query_to_dxl_translator->GetDistributionHashOpsKind() ==
 				 DistrUseLegacyHashOps);
diff --git a/src/backend/gpopt/utils/RelationWrapper.cpp b/gpcontrib/orca/gpopt/utils/RelationWrapper.cpp
similarity index 100%
rename from src/backend/gpopt/utils/RelationWrapper.cpp
rename to gpcontrib/orca/gpopt/utils/RelationWrapper.cpp
diff --git a/src/backend/gporca/.clang-format b/gpcontrib/orca/gporca/.clang-format
similarity index 100%
rename from src/backend/gporca/.clang-format
rename to gpcontrib/orca/gporca/.clang-format
diff --git a/src/backend/gporca/.gitignore b/gpcontrib/orca/gporca/.gitignore
similarity index 100%
rename from src/backend/gporca/.gitignore
rename to gpcontrib/orca/gporca/.gitignore
diff --git a/src/backend/gporca/CMakeLists.txt b/gpcontrib/orca/gporca/CMakeLists.txt
similarity index 100%
rename from src/backend/gporca/CMakeLists.txt
rename to gpcontrib/orca/gporca/CMakeLists.txt
diff --git a/src/backend/gporca/COPYRIGHT b/gpcontrib/orca/gporca/COPYRIGHT
similarity index 100%
rename from src/backend/gporca/COPYRIGHT
rename to gpcontrib/orca/gporca/COPYRIGHT
diff --git a/src/backend/gporca/README.format.md b/gpcontrib/orca/gporca/README.format.md
similarity index 90%
rename from src/backend/gporca/README.format.md
rename to gpcontrib/orca/gporca/README.format.md
index c6a17628b779..8c68bf9cc0e6 100644
--- a/src/backend/gporca/README.format.md
+++ b/gpcontrib/orca/gporca/README.format.md
@@ -18,10 +18,10 @@
 1. We should use an explicit, complete (locked down) specification for the [.clang-format](.clang-format) file.
 
 1. But our intent is better expressed as [well organized, commented yaml](clang-format.intent.yaml).
-   We use a [simple script](../../../src/tools/fmt) to generate the complete config file from the intent file. For example, on my Linux laptop, I run:
+   We use a [simple script](../../../gpcontrib/orca/tools/fmt) to generate the complete config file from the intent file. For example, on my Linux laptop, I run:
 
    ```shell
-   CLANG_FORMAT=clang-format-10 src/tools/fmt gen
+   CLANG_FORMAT=clang-format-10 gpcontrib/orca/tools/fmt gen
    ```
 
    If the correct version of `clang-format` is installed as `clang-format` (as is the case in macOS), you can omit the environment variable override.
@@ -29,7 +29,7 @@
 1. To check for formatting conformance, one can run
 
    ```shell
-   src/tools/fmt chk
+   gpcontrib/orca/tools/fmt chk
    ```
 
    It will succeed quietly (with return code 0) or point out the first few places that need to be formatted.
@@ -37,7 +37,7 @@
 1. To wholesale format all of ORCA and GPOPT
 
    ```shell
-   src/tools/fmt fmt
+   gpcontrib/orca/tools/fmt fmt
    ```
 
    On my laptop this takes about 2.5 seconds.
@@ -118,7 +118,7 @@ The following steps are used to convert in-flight branches to the new format.
    +++ /tmp/todo2	2020-11-12 16:48:07.291333698 -0800
    @@ -1,7 +1,8 @@
     pick 87fd0149caf8f052 Penultimate commit on main
-   +exec git checkout origin/main -- src/tools/fmt src/include/gpopt/.clang-format src/backend/gpopt/.clang-format src/backend/gporca/.clang-format; git commit -m 'this commit will disappear'
+   +exec git checkout origin/main -- gpcontrib/orca/tools/fmt gpcontrib/orca/include/gpopt/.clang-format gpcontrib/orca/gpopt/.clang-format gpcontrib/orca/gporca/.clang-format; git commit -m 'this commit will disappear'
     pick 93235faf306f4ecb 1st commit from PR
     pick 2b7ad8b9fd1f222c 2nd commit from PR
     pick 5bc7ac02c1c78b8b Last commit from PR
@@ -135,7 +135,7 @@ The following steps are used to convert in-flight branches to the new format.
 1. Use `git filter-branch` to rewrite the branch history
 
    ```sh
-   git filter-branch --force --tree-filter 'CLANG_FORMAT=clang-format-10 src/tools/fmt fmt; CLANG_FORMAT=clang-format-10 src/tools/fmt fmt' origin/main..
+   git filter-branch --force --tree-filter 'CLANG_FORMAT=clang-format-10 gpcontrib/orca/tools/fmt fmt; CLANG_FORMAT=clang-format-10 gpcontrib/orca/tools/fmt fmt' origin/main..
    ```
 
    Now we have reformatted every commit in this branch that's not in main (modulo the big bang commit).
diff --git a/src/backend/gporca/README.md b/gpcontrib/orca/gporca/README.md
similarity index 98%
rename from src/backend/gporca/README.md
rename to gpcontrib/orca/gporca/README.md
index ca45975a39c8..fe857069f948 100644
--- a/src/backend/gporca/README.md
+++ b/gpcontrib/orca/gporca/README.md
@@ -234,7 +234,7 @@ ORCA has a [style guide](StyleGuide.md), try to follow the existing style in you
 A set of [clang-format]-based rules are enforced in CI. Your editor or IDE may automatically support it. When in doubt, check formatting locally before submitting your PR:
 
 ```
-CLANG_FORMAT=clang-format src/tools/fmt chk
+CLANG_FORMAT=clang-format gpcontrib/orca/tools/fmt chk
 ```
 
 For more information, head over to the [formatting README](README.format.md).
@@ -244,7 +244,7 @@ For more information, head over to the [formatting README](README.format.md).
 A set of [clang-tidy]-based checks are enforced in CI. Your editor or IDE may support displaying ClangTidy diagnostics. When in doubt, check formatting locally before submitting your patches:
 
 ```
-CLANG_TIDY=clang-tidy-12 src/tools/tidy build.debug
+CLANG_TIDY=clang-tidy-12 gpcontrib/orca/tools/tidy build.debug
 ```
 
 See our [Clang-Tidy README](README.tidy.md) for details about how to invoke the tidy script.
diff --git a/src/backend/gporca/README.memo.md b/gpcontrib/orca/gporca/README.memo.md
similarity index 100%
rename from src/backend/gporca/README.memo.md
rename to gpcontrib/orca/gporca/README.memo.md
diff --git a/src/backend/gporca/README.tidy.md b/gpcontrib/orca/gporca/README.tidy.md
similarity index 79%
rename from src/backend/gporca/README.tidy.md
rename to gpcontrib/orca/gporca/README.tidy.md
index 1b9146ed452c..f67ab159e117 100644
--- a/src/backend/gporca/README.tidy.md
+++ b/gpcontrib/orca/gporca/README.tidy.md
@@ -47,13 +47,13 @@ Here's an example of generating two build directories, `build.debug` and `build.
 for debug build:
 
 ```
-$ CXX=clang++ cmake -GNinja -Hsrc/backend/gporca -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug -Bbuild.debug
+$ CXX=clang++ cmake -GNinja -Hgpcontrib/orca/gporca -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug -Bbuild.debug
 ```
 
 and release:
 
 ```
-$ CXX=clang++ cmake -GNinja -Hsrc/backend/gporca -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -Bbuild.release
+$ CXX=clang++ cmake -GNinja -Hgpcontrib/orca/gporca -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -Bbuild.release
 ```
 
 ### Checking ORCA code
@@ -61,20 +61,20 @@ $ CXX=clang++ cmake -GNinja -Hsrc/backend/gporca -DCMAKE_EXPORT_COMPILE_COMMANDS
 To check (it's unsurprising if we pass the check in one configuration but not another)
 
 ```
-$ src/tools/tidy chk-orca build.debug
+$ gpcontrib/orca/tools/tidy chk-orca build.debug
 ```
 
 and
 
 ```
-$ src/tools/tidy chk-orca build.release
+$ gpcontrib/orca/tools/tidy chk-orca build.release
 ```
 
 Note that the script assumes the name of `clang-tidy` is `clang-tidy` and it can be found on your `PATH`.
 So if you're (typically) using `clang-tidy` from Homebrew's LLVM package, you'll override that assumption by e.g.:
 
 ```
-$ CLANG_TIDY=/usr/local/opt/llvm/bin/clang-tidy src/tools/tidy chk-orca build.debug
+$ CLANG_TIDY=/usr/local/opt/llvm/bin/clang-tidy gpcontrib/orca/tools/tidy chk-orca build.debug
 ```
 
 ### Generating VPATH builds With Compilation Databases
@@ -88,23 +88,23 @@ mkdir ../vpath.debug
 (
   cd ../vpath.debug
   ../gpdb/configure --config-cache -enable-depend --enable-orca --enable-cassert CC="ccache clang" CXX="ccache clang++" CFLAGS='-O0' CXXFLAGS='-O0'
-  bear --append make -s -C src/backend/gpopt
+  bear --append -- make -s -C gpcontrib/orca
 )
 mkdir ../vpath.release
 (
   cd ../vpath.release
   ../gpdb/configure --config-cache -enable-depend --enable-orca --disable-cassert CC="ccache clang" CXX="ccache clang++" CFLAGS='-O0' CXXFLAGS='-O0'
-  bear --append make -s -C src/backend/gpopt
+  bear --append -- make -s -C gpcontrib/orca
 )
 ```
 
-The steps above will create two VPATH build directories, one with assertions enabled, and another without assertions. Each directory has a compilation database (generated by `bear` intercepting the build commands) that understands the flags necessary to build the translator (`src/backend/gpopt`).
+The steps above will create two VPATH build directories, one with assertions enabled, and another without assertions. Each directory has a compilation database (generated by `bear` intercepting the build commands) that understands the flags necessary to build the translator (`gpcontrib/orca/gpopt`).
 
 ### Checking the Translator (`gpopt`)
 
-If you have a compilation database (`compile_commands.json`) that records the commands used to build files in `src/backend/gpopt`, point the `tidy` script to that:
+If you have a compilation database (`compile_commands.json`) that records the commands used to build files in `gpcontrib/orca/gpopt`, point the `tidy` script to that:
 
 ```
-$ src/tools/tidy chk-gpopt ../vpath.debug
-$ src/tools/tidy chk-gpopt ../vpath.release
+$ gpcontrib/orca/tools/tidy chk-gpopt ../vpath.debug
+$ gpcontrib/orca/tools/tidy chk-gpopt ../vpath.release
 ```
diff --git a/src/backend/gporca/StyleGuide.md b/gpcontrib/orca/gporca/StyleGuide.md
similarity index 100%
rename from src/backend/gporca/StyleGuide.md
rename to gpcontrib/orca/gporca/StyleGuide.md
diff --git a/src/backend/gporca/clang-format.intent.yaml b/gpcontrib/orca/gporca/clang-format.intent.yaml
similarity index 100%
rename from src/backend/gporca/clang-format.intent.yaml
rename to gpcontrib/orca/gporca/clang-format.intent.yaml
diff --git a/src/backend/gporca/cmake/FindXerces.cmake b/gpcontrib/orca/gporca/cmake/FindXerces.cmake
similarity index 100%
rename from src/backend/gporca/cmake/FindXerces.cmake
rename to gpcontrib/orca/gporca/cmake/FindXerces.cmake
diff --git a/src/backend/gporca/concourse/README.md b/gpcontrib/orca/gporca/concourse/README.md
similarity index 100%
rename from src/backend/gporca/concourse/README.md
rename to gpcontrib/orca/gporca/concourse/README.md
diff --git a/src/backend/gporca/concourse/build_and_test.py b/gpcontrib/orca/gporca/concourse/build_and_test.py
similarity index 100%
rename from src/backend/gporca/concourse/build_and_test.py
rename to gpcontrib/orca/gporca/concourse/build_and_test.py
diff --git a/src/backend/gporca/concourse/test_explain_pipeline.yml b/gpcontrib/orca/gporca/concourse/test_explain_pipeline.yml
similarity index 100%
rename from src/backend/gporca/concourse/test_explain_pipeline.yml
rename to gpcontrib/orca/gporca/concourse/test_explain_pipeline.yml
diff --git a/src/backend/gporca/concourse/test_orca_pipeline.yml b/gpcontrib/orca/gporca/concourse/test_orca_pipeline.yml
similarity index 100%
rename from src/backend/gporca/concourse/test_orca_pipeline.yml
rename to gpcontrib/orca/gporca/concourse/test_orca_pipeline.yml
diff --git a/src/backend/gporca/concourse/vars_example.yml b/gpcontrib/orca/gporca/concourse/vars_example.yml
similarity index 100%
rename from src/backend/gporca/concourse/vars_example.yml
rename to gpcontrib/orca/gporca/concourse/vars_example.yml
diff --git a/src/backend/gporca/concourse/xerces-c/build_xerces.py b/gpcontrib/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/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/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/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/orca/gporca/data/dxl/cost/cost0.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/cost/cost0.xml
rename to gpcontrib/orca/gporca/data/dxl/cost/cost0.xml
diff --git a/src/backend/gporca/data/dxl/cost/wrong-cost.xml b/gpcontrib/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/orca/gporca/data/dxl/cost/wrong-cost.xml
diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q1.xml b/gpcontrib/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/orca/gporca/data/dxl/csq_tests/dxl-q1.xml
diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q10.xml b/gpcontrib/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/orca/gporca/data/dxl/csq_tests/dxl-q10.xml
diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q11.xml b/gpcontrib/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/orca/gporca/data/dxl/csq_tests/dxl-q11.xml
diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q12.xml b/gpcontrib/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/orca/gporca/data/dxl/csq_tests/dxl-q12.xml
diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q13.xml b/gpcontrib/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/orca/gporca/data/dxl/csq_tests/dxl-q13.xml
diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q14.xml b/gpcontrib/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/orca/gporca/data/dxl/csq_tests/dxl-q14.xml
diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q15.xml b/gpcontrib/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/orca/gporca/data/dxl/csq_tests/dxl-q15.xml
diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q16.xml b/gpcontrib/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/orca/gporca/data/dxl/csq_tests/dxl-q16.xml
diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q2.xml b/gpcontrib/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/orca/gporca/data/dxl/csq_tests/dxl-q2.xml
diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q3.xml b/gpcontrib/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/orca/gporca/data/dxl/csq_tests/dxl-q3.xml
diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q4.xml b/gpcontrib/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/orca/gporca/data/dxl/csq_tests/dxl-q4.xml
diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q5.xml b/gpcontrib/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/orca/gporca/data/dxl/csq_tests/dxl-q5.xml
diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q6.xml b/gpcontrib/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/orca/gporca/data/dxl/csq_tests/dxl-q6.xml
diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q7.xml b/gpcontrib/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/orca/gporca/data/dxl/csq_tests/dxl-q7.xml
diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q8.xml b/gpcontrib/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/orca/gporca/data/dxl/csq_tests/dxl-q8.xml
diff --git a/src/backend/gporca/data/dxl/csq_tests/dxl-q9.xml b/gpcontrib/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/orca/gporca/data/dxl/csq_tests/dxl-q9.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/AggNoGroupByPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/AggNoGroupByPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/AggNoGroupByPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/AggNoGroupByPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/AggNoGroupByQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/AggNoGroupByQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/AggNoGroupByQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/AggNoGroupByQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ArrayCmpPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ArrayCmpPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ArrayCmpPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ArrayCmpPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ArrayCmpQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ArrayCmpQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ArrayCmpQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ArrayCmpQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ArrayPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ArrayPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ArrayPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ArrayPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ArrayQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ArrayQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ArrayQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ArrayQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/BroadcastPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/BroadcastPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/BroadcastPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/BroadcastPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/BroadcastQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/BroadcastQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/BroadcastQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/BroadcastQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/CScalarConstArray.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/CScalarConstArray.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/CScalarConstArray.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/CScalarConstArray.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/CoalescePlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/CoalescePlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/CoalescePlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/CoalescePlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/CoalesceQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/CoalesceQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/CoalesceQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/CoalesceQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ConstPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ConstPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ConstPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ConstPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ConstQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ConstQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ConstQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ConstQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ConstTableGetPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ConstTableGetPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ConstTableGetPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ConstTableGetPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ConstTableGetQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ConstTableGetQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ConstTableGetQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ConstTableGetQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ContradictionPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ContradictionPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ContradictionPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ContradictionPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ContradictionQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ContradictionQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ContradictionQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ContradictionQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryBooleanPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryBooleanPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryBooleanPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryBooleanPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryBooleanQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryBooleanQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryBooleanQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryBooleanQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryFilterPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryFilterPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryFilterPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryFilterPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryFilterQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryFilterQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryFilterQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryFilterQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryOuterPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryOuterPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryOuterPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryOuterPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryOuterQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryOuterQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryOuterQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryOuterQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryResultPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryResultPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryResultPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryResultPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryResultQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryResultQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/CorrelatedSubqueryResultQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/CorrelatedSubqueryResultQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DifferencePlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DifferencePlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DifferencePlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DifferencePlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DifferenceQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DifferenceQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DifferenceQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DifferenceQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DoubleSortPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DoubleSortPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DoubleSortPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DoubleSortPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DoubleSortQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DoubleSortQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DoubleSortQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DoubleSortQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetBooleanNotPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetBooleanNotPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetBooleanNotPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetBooleanNotPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetBooleanNotQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetBooleanNotQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetBooleanNotQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetBooleanNotQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetBooleanPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetBooleanPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetBooleanPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetBooleanPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetBooleanQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetBooleanQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetBooleanQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetBooleanQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetCountStarPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetCountStarPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetCountStarPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetCountStarPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetCountStarQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetCountStarQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetCountStarQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetCountStarQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetHashJoinOtherKeyPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetHashJoinOtherKeyPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetHashJoinOtherKeyPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetHashJoinOtherKeyPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetHashJoinOtherKeyQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetHashJoinOtherKeyQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetHashJoinOtherKeyQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetHashJoinOtherKeyQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetHashJoinPartKeyPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetHashJoinPartKeyPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetHashJoinPartKeyPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetHashJoinPartKeyPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetHashJoinPartKeyQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetHashJoinPartKeyQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetHashJoinPartKeyQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetHashJoinPartKeyQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetMultiJoinPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetMultiJoinPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetMultiJoinPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetMultiJoinPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetMultiJoinQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetMultiJoinQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetMultiJoinQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetMultiJoinQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetNLJoinOtherKeyPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetNLJoinOtherKeyPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetNLJoinOtherKeyPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetNLJoinOtherKeyPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetNLJoinOtherKeyQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetNLJoinOtherKeyQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetNLJoinOtherKeyQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetNLJoinOtherKeyQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetNLJoinPartKeyPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetNLJoinPartKeyPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetNLJoinPartKeyPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetNLJoinPartKeyPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetNLJoinPartKeyQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetNLJoinPartKeyQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetNLJoinPartKeyQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetNLJoinPartKeyQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetPointPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetPointPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetPointPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetPointPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetPointQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetPointQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetPointQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetPointQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetRangeSelectPlan1.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetRangeSelectPlan1.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetRangeSelectPlan1.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetRangeSelectPlan1.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetRangeSelectPlan2.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetRangeSelectPlan2.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetRangeSelectPlan2.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetRangeSelectPlan2.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetRangeSelectQuery1.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetRangeSelectQuery1.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetRangeSelectQuery1.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetRangeSelectQuery1.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetRangeSelectQuery2.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetRangeSelectQuery2.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetRangeSelectQuery2.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetRangeSelectQuery2.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetUnionAllOuterJoinPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetUnionAllOuterJoinPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetUnionAllOuterJoinPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetUnionAllOuterJoinPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/DynamicGetUnionAllOuterJoinQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetUnionAllOuterJoinQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/DynamicGetUnionAllOuterJoinQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/DynamicGetUnionAllOuterJoinQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/FilterLogOpPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/FilterLogOpPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/FilterLogOpPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/FilterLogOpPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/FilterLogOpQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/FilterLogOpQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/FilterLogOpQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/FilterLogOpQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/FilterOnTableWithIndexPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/FilterOnTableWithIndexPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/FilterOnTableWithIndexPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/FilterOnTableWithIndexPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/FilterOnTableWithIndexQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/FilterOnTableWithIndexQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/FilterOnTableWithIndexQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/FilterOnTableWithIndexQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/FilterPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/FilterPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/FilterPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/FilterPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/FilterQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/FilterQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/FilterQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/FilterQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/FuncExprPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/FuncExprPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/FuncExprPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/FuncExprPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/FuncExprQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/FuncExprQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/FuncExprQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/FuncExprQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/GatherMergePlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/GatherMergePlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/GatherMergePlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/GatherMergePlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/GatherMergeQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/GatherMergeQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/GatherMergeQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/GatherMergeQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/GatherPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/GatherPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/GatherPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/GatherPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/GatherQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/GatherQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/GatherQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/GatherQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/GroupByNoAggPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/GroupByNoAggPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/GroupByNoAggPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/GroupByNoAggPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/GroupByNoAggQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/GroupByNoAggQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/GroupByNoAggQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/GroupByNoAggQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/GroupByPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/GroupByPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/GroupByPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/GroupByPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/GroupByQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/GroupByQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/GroupByQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/GroupByQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/HashDistributePlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/HashDistributePlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/HashDistributePlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/HashDistributePlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/HashDistributeQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/HashDistributeQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/HashDistributeQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/HashDistributeQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/HashJoinPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/HashJoinPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/HashJoinPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/HashJoinPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/HashJoinQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/HashJoinQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/HashJoinQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/HashJoinQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/InnerJoinPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/InnerJoinPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/InnerJoinPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/InnerJoinPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/InnerJoinQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/InnerJoinQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/InnerJoinQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/InnerJoinQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/InsertPartitionedPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/InsertPartitionedPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/InsertPartitionedPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/InsertPartitionedPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/InsertPartitionedQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/InsertPartitionedQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/InsertPartitionedQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/InsertPartitionedQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/IntersectAllPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/IntersectAllPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/IntersectAllPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/IntersectAllPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/IntersectAllQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/IntersectAllQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/IntersectAllQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/IntersectAllQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/IntersectPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/IntersectPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/IntersectPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/IntersectPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/IntersectQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/IntersectQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/IntersectQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/IntersectQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q1.xml b/gpcontrib/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/orca/gporca/data/dxl/expressiontests/LOJ-TO-InnerJoin-Q9.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/LeftOuterJoinHJPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/LeftOuterJoinHJPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/LeftOuterJoinHJPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/LeftOuterJoinHJPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/LeftOuterJoinHJQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/LeftOuterJoinHJQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/LeftOuterJoinHJQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/LeftOuterJoinHJQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/LeftOuterJoinNLPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/LeftOuterJoinNLPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/LeftOuterJoinNLPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/LeftOuterJoinNLPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/LeftOuterJoinNLQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/LeftOuterJoinNLQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/LeftOuterJoinNLQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/LeftOuterJoinNLQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/LimitQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/LimitQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/LimitQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/LimitQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/LimitQueryNoOffset.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/LimitQueryNoOffset.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/LimitQueryNoOffset.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/LimitQueryNoOffset.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/MultipleWindowFuncPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/MultipleWindowFuncPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/MultipleWindowFuncPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/MultipleWindowFuncPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/MultipleWindowFuncQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/MultipleWindowFuncQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/MultipleWindowFuncQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/MultipleWindowFuncQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/NAryJoinPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/NAryJoinPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/NAryJoinPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/NAryJoinPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/NAryJoinQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/NAryJoinQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/NAryJoinQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/NAryJoinQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/NLLASJoinPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/NLLASJoinPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/NLLASJoinPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/NLLASJoinPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/NLLASJoinQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/NLLASJoinQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/NLLASJoinQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/NLLASJoinQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/NLLSJoinPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/NLLSJoinPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/NLLSJoinPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/NLLSJoinPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/NLLSJoinQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/NLLSJoinQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/NLLSJoinQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/NLLSJoinQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/NullIfPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/NullIfPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/NullIfPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/NullIfPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/NullIfQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/NullIfQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/NullIfQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/NullIfQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/NullableDroppedColumn.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/NullableDroppedColumn.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/NullableDroppedColumn.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/NullableDroppedColumn.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ProjectPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ProjectPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ProjectPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ProjectPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ProjectQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ProjectQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ProjectQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ProjectQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/RedundantSortPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/RedundantSortPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/RedundantSortPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/RedundantSortPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/RedundantSortQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/RedundantSortQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/RedundantSortQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/RedundantSortQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/RightOuterJoinPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/RightOuterJoinPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/RightOuterJoinPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/RightOuterJoinPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/RightOuterJoinQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/RightOuterJoinQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/RightOuterJoinQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/RightOuterJoinQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarCaseTestPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarCaseTestPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ScalarCaseTestPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarCaseTestPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarCaseTestQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarCaseTestQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ScalarCaseTestQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarCaseTestQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarCastPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarCastPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ScalarCastPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarCastPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarCastQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarCastQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ScalarCastQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarCastQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarDistFromPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarDistFromPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ScalarDistFromPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarDistFromPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarDistFromQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarDistFromQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ScalarDistFromQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarDistFromQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarIfPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarIfPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ScalarIfPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarIfPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarIfQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarIfQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ScalarIfQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarIfQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarNullTestPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarNullTestPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ScalarNullTestPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarNullTestPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarNullTestQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarNullTestQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ScalarNullTestQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarNullTestQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarOpAddPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarOpAddPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ScalarOpAddPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarOpAddPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarOpAddQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarOpAddQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ScalarOpAddQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarOpAddQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarSubqueryAnyAllPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarSubqueryAnyAllPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ScalarSubqueryAnyAllPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarSubqueryAnyAllPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarSubqueryAnyAllQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarSubqueryAnyAllQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ScalarSubqueryAnyAllQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarSubqueryAnyAllQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarSubqueryExistentialPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarSubqueryExistentialPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ScalarSubqueryExistentialPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarSubqueryExistentialPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarSubqueryExistentialQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarSubqueryExistentialQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ScalarSubqueryExistentialQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarSubqueryExistentialQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarSubqueryPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarSubqueryPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ScalarSubqueryPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarSubqueryPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarSubqueryQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarSubqueryQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ScalarSubqueryQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarSubqueryQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarSwitchPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarSwitchPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ScalarSwitchPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarSwitchPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/ScalarSwitchQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarSwitchQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/ScalarSwitchQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/ScalarSwitchQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/SortPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/SortPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/SortPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/SortPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/SortQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/SortQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/SortQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/SortQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/SpoolPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/SpoolPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/SpoolPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/SpoolPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/SpoolQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/SpoolQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/SpoolQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/SpoolQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/TableScan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/TableScan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/TableScan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/TableScan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/TableScanPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/TableScanPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/TableScanPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/TableScanPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/TableScanQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/TableScanQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/TableScanQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/TableScanQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/TableScanWithFilterPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/TableScanWithFilterPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/TableScanWithFilterPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/TableScanWithFilterPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/TableScanWithFilterQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/TableScanWithFilterQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/TableScanWithFilterQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/TableScanWithFilterQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/TableValuedFunctionJoinPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/TableValuedFunctionJoinPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/TableValuedFunctionJoinPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/TableValuedFunctionJoinPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/TableValuedFunctionJoinQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/TableValuedFunctionJoinQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/TableValuedFunctionJoinQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/TableValuedFunctionJoinQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/TableValuedFunctionPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/TableValuedFunctionPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/TableValuedFunctionPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/TableValuedFunctionPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/TableValuedFunctionQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/TableValuedFunctionQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/TableValuedFunctionQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/TableValuedFunctionQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/UnionAllPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/UnionAllPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/UnionAllPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/UnionAllPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/UnionAllQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/UnionAllQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/UnionAllQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/UnionAllQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/UnionAllRemappedPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/UnionAllRemappedPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/UnionAllRemappedPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/UnionAllRemappedPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/UnionAllRemappedQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/UnionAllRemappedQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/UnionAllRemappedQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/UnionAllRemappedQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/UnionPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/UnionPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/UnionPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/UnionPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/UnionQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/UnionQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/UnionQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/UnionQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/VolatileCSQPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/VolatileCSQPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/VolatileCSQPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/VolatileCSQPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/VolatileCSQQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/VolatileCSQQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/VolatileCSQQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/VolatileCSQQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/VolatileFuncPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/VolatileFuncPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/VolatileFuncPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/VolatileFuncPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/VolatileFuncQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/VolatileFuncQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/VolatileFuncQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/VolatileFuncQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/VolatileHashJoinPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/VolatileHashJoinPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/VolatileHashJoinPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/VolatileHashJoinPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/VolatileHashJoinQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/VolatileHashJoinQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/VolatileHashJoinQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/VolatileHashJoinQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/VolatileNLJoinPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/VolatileNLJoinPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/VolatileNLJoinPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/VolatileNLJoinPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/VolatileNLJoinQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/VolatileNLJoinQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/VolatileNLJoinQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/VolatileNLJoinQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/VolatileTVFPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/VolatileTVFPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/VolatileTVFPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/VolatileTVFPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/VolatileTVFQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/VolatileTVFQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/VolatileTVFQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/VolatileTVFQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/VolatileWithPartTablePlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/VolatileWithPartTablePlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/VolatileWithPartTablePlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/VolatileWithPartTablePlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/VolatileWithPartTableQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/VolatileWithPartTableQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/VolatileWithPartTableQuery.xml
rename to gpcontrib/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/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/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/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/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/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/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/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/orca/gporca/data/dxl/expressiontests/WinFunc-Tests-MD.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/WindowPlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/WindowPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/WindowPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/WindowPlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/WindowPlanEmptyPartitionBy.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/WindowPlanEmptyPartitionBy.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/WindowPlanEmptyPartitionBy.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/WindowPlanEmptyPartitionBy.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/WindowQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/WindowQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/WindowQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/WindowQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/WindowQueryEmptyPartitionBy.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/WindowQueryEmptyPartitionBy.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/WindowQueryEmptyPartitionBy.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/WindowQueryEmptyPartitionBy.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/WindowWithFramePlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/WindowWithFramePlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/WindowWithFramePlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/WindowWithFramePlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/WindowWithFrameQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/WindowWithFrameQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/WindowWithFrameQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/WindowWithFrameQuery.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/WindowWithNoLeadingEdgePlan.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/WindowWithNoLeadingEdgePlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/WindowWithNoLeadingEdgePlan.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/WindowWithNoLeadingEdgePlan.xml
diff --git a/src/backend/gporca/data/dxl/expressiontests/WindowWithNoLeadingEdgeQuery.xml b/gpcontrib/orca/gporca/data/dxl/expressiontests/WindowWithNoLeadingEdgeQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/expressiontests/WindowWithNoLeadingEdgeQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/expressiontests/WindowWithNoLeadingEdgeQuery.xml
diff --git a/src/backend/gporca/data/dxl/formatxml.sh b/gpcontrib/orca/gporca/data/dxl/formatxml.sh
similarity index 100%
rename from src/backend/gporca/data/dxl/formatxml.sh
rename to gpcontrib/orca/gporca/data/dxl/formatxml.sh
diff --git a/src/backend/gporca/data/dxl/indexjoin/positive_04.mdp b/gpcontrib/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/orca/gporca/data/dxl/indexjoin/positive_04.mdp
diff --git a/src/backend/gporca/data/dxl/metadata/md.xml b/gpcontrib/orca/gporca/data/dxl/metadata/md.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/metadata/md.xml
rename to gpcontrib/orca/gporca/data/dxl/metadata/md.xml
diff --git a/src/backend/gporca/data/dxl/minidump/3WayJoinOnMultiDistributionColumnsTables.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/3WayJoinOnMultiDistributionColumnsTables.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/3WayJoinOnMultiDistributionColumnsTables.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/3WayJoinOnMultiDistributionColumnsTables.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/3WayJoinOnMultiDistributionColumnsTablesNoMotion.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/3WayJoinOnMultiDistributionColumnsTablesNoMotion.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/3WayJoinOnMultiDistributionColumnsTablesNoMotion.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/3WayJoinOnMultiDistributionColumnsTablesNoMotion.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/3WayJoinUsingOperatorsOfNonDefaultOpfamily.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/3WayJoinUsingOperatorsOfNonDefaultOpfamily.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/3WayJoinUsingOperatorsOfNonDefaultOpfamily.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/3WayJoinUsingOperatorsOfNonDefaultOpfamily.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/4WayJoinInferredPredsRemovedWith2Motion.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/4WayJoinInferredPredsRemovedWith2Motion.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/4WayJoinInferredPredsRemovedWith2Motion.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/4WayJoinInferredPredsRemovedWith2Motion.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/AddEqualityPredicates.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/AddEqualityPredicates.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/AddEqualityPredicates.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/AddEqualityPredicates.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/AddPredsInSubqueries.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/AddPredsInSubqueries.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/AddPredsInSubqueries.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/AddPredsInSubqueries.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-1.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-1.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-2.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-3.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-3.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-4.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-4.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-5.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/AddRedistributeBeforeInsert-5.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Agg-Limit.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Agg-Limit.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Agg-NonSplittable.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Agg-NonSplittable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/AggSubqCollapseFalseFilter.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/AggSubqCollapseFalseFilter.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/AggSubqCollapseFalseFilter.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/AggSubqCollapseFalseFilter.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/AggWithSubqArgs.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/AggWithSubqArgs.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/AggWithSubqArgs.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/AggWithSubqArgs.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/AggWithVolatileFunc.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/AggWithVolatileFunc.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/AggWithVolatileFunc.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/AggWithVolatileFunc.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/AggonExternalTableNoMotion.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/AggonExternalTableNoMotion.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/AggonExternalTableNoMotion.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/AggonExternalTableNoMotion.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/AggregateWithSkew.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/AggregateWithSkew.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/AggregateWithSkew.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/AggregateWithSkew.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/AggregatesConstraintDeriveNegation.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/AggregatesConstraintDeriveNegation.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/AggregatesConstraintDeriveNegation.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/AggregatesConstraintDeriveNegation.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/AllSubqueryWithSubqueryInScalar.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/AllSubqueryWithSubqueryInScalar.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/AllSubqueryWithSubqueryInScalar.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/AllSubqueryWithSubqueryInScalar.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/AllowIndexOnlyScanOnAppendOnlyTable.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/AllowIndexOnlyScanOnAppendOnlyTable.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/AllowIndexOnlyScanOnAppendOnlyTable.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/AllowIndexOnlyScanOnAppendOnlyTable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/AllowIndexOnlyScanOnMixedAppendOnlyPartitionedTable.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/AllowIndexOnlyScanOnMixedAppendOnlyPartitionedTable.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/AllowIndexOnlyScanOnMixedAppendOnlyPartitionedTable.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/AllowIndexOnlyScanOnMixedAppendOnlyPartitionedTable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/AllowIndexOnlyScanOnMixedPartitionedTable.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/AllowIndexOnlyScanOnMixedPartitionedTable.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/AllowIndexOnlyScanOnMixedPartitionedTable.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/AllowIndexOnlyScanOnMixedPartitionedTable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/AntiSemiJoin2Select-1.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/AntiSemiJoin2Select-1.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/AntiSemiJoin2Select-2.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/AntiSemiJoin2Select-2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/AnyPredicate-Over-UnionOfConsts.mdp b/gpcontrib/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/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/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/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/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/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/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/orca/gporca/data/dxl/minidump/AnySubq-With-NonScalarSubqueryChild-3.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/AnySubqueryWithAllSubqueryInScalar.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/AnySubqueryWithAllSubqueryInScalar.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/AnySubqueryWithAllSubqueryInScalar.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/AnySubqueryWithAllSubqueryInScalar.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/AnySubqueryWithSubqueryInScalar.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/AnySubqueryWithSubqueryInScalar.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/AnySubqueryWithSubqueryInScalar.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/AnySubqueryWithSubqueryInScalar.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/AnySubqueryWithVolatileComp.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/AnySubqueryWithVolatileComp.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/AnySubqueryWithVolatileComp.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/AnySubqueryWithVolatileComp.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/AnySubqueryWithVolatileFunc.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/AnySubqueryWithVolatileFunc.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/AnySubqueryWithVolatileFunc.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/AnySubqueryWithVolatileFunc.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCmp-IN-ManyElements.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/ArrayCmp-IN-ManyElements.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCmpAll-Disjunct.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/ArrayCmpAll-Disjunct.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCmpAll.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ArrayCmpAll.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ArrayCmpAll.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ArrayCmpAll.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCmpAllEmpty.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ArrayCmpAllEmpty.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ArrayCmpAllEmpty.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ArrayCmpAllEmpty.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCmpAnyEmpty.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ArrayCmpAnyEmpty.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ArrayCmpAnyEmpty.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ArrayCmpAnyEmpty.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCmpAnyEmptyLessThan.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ArrayCmpAnyEmptyLessThan.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ArrayCmpAnyEmptyLessThan.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ArrayCmpAnyEmptyLessThan.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCmpInList.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ArrayCmpInList.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ArrayCmpInList.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ArrayCmpInList.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCoerceCast.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ArrayCoerceCast.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ArrayCoerceCast.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ArrayCoerceCast.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCoerceExpr.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ArrayCoerceExpr.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ArrayCoerceExpr.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ArrayCoerceExpr.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ArrayCoerceImplicitCast.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ArrayCoerceImplicitCast.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ArrayCoerceImplicitCast.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ArrayCoerceImplicitCast.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ArrayConcat.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ArrayConcat.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ArrayConcat.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ArrayConcat.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ArrayRef.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ArrayRef.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ArrayRef.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ArrayRef.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/AssertMaxOneRow.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/AssertMaxOneRow.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/AssertMaxOneRow.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/AssertMaxOneRow.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/AssertOneRowWithCorrelation.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/AssertOneRowWithCorrelation.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/AssertOneRowWithCorrelation.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/AssertOneRowWithCorrelation.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/AvoidConstraintDerivationForLike.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/AvoidConstraintDerivationForLike.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/AvoidConstraintDerivationForLike.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/AvoidConstraintDerivationForLike.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BRINScan-Or.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/BRINScan-Or.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BTreeIndex-Against-InList.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/BTreeIndex-Against-InList.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BTreeIndex-Against-InListLarge.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/BTreeIndex-Against-InListLarge.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BTreeIndex-Against-ScalarSubquery.mdp b/gpcontrib/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/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/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/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/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/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/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/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/orca/gporca/data/dxl/minidump/BasicQueryParam.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/BasicQueryParam.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/BasicQueryParam.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapBoolAnd.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/BitmapBoolAnd.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/BitmapBoolAnd.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/BitmapBoolAnd.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapBoolOp-DeepTree.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/BitmapBoolOp-DeepTree.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapBoolOp-DeepTree2.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/BitmapBoolOp-DeepTree2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapBoolOp-DeepTree3.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/BitmapBoolOp-DeepTree3.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapBoolOr-BoolColumn.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/BitmapBoolOr-BoolColumn.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapBoolOr.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/BitmapBoolOr.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/BitmapBoolOr.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/BitmapBoolOr.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndex-Against-InList.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/BitmapIndex-Against-InList.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndex-ChooseHashJoin.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/BitmapIndex-ChooseHashJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexApply-Basic-SelfJoin.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/BitmapIndexApply-Basic-SelfJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexApply-Basic-TwoTables.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/BitmapIndexApply-Basic-TwoTables.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexApply-Complex-Condition.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/BitmapIndexApply-Complex-Condition.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexApply-InnerSelect-Basic.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/BitmapIndexApply-InnerSelect-Basic.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexApply-InnerSelect-PartTable.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/BitmapIndexApply-InnerSelect-PartTable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexApply-PartTable.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/BitmapIndexApply-PartTable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexNLJWithProject.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/BitmapIndexNLJWithProject.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/BitmapIndexNLJWithProject.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/BitmapIndexNLJWithProject.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexNLJWithProjectNoFilt.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/BitmapIndexNLJWithProjectNoFilt.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/BitmapIndexNLJWithProjectNoFilt.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/BitmapIndexNLJWithProjectNoFilt.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexNLOJWithProject.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/BitmapIndexNLOJWithProject.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/BitmapIndexNLOJWithProject.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/BitmapIndexNLOJWithProject.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexNLOJWithProjectNonPart.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/BitmapIndexNLOJWithProjectNonPart.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/BitmapIndexNLOJWithProjectNonPart.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/BitmapIndexNLOJWithProjectNonPart.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexScan-WithUnsupportedOperatorFilter.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/BitmapIndexScan-WithUnsupportedOperatorFilter.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexScan.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/BitmapIndexScan.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/BitmapIndexScan.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/BitmapIndexScan.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexScanChooseIndex.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/BitmapIndexScanChooseIndex.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/BitmapIndexScanChooseIndex.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/BitmapIndexScanChooseIndex.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexScanCost.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/BitmapIndexScanCost.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/BitmapIndexScanCost.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/BitmapIndexScanCost.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapIndexUnsupportedOperator.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/BitmapIndexUnsupportedOperator.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/BitmapIndexUnsupportedOperator.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/BitmapIndexUnsupportedOperator.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapScan-Hetrogeneous-Partitioned.mdp b/gpcontrib/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/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/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/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/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/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/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/orca/gporca/data/dxl/minidump/BitmapTableScan-AO-Btree.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapTableScan-AO.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/BitmapTableScan-AO.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapTableScan-AndCondition.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/BitmapTableScan-AndCondition.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapTableScan-Basic.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/BitmapTableScan-Basic.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapTableScan-ColumnOnRightSide.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/BitmapTableScan-ColumnOnRightSide.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapTableScan-ComplexConjDisj.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/BitmapTableScan-ComplexConjDisj.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BitmapTableScan-ConjDisjWithOuterRefs.mdp b/gpcontrib/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/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/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/orca/gporca/data/dxl/minidump/Blocking-Spool-Parallel-Union-All.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BpCharMCVCardinalityEquals.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/BpCharMCVCardinalityEquals.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/BpCharMCVCardinalityEquals.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/BpCharMCVCardinalityEquals.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BpCharMCVCardinalityGreaterThan.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/BpCharMCVCardinalityGreaterThan.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/BpCharMCVCardinalityGreaterThan.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/BpCharMCVCardinalityGreaterThan.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BroadcastSkewedHashjoin.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/BroadcastSkewedHashjoin.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/BroadcastSkewedHashjoin.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/BroadcastSkewedHashjoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BtreeIndexNLJWithProjectNoPart.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/BtreeIndexNLJWithProjectNoPart.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/BtreeIndexNLJWithProjectNoPart.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/BtreeIndexNLJWithProjectNoPart.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/BtreeIndexNLOJWithProject.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/BtreeIndexNLOJWithProject.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/BtreeIndexNLOJWithProject.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/BtreeIndexNLOJWithProject.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CArrayExpansionTest/JoinWithInListExpand.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CArrayExpansionTest/JoinWithInListExpand.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CArrayExpansionTest/JoinWithInListNoExpand.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CArrayExpansionTest/JoinWithInListNoExpand.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CJoinOrderDPTest/JoinOrderWithDP.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CJoinOrderDPTest/JoinOrderWithDP.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CJoinOrderDPTest/JoinOrderWithOutDP.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CJoinOrderDPTest/JoinOrderWithOutDP.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/FallBackToSerialAppend.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/FallBackToSerialAppend.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/NoOpMotionUsesOnlyGroupOutputColumns.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/NoOpMotionUsesOnlyGroupOutputColumns.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-ConstTable.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-ConstTable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-Insert.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-Insert.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-Select.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelAppend-Select.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithNoRedistributableColumns.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithNoRedistributableColumns.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithNotEqualNumOfDistrColumns.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithNotEqualNumOfDistrColumns.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithSingleNotRedistributableColumn.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/ParallelUnionAllWithSingleNotRedistributableColumn.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/RandomDistributedChildrenUnhashableColumns.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/RandomDistributedChildrenUnhashableColumns.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/RedundantMotionParallelUnionAll.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/RedundantMotionParallelUnionAll.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/TwoHashedTables.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CPhysicalParallelUnionAllTest/TwoHashedTables.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfMultipleSetRetFuncs.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfMultipleSetRetFuncs.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfMultipleSetRetFuncsAndUnusedScalar.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfMultipleSetRetFuncsAndUnusedScalar.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfSetRefFuncsOnTopTbl.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfSetRefFuncsOnTopTbl.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfSetRetFuncsAndUnusedScalar.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfSetRetFuncsAndUnusedScalar.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfSingleSetRetFuncs.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CPruneColumnsTest/AggTopOfSingleSetRetFuncs.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/AllColsUsed.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CPruneColumnsTest/AllColsUsed.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/MultiLevelSubqueryWithSetRetFuncs.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CPruneColumnsTest/MultiLevelSubqueryWithSetRetFuncs.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/MultiLevelSubqueryWithSetRetFuncsAndScalarFuncs.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CPruneColumnsTest/MultiLevelSubqueryWithSetRetFuncsAndScalarFuncs.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/PruneIntermediateUnusedColumns.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CPruneColumnsTest/PruneIntermediateUnusedColumns.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/UnusedSetRetFuncAndUsedScalarFunc.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CPruneColumnsTest/UnusedSetRetFuncAndUsedScalarFunc.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CPruneColumnsTest/UsedSetRetFuncAndUnusedScalarFunc.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CPruneColumnsTest/UsedSetRetFuncAndUnusedScalarFunc.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CSQ-VolatileTVF.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CSQ-VolatileTVF.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTAS-Random.mdp b/gpcontrib/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/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/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/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/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/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/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/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/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/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/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/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/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/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/orca/gporca/data/dxl/minidump/CTAS.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CTAS.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CTAS.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTAS_OrderedAgg_multiple_cols.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CTAS_OrderedAgg_multiple_cols.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTE-1.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CTE-1.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTE-10.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CTE-10.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTE-11.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CTE-11.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTE-2.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CTE-2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTE-3.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CTE-3.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTE-4.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CTE-4.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTE-5.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CTE-5.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTE-6.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CTE-6.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTE-7.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CTE-7.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTE-8.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CTE-8.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTE-9.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CTE-9.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTE-Join-Redistribute-Producer.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CTE-Join-Redistribute-Producer.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTE-NestedWithPrunedProducer.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CTE-NestedWithPrunedProducer.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTE-NoPushProperties.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CTE-NoPushProperties.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTE-PartTbl.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CTE-PartTbl.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTE-Preds1.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CTE-Preds1.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTE-Preds2.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CTE-Preds2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTE-PushProperties.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CTE-PushProperties.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTE-SetOp.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CTE-SetOp.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTE-ValuesScan-ProjList.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CTE-ValuesScan-ProjList.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTE-volatile.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CTE-volatile.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTE-with-random-filter.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CTE-with-random-filter.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTE15HAReplicated.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CTE15HAReplicated.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CTE15HAReplicated.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CTE15HAReplicated.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTE15Replicated.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CTE15Replicated.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CTE15Replicated.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CTE15Replicated.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTE2HAReplicated.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CTE2HAReplicated.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CTE2HAReplicated.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CTE2HAReplicated.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTE2Replicated.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CTE2Replicated.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CTE2Replicated.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CTE2Replicated.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTEConstraintDeriveNegation.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CTEConstraintDeriveNegation.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CTEConstraintDeriveNegation.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CTEConstraintDeriveNegation.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTEMergeGroupsCircularDeriveStats.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CTEMergeGroupsCircularDeriveStats.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CTEMergeGroupsCircularDeriveStats.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CTEMergeGroupsCircularDeriveStats.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTEMisAlignedProducerConsumer.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CTEMisAlignedProducerConsumer.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CTEMisAlignedProducerConsumer.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CTEMisAlignedProducerConsumer.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTEWithMergedGroup.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CTEWithMergedGroup.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CTEWithMergedGroup.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CTEWithMergedGroup.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTEWithOuterReferences.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CTEWithOuterReferences.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CTEWithOuterReferences.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CTEWithOuterReferences.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTEWithVolatileFunction.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CTEWithVolatileFunction.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CTEWithVolatileFunction.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CTEWithVolatileFunction.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTEinlining.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CTEinlining.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CTEinlining.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CTEinlining.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTG-Filter.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CTG-Filter.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CTG-Join.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CTG-Join.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CannotCollapseCascadeProjects.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CannotCollapseCascadeProjects.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CannotCollapseCascadeProjects.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CannotCollapseCascadeProjects.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CannotPullGrpColAboveAgg.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CannotPullGrpColAboveAgg.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CannotPullGrpColAboveAgg.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CannotPullGrpColAboveAgg.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CapGbCardToSelectCard.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CapGbCardToSelectCard.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CapGbCardToSelectCard.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CapGbCardToSelectCard.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Cascaded-UnionAll-Differing-Cols-Order.mdp b/gpcontrib/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/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/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/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/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/orca/gporca/data/dxl/minidump/Cascaded-UnionAll-Same-Cols-Order.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CastOnSubquery.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CastOnSubquery.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CastOnSubquery.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CastOnSubquery.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CastedInClauseWithMCV.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CastedInClauseWithMCV.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CastedInClauseWithMCV.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CastedInClauseWithMCV.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CastedScalarIf-On-Index-Key.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CastedScalarIf-On-Index-Key.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Char-Cardinality.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Char-Cardinality.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CheckAsUser.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CheckAsUser.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CheckAsUser.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CheckAsUser.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Citext-Cardinality.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Citext-Cardinality.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Coalesce-With-Subquery.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Coalesce-With-Subquery.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CoerceToDomain.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CoerceToDomain.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CoerceToDomain.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CoerceToDomain.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CoerceViaIO.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CoerceViaIO.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CoerceViaIO.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CoerceViaIO.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CollapseCascadeProjects2of2.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CollapseCascadeProjects2of2.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CollapseCascadeProjects2of2.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CollapseCascadeProjects2of2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CollapseCascadeProjects2of3.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CollapseCascadeProjects2of3.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CollapseCascadeProjects2of3.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CollapseCascadeProjects2of3.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CollapseGb-MultipleColumn.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CollapseGb-MultipleColumn.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CollapseGb-Nested.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CollapseGb-Nested.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CollapseGb-SingleColumn.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CollapseGb-SingleColumn.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CollapseGb-With-Agg-Funcs.mdp b/gpcontrib/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/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/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/orca/gporca/data/dxl/minidump/CollapseGb-Without-Agg-Funcs.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CollapseNot.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CollapseNot.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CollapseNot.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CollapseNot.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CollapseProject-SetReturning-CTE.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CollapseProject-SetReturning-CTE.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CollapseProject-SetReturning.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CollapseProject-SetReturning.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CompositeTypeRelMdId.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CompositeTypeRelMdId.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CompositeTypeRelMdId.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CompositeTypeRelMdId.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ComputedGroupByCol.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ComputedGroupByCol.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ComputedGroupByCol.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ComputedGroupByCol.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ConstScalarFuncNotPushedBelowGather.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ConstScalarFuncNotPushedBelowGather.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ConstScalarFuncNotPushedBelowGather.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ConstScalarFuncNotPushedBelowGather.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqUnderProjectNoOuterRef.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ConstTblGetUnderSubqUnderProjectNoOuterRef.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqUnderProjectNoOuterRef.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ConstTblGetUnderSubqUnderProjectNoOuterRef.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqUnderProjectWithOuterRef.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ConstTblGetUnderSubqUnderProjectWithOuterRef.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqUnderProjectWithOuterRef.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ConstTblGetUnderSubqUnderProjectWithOuterRef.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqWithNoOuterRef.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ConstTblGetUnderSubqWithNoOuterRef.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqWithNoOuterRef.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ConstTblGetUnderSubqWithNoOuterRef.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqWithOuterRef.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ConstTblGetUnderSubqWithOuterRef.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ConstTblGetUnderSubqWithOuterRef.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ConstTblGetUnderSubqWithOuterRef.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalIncludesNull.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ConstraintIntervalIncludesNull.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ConstraintIntervalIncludesNull.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ConstraintIntervalIncludesNull.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalNotIncludesNull.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ConstraintIntervalNotIncludesNull.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ConstraintIntervalNotIncludesNull.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ConstraintIntervalNotIncludesNull.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithBoolIncludesNull.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ConstraintIntervalWithBoolIncludesNull.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithBoolIncludesNull.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ConstraintIntervalWithBoolIncludesNull.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithBoolNotIncludesNull.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ConstraintIntervalWithBoolNotIncludesNull.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithBoolNotIncludesNull.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ConstraintIntervalWithBoolNotIncludesNull.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithInIncludesNull.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ConstraintIntervalWithInIncludesNull.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithInIncludesNull.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ConstraintIntervalWithInIncludesNull.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithInIncludesNullArray.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ConstraintIntervalWithInIncludesNullArray.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithInIncludesNullArray.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ConstraintIntervalWithInIncludesNullArray.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithInNotIncludesNull.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ConstraintIntervalWithInNotIncludesNull.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithInNotIncludesNull.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ConstraintIntervalWithInNotIncludesNull.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithMultiColumnsIncludeNull.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ConstraintIntervalWithMultiColumnsIncludeNull.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithMultiColumnsIncludeNull.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ConstraintIntervalWithMultiColumnsIncludeNull.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithMultiColumnsNotIncludeNull.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ConstraintIntervalWithMultiColumnsNotIncludeNull.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithMultiColumnsNotIncludeNull.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ConstraintIntervalWithMultiColumnsNotIncludeNull.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithNotIncludesNull.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ConstraintIntervalWithNotIncludesNull.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ConstraintIntervalWithNotIncludesNull.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ConstraintIntervalWithNotIncludesNull.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ConvertBoolConstNullToConstTableFalseFilter.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ConvertBoolConstNullToConstTableFalseFilter.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ConvertBoolConstNullToConstTableFalseFilter.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ConvertBoolConstNullToConstTableFalseFilter.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ConvertHashToRandomInsert.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ConvertHashToRandomInsert.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ConvertHashToRandomInsert.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ConvertHashToRandomInsert.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ConvertHashToRandomSelect.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ConvertHashToRandomSelect.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ConvertHashToRandomSelect.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ConvertHashToRandomSelect.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Correlated-AntiSemiJoin.mdp b/gpcontrib/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/orca/gporca/data/dxl/minidump/Correlated-Stat-NDistinct.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedAntiSemiJoin-True.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CorrelatedAntiSemiJoin-True.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiJoin-Limit.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiJoin-Limit.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiJoin-True.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiJoin-True.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiNotIn-True.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CorrelatedIN-LeftSemiNotIn-True.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedLeftSemiNLJoinWithLimit.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CorrelatedLeftSemiNLJoinWithLimit.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CorrelatedLeftSemiNLJoinWithLimit.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CorrelatedLeftSemiNLJoinWithLimit.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedNLJ-PartSelector-Subplan.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CorrelatedNLJ-PartSelector-Subplan.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedNLJWithStreamingSpool.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CorrelatedNLJWithStreamingSpool.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CorrelatedNLJWithStreamingSpool.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CorrelatedNLJWithStreamingSpool.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedNLJWithTrueCondition.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CorrelatedNLJWithTrueCondition.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CorrelatedNLJWithTrueCondition.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CorrelatedNLJWithTrueCondition.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedSemiJoin-True.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CorrelatedSemiJoin-True.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CorrelatedSubqueryWithAggWindowFunc.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CorrelatedSubqueryWithAggWindowFunc.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CorrelatedSubqueryWithAggWindowFunc.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CorrelatedSubqueryWithAggWindowFunc.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Correlation-With-Casting-1.mdp b/gpcontrib/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/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/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/orca/gporca/data/dxl/minidump/Correlation-With-Casting-2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CountAny.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CountAny.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CountAny.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CountAny.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CountStar.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/CountStar.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/CountStar.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/CountStar.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CoveringIndex-1.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CoveringIndex-1.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CoveringIndex-2.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CoveringIndex-2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CoveringIndex-3.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CoveringIndex-3.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CoveringIndex-Cost-1.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CoveringIndex-Cost-1.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CoveringIndex-Cost-2.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CoveringIndex-Cost-2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CoveringIndex-DoesNotSupport-Gin.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/CoveringIndex-DoesNotSupport-Gin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/CoveringIndex-DoesSupport-Gist.mdp b/gpcontrib/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/orca/gporca/data/dxl/minidump/DML-With-WindowFunc-OuterRef.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DMLCollapseProject.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/DMLCollapseProject.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/DMLCollapseProject.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/DMLCollapseProject.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DPE-IN.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DPE-IN.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DPE-NOT-IN.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DPE-NOT-IN.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DPE-SemiJoin.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DPE-SemiJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DPE-with-unsupported-pred.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DPE-with-unsupported-pred.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DPv2GreedyOnly.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/DPv2GreedyOnly.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/DPv2GreedyOnly.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/DPv2GreedyOnly.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DPv2MinCardOnly.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/DPv2MinCardOnly.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/DPv2MinCardOnly.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/DPv2MinCardOnly.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DPv2QueryOnly.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/DPv2QueryOnly.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/DPv2QueryOnly.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/DPv2QueryOnly.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DQA-1-RegularAgg.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DQA-1-RegularAgg.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DQA-2-RegularAgg.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DQA-2-RegularAgg.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DQA-GroupBy-HashAggregate1.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DQA-GroupBy-HashAggregate1.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DQA-GroupBy-HashAggregate2.mdp b/gpcontrib/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/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/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/orca/gporca/data/dxl/minidump/DQA-InnerJoin-GroupBy-HashAggregate.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DQA-KeepOuterReference.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DQA-KeepOuterReference.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DQA-NonRedistributableCol.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DQA-NonRedistributableCol.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DQA-SplitScalar.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DQA-SplitScalar.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DQA-SplitScalarOnDistCol.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DQA-SplitScalarOnDistCol.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DQA-SplitScalarWithAggAndGuc.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DQA-SplitScalarWithAggAndGuc.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DQA-SplitScalarWithGuc.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DQA-SplitScalarWithGuc.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DTS-Hetrogeneous-Partitioned.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DTS-Hetrogeneous-Partitioned.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Date-TimeStamp-HashJoin.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Date-TimeStamp-HashJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DeduplicatePredicates.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/DeduplicatePredicates.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/DeduplicatePredicates.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/DeduplicatePredicates.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Delete-Check-AssignedQueryIdForTargetRel.mdp b/gpcontrib/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/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/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/orca/gporca/data/dxl/minidump/Delete-With-Limit-In-Subquery.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DeleteMismatchedDistribution.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/DeleteMismatchedDistribution.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/DeleteMismatchedDistribution.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/DeleteMismatchedDistribution.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DeleteRandomDistr.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/DeleteRandomDistr.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/DeleteRandomDistr.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/DeleteRandomDistr.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DeleteRandomlyDistributedTable.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/DeleteRandomlyDistributedTable.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/DeleteRandomlyDistributedTable.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/DeleteRandomlyDistributedTable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DeleteRandomlyDistributedTableJoin.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/DeleteRandomlyDistributedTableJoin.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/DeleteRandomlyDistributedTableJoin.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/DeleteRandomlyDistributedTableJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-DynamicIndexScan.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DirectDispatch-DynamicIndexScan.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId-MultiCol-Conjunction.mdp b/gpcontrib/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/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/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/orca/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId-SingleCol-Conjunction.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DirectDispatch-GpSegmentId.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-IndexScan.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DirectDispatch-IndexScan.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-MultiCol-Disjunction.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DirectDispatch-MultiCol-Disjunction.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-MultiCol-Negative.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DirectDispatch-MultiCol-Negative.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-MultiCol.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DirectDispatch-MultiCol.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-RandDistTable-Disjunction.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DirectDispatch-RandDistTable-Disjunction.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-RandDistTable.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DirectDispatch-RandDistTable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-SingleCol-Disjunction-IsNull.mdp b/gpcontrib/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/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/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/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/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/orca/gporca/data/dxl/minidump/DirectDispatch-SingleCol-Disjunction.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DirectDispatch-SingleCol.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DirectDispatch-SingleCol.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DisableBroadcastThreshold.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/DisableBroadcastThreshold.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/DisableBroadcastThreshold.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/DisableBroadcastThreshold.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DiscardRedistributeHashJoin.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/DiscardRedistributeHashJoin.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/DiscardRedistributeHashJoin.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/DiscardRedistributeHashJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Distinct-LegacyOpfamily.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Distinct-LegacyOpfamily.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DistinctAgg-NonSplittable.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DistinctAgg-NonSplittable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DistinctQueryWithMotions.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/DistinctQueryWithMotions.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/DistinctQueryWithMotions.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/DistinctQueryWithMotions.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DonotPushPartConstThruLimit.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/DonotPushPartConstThruLimit.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/DonotPushPartConstThruLimit.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/DonotPushPartConstThruLimit.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DontAddRedistributeBeforeInsert-1.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DontAddRedistributeBeforeInsert-1.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DontAddRedistributeBeforeInsert-2.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DontAddRedistributeBeforeInsert-2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DoubleNDVCardinalityEquals.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/DoubleNDVCardinalityEquals.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/DoubleNDVCardinalityEquals.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/DoubleNDVCardinalityEquals.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DqaHavingMax.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/DqaHavingMax.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/DqaHavingMax.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/DqaHavingMax.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DqaMax.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/DqaMax.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/DqaMax.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/DqaMax.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DqaMin.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/DqaMin.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/DqaMin.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/DqaMin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DqaNoRedistribute.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/DqaNoRedistribute.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/DqaNoRedistribute.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/DqaNoRedistribute.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DqaSubqueryMax.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/DqaSubqueryMax.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/DqaSubqueryMax.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/DqaSubqueryMax.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DuplicateGrpCol.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/DuplicateGrpCol.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/DuplicateGrpCol.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/DuplicateGrpCol.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicBitmapBoolOp.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/DynamicBitmapBoolOp.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/DynamicBitmapBoolOp.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/DynamicBitmapBoolOp.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicBitmapIndexScan.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/DynamicBitmapIndexScan.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/DynamicBitmapIndexScan.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/DynamicBitmapIndexScan.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicBitmapTableScan-Basic.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DynamicBitmapTableScan-Basic.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicBitmapTableScan-Heterogeneous.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DynamicBitmapTableScan-Heterogeneous.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicBitmapTableScan-UUID.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DynamicBitmapTableScan-UUID.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexGet-OuterRefs.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DynamicIndexGet-OuterRefs.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexGetDroppedCols.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/DynamicIndexGetDroppedCols.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/DynamicIndexGetDroppedCols.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/DynamicIndexGetDroppedCols.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexOnlyScan-Homogenous.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DynamicIndexOnlyScan-Homogenous.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexOnlyScan-InnerJoin.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DynamicIndexOnlyScan-InnerJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexOnlyScan-LeftJoin.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DynamicIndexOnlyScan-LeftJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexOnlyScanCosting.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/DynamicIndexOnlyScanCosting.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/DynamicIndexOnlyScanCosting.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/DynamicIndexOnlyScanCosting.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-BoolFalse.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DynamicIndexScan-BoolFalse.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-BoolTrue.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DynamicIndexScan-BoolTrue.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-DefaultPartition-2.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DynamicIndexScan-DefaultPartition-2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-DefaultPartition.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DynamicIndexScan-DefaultPartition.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-DroppedCols.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DynamicIndexScan-DroppedCols.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-DroppedColumns.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DynamicIndexScan-DroppedColumns.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-EnabledDateConstraint.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-EnabledDateConstraint.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-NoDTS.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-NoDTS.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-Overlapping.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-Overlapping.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-PartSelectEquality.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-PartSelectEquality.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-PartSelectRange.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-PartSelectRange.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-Union.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-Union.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-UnsupportedConstraint.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-UnsupportedConstraint.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-UnsupportedPredicate.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous-UnsupportedPredicate.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DynamicIndexScan-Heterogenous.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Homogenous-EnabledDateConstraint.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DynamicIndexScan-Homogenous-EnabledDateConstraint.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Homogenous-UnsupportedConstraint.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DynamicIndexScan-Homogenous-UnsupportedConstraint.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Homogenous.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DynamicIndexScan-Homogenous.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-OpenEndedPartitions.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DynamicIndexScan-OpenEndedPartitions.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScan-Relabel.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/DynamicIndexScan-Relabel.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/DynamicIndexScanCosting.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/DynamicIndexScanCosting.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/DynamicIndexScanCosting.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/DynamicIndexScanCosting.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/EagerAggEmptyInput.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/EagerAggEmptyInput.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/EagerAggEmptyInput.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/EagerAggEmptyInput.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/EagerAggExpression.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/EagerAggExpression.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/EagerAggExpression.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/EagerAggExpression.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/EagerAggGroupColumnInJoin.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/EagerAggGroupColumnInJoin.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/EagerAggGroupColumnInJoin.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/EagerAggGroupColumnInJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/EagerAggMax.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/EagerAggMax.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/EagerAggMax.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/EagerAggMax.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/EagerAggMaxWithNestedLoop.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/EagerAggMaxWithNestedLoop.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/EagerAggMaxWithNestedLoop.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/EagerAggMaxWithNestedLoop.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/EagerAggMinMax.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/EagerAggMinMax.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/EagerAggMinMax.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/EagerAggMinMax.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/EagerAggSubquery.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/EagerAggSubquery.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/EagerAggSubquery.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/EagerAggSubquery.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/EagerAggUnsupportedAgg.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/EagerAggUnsupportedAgg.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/EagerAggUnsupportedAgg.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/EagerAggUnsupportedAgg.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/EffectOfLocalPredOnJoin.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/EffectOfLocalPredOnJoin.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/EffectOfLocalPredOnJoin.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/EffectOfLocalPredOnJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/EffectOfLocalPredOnJoin3.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/EffectOfLocalPredOnJoin3.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/EffectOfLocalPredOnJoin3.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/EffectOfLocalPredOnJoin3.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/EffectsOfJoinFilter.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/EffectsOfJoinFilter.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/EffectsOfJoinFilter.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/EffectsOfJoinFilter.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/EqualityJoin.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/EqualityJoin.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/EqualityJoin.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/EqualityJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/EqualityPredicateOverDate.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/EqualityPredicateOverDate.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/EqualityPredicateOverDate.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/EqualityPredicateOverDate.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/EquiJoinOnExpr-Supported.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/EquiJoinOnExpr-Supported.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/EquiJoinOnExpr-Unsupported.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/EquiJoinOnExpr-Unsupported.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Equiv-HashedDistr-1.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Equiv-HashedDistr-1.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Equiv-HashedDistr-2.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Equiv-HashedDistr-2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/EquivClassesAndOr.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/EquivClassesAndOr.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/EquivClassesAndOr.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/EquivClassesAndOr.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/EquivClassesIntersect.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/EquivClassesIntersect.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/EquivClassesIntersect.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/EquivClassesIntersect.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/EquivClassesLimit.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/EquivClassesLimit.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/EquivClassesLimit.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/EquivClassesLimit.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/EquivClassesUnion.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/EquivClassesUnion.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/EquivClassesUnion.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/EquivClassesUnion.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Equivalence-class-project-over-LOJ.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Equivalence-class-project-over-LOJ.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/EstimateJoinRowsForCastPredicates.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/EstimateJoinRowsForCastPredicates.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/EstimateJoinRowsForCastPredicates.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/EstimateJoinRowsForCastPredicates.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Except-Volatile-Func.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Except-Volatile-Func.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Except.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/Except.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/Except.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/Except.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ExceptAllCompatibleDataType.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ExceptAllCompatibleDataType.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ExceptAllCompatibleDataType.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ExceptAllCompatibleDataType.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ExceptHashCompatibleRange.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ExceptHashCompatibleRange.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ExceptHashCompatibleRange.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ExceptHashCompatibleRange.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ExceptHashIncompatibleRange.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ExceptHashIncompatibleRange.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ExceptHashIncompatibleRange.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ExceptHashIncompatibleRange.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ExistentialSubquriesInsideScalarExpression.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ExistentialSubquriesInsideScalarExpression.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ExistentialSubquriesInsideScalarExpression.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ExistentialSubquriesInsideScalarExpression.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Exists-SuperfluousEquality.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Exists-SuperfluousEquality.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ExistsSubqInsideExpr.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ExistsSubqInsideExpr.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ExistsSubqInsideExpr.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ExistsSubqInsideExpr.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ExpandJoinOrder.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ExpandJoinOrder.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ExpandJoinOrder.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ExpandJoinOrder.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ExpandNAryJoinGreedyWithLOJOnly.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ExpandNAryJoinGreedyWithLOJOnly.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ExpandNAryJoinGreedyWithLOJOnly.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ExpandNAryJoinGreedyWithLOJOnly.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ExprOnScSubqueryWithOuterRef.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ExprOnScSubqueryWithOuterRef.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ExprOnScSubqueryWithOuterRef.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ExprOnScSubqueryWithOuterRef.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ExternalTable1.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ExternalTable1.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ExternalTable1.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ExternalTable1.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ExternalTable2.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ExternalTable2.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ExternalTable2.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ExternalTable2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ExternalTable3.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ExternalTable3.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ExternalTable3.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ExternalTable3.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ExternalTable4.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ExternalTable4.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ExternalTable4.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ExternalTable4.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ExternalTableWithFilter.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ExternalTableWithFilter.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ExternalTableWithFilter.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ExternalTableWithFilter.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ExtractOneBindingFromScalarGroups.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ExtractOneBindingFromScalarGroups.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ExtractOneBindingFromScalarGroups.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ExtractOneBindingFromScalarGroups.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ExtractPredicateFromDisjWithComputedColumns.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ExtractPredicateFromDisjWithComputedColumns.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ExtractPredicateFromDisjWithComputedColumns.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ExtractPredicateFromDisjWithComputedColumns.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/FOJ-Condition-False.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/FOJ-Condition-False.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Factorized-Preds.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Factorized-Preds.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/FieldSelect.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/FieldSelect.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/FieldSelect.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/FieldSelect.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/FilterScalarCast.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/FilterScalarCast.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/FilterScalarCast.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/FilterScalarCast.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/FoldedArrayCmp.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/FoldedArrayCmp.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/FoldedArrayCmp.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/FoldedArrayCmp.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ForeignPartOneTimeFilterDPE.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ForeignPartOneTimeFilterDPE.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ForeignPartOneTimeFilterDPE.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ForeignPartOneTimeFilterDPE.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ForeignPartUniform.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ForeignPartUniform.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ForeignPartUniform.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ForeignPartUniform.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ForeignScanExecLocAnyJoin.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ForeignScanExecLocAnyJoin.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ForeignScanExecLocAnyJoin.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ForeignScanExecLocAnyJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ForeignScanExecLocAnySimpleScan.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ForeignScanExecLocAnySimpleScan.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ForeignScanExecLocAnySimpleScan.mdp
rename to gpcontrib/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/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/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/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/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/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/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/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/orca/gporca/data/dxl/minidump/FullJoin-2PredicateOnDistColumns.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-Caps.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/FullJoin-Caps.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-InnerNotOnDistributionColumn.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/FullJoin-InnerNotOnDistributionColumn.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-NonDefaultOpfamily.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/FullJoin-NonDefaultOpfamily.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-NotOnDistributionColumn.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/FullJoin-NotOnDistributionColumn.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-NullPredicate.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/FullJoin-NullPredicate.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-OnDistributionColumn.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/FullJoin-OnDistributionColumn.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-PredicateOnSameTable.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/FullJoin-PredicateOnSameTable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-Replicated.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/FullJoin-Replicated.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-Subquery-CastedPredicates.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/FullJoin-Subquery-CastedPredicates.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-SubquerySingleton.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/FullJoin-SubquerySingleton.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-SubqueryWithRedistribute.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/FullJoin-SubqueryWithRedistribute.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/FullJoin-SwappedPredicates.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/FullJoin-SwappedPredicates.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/FullOuterJoin-NullRejectingLHS1.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/FullOuterJoin-NullRejectingLHS1.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/FullOuterJoin-NullRejectingLHS2.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/FullOuterJoin-NullRejectingLHS2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/FullOuterJoinLeftMultiplyRightMaxCard.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/FullOuterJoinLeftMultiplyRightMaxCard.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/FullOuterJoinLeftMultiplyRightMaxCard.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/FullOuterJoinLeftMultiplyRightMaxCard.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/FullOuterJoinMaxCardLeftChild.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/FullOuterJoinMaxCardLeftChild.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/FullOuterJoinMaxCardLeftChild.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/FullOuterJoinMaxCardLeftChild.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/FullOuterJoinMaxCardRightChild.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/FullOuterJoinMaxCardRightChild.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/FullOuterJoinMaxCardRightChild.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/FullOuterJoinMaxCardRightChild.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/FullOuterJoinZeroMaxCard.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/FullOuterJoinZeroMaxCard.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/FullOuterJoinZeroMaxCard.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/FullOuterJoinZeroMaxCard.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/FunctionWithQueryParam.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/FunctionWithQueryParam.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/FunctionWithQueryParam.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/FunctionWithQueryParam.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Gb-on-keys.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Gb-on-keys.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/GinIndex.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/GinIndex.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/GinIndex.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/GinIndex.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/GinIndexPathOpfamily.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/GinIndexPathOpfamily.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/GinIndexPathOpfamily.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/GinIndexPathOpfamily.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/GinIndexSearchModeAll.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/GinIndexSearchModeAll.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/GinIndexSearchModeAll.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/GinIndexSearchModeAll.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Gist-AOCOTable-NonLossy-BitmapIndexPlan.mdp b/gpcontrib/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/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/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/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/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/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/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/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/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/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/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/orca/gporca/data/dxl/minidump/Gist-OrderBy-BitmapPlan.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Gist-OrderBy-IndexPlan.mdp b/gpcontrib/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/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/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/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/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/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/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/orca/gporca/data/dxl/minidump/Gist-PartialIndex-TableScan.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/GreedyNAryDelayCrossJoin.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/GreedyNAryDelayCrossJoin.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/GreedyNAryDelayCrossJoin.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/GreedyNAryDelayCrossJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/GreedyNAryJoin.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/GreedyNAryJoin.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/GreedyNAryJoin.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/GreedyNAryJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/GreedyNAryJoinWithDisconnectedEdges.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/GreedyNAryJoinWithDisconnectedEdges.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/GreedyNAryJoinWithDisconnectedEdges.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/GreedyNAryJoinWithDisconnectedEdges.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/GreedyNAryOnlyCrossJoins.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/GreedyNAryOnlyCrossJoins.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/GreedyNAryOnlyCrossJoins.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/GreedyNAryOnlyCrossJoins.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/GroupByEmptySetNoAgg.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/GroupByEmptySetNoAgg.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/GroupByEmptySetNoAgg.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/GroupByEmptySetNoAgg.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/GroupByOuterRef.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/GroupByOuterRef.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/GroupByOuterRef.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/GroupByOuterRef.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/GroupingOnSameTblCol-1.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/GroupingOnSameTblCol-1.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/GroupingOnSameTblCol-2.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/GroupingOnSameTblCol-2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/GroupingSets.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/GroupingSets.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/GroupingSets.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/GroupingSets.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/HAWQ-TPCH-Stat-Derivation.mdp b/gpcontrib/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/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/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/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/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/orca/gporca/data/dxl/minidump/HJN-DeeperOuter.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/HJN-Redistribute-One-Side.mdp b/gpcontrib/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/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/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/orca/gporca/data/dxl/minidump/Hash-BitmapScan-InArray.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Hash-BitmapScan.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Hash-BitmapScan.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Hash-IndexScan.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Hash-IndexScan.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Hash-TableScan-AllArray.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Hash-TableScan-AllArray.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/HashJoinOnRelabeledColumns.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/HashJoinOnRelabeledColumns.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/HashJoinOnRelabeledColumns.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/HashJoinOnRelabeledColumns.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Hint-AbsoluteRows-Over-Join.mdp b/gpcontrib/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/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/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/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/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/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/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/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/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/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/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/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/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/orca/gporca/data/dxl/minidump/Hint-Leading-Directed.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Hint-Leading-Multiple.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Hint-Leading-Multiple.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Hint-Leading-NonDirected.mdp b/gpcontrib/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/orca/gporca/data/dxl/minidump/Hint-SubtractRows-Over-Join.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IDF-NotNullConstant.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IDF-NotNullConstant.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IDF-NullConstant.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IDF-NullConstant.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IN-ArrayCmp.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IN-ArrayCmp.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IN-Nulls-ArrayCmpAny.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IN-Nulls-ArrayCmpAny.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IN-Numeric.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IN-Numeric.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IN.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/IN.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/IN.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/IN.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/INDF-NotNullConstant.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/INDF-NotNullConstant.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/INDF-NullConstant.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/INDF-NullConstant.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InClauseWithMCV.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InClauseWithMCV.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InClauseWithMCV.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InClauseWithMCV.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InEqualityJoin.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InEqualityJoin.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InEqualityJoin.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InEqualityJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefColumnIn.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefColumnIn.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefColumnIn.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefColumnIn.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefColumnPlusConstIn.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefColumnPlusConstIn.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefColumnPlusConstIn.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefColumnPlusConstIn.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefConstIn.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefConstIn.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefConstIn.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InSubqWithPrjListOuterRefNoInnerRefConstIn.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InSubqWithPrjListReturnSet.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InSubqWithPrjListReturnSet.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InSubqWithPrjListReturnSet.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InSubqWithPrjListReturnSet.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InSubqueryWithNotNullCol.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InSubqueryWithNotNullCol.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InSubqueryWithNotNullCol.mdp
rename to gpcontrib/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/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/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/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/orca/gporca/data/dxl/minidump/IndexApply-Heterogeneous-BothSidesPartitioned.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-Heterogeneous-DTS.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexApply-Heterogeneous-DTS.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-Heterogeneous-NoDTS.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexApply-Heterogeneous-NoDTS.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-IndexCondDisjointWithHashedDistr.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexApply-IndexCondDisjointWithHashedDistr.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-IndexCondIntersectWithHashedDistr.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexApply-IndexCondIntersectWithHashedDistr.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-IndexCondMatchHashedDistr.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexApply-IndexCondMatchHashedDistr.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-IndexCondSubsetOfHashedDistr.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexApply-IndexCondSubsetOfHashedDistr.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-IndexCondSupersetOfHashedDistr.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexApply-IndexCondSupersetOfHashedDistr.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-IndexOnCoordinatorOnlyTable.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexApply-IndexOnCoordinatorOnlyTable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-InnerSelect-Basic.mdp b/gpcontrib/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/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/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/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/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/orca/gporca/data/dxl/minidump/IndexApply-InnerSelect-PartTable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-InnerSelect-PartTable2.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexApply-InnerSelect-PartTable2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-LeftOuter-NLJoin.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexApply-LeftOuter-NLJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-MultiDistKey-WithComplexPreds.mdp b/gpcontrib/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/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/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/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/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/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/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/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/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/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/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/orca/gporca/data/dxl/minidump/IndexApply-PartKey-Is-IndexKey.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-PartResolverExpand.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexApply-PartResolverExpand.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-PartTable.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexApply-PartTable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply-Redistribute-Const-Table.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexApply-Redistribute-Const-Table.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply1-CalibratedCostModel.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexApply1-CalibratedCostModel.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply1.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/IndexApply1.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/IndexApply1.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/IndexApply1.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply2.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/IndexApply2.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/IndexApply2.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/IndexApply2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply3.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/IndexApply3.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/IndexApply3.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/IndexApply3.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply4.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/IndexApply4.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/IndexApply4.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/IndexApply4.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexApply_NestLoopWithNestParamTrue.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexApply_NestLoopWithNestParamTrue.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexConstraintsMDidCache.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/IndexConstraintsMDidCache.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/IndexConstraintsMDidCache.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/IndexConstraintsMDidCache.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexGet-OuterRefs.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexGet-OuterRefs.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexNLJ-IndexGet-OuterRef.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexNLJ-IndexGet-OuterRef.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexNLJoin_Cast_NoMotion.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexNLJoin_Cast_NoMotion.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-AddNewPartitionToRootTableContainingHeterogenousIndex.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexOnLeaf-AddNewPartitionToRootTableContainingHeterogenousIndex.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-AddPartitionToRootWithHomogenousIndex.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexOnLeaf-AddPartitionToRootWithHomogenousIndex.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-IndexOnPartitionsWithDifferentStorageTypes.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexOnLeaf-IndexOnPartitionsWithDifferentStorageTypes.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnLeaf-NonOverlappingHeterogenousIndex-ANDPredicate-AO.mdp b/gpcontrib/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/orca/gporca/data/dxl/minidump/IndexOnLeaf-SingleColumnHeterogenousIndexOnRoot-2-HEAP.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnlyScan-CTE.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexOnlyScan-CTE.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnlyScan-NoDistKeyInIndex.mdp b/gpcontrib/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/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/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/orca/gporca/data/dxl/minidump/IndexOnlyScan-OrderBy-on-MultiCol-NonIndex.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexOnlyScanCosting.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/IndexOnlyScanCosting.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/IndexOnlyScanCosting.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/IndexOnlyScanCosting.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexScan-AOTable.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexScan-AOTable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexScan-AndedIn.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexScan-AndedIn.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexScan-BoolFalse.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexScan-BoolFalse.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexScan-BoolTrue.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexScan-BoolTrue.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexScan-DroppedColumns.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexScan-DroppedColumns.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexScan-IsNotNullPred.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexScan-IsNotNullPred.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexScan-IsNullPred.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexScan-IsNullPred.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexScan-ORPredsAOPart.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/IndexScan-ORPredsAOPart.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexScan-ORPredsNonPart.mdp b/gpcontrib/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/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/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/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/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/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/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/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/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/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/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/orca/gporca/data/dxl/minidump/IndexScan-Relabel.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexScanCosting.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/IndexScanCosting.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/IndexScanCosting.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/IndexScanCosting.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexScanWithNestedCTEAndSetOp.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/IndexScanWithNestedCTEAndSetOp.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/IndexScanWithNestedCTEAndSetOp.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/IndexScanWithNestedCTEAndSetOp.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IndexedNLJBitmap.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/IndexedNLJBitmap.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/IndexedNLJBitmap.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/IndexedNLJBitmap.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicates.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InferPredicates.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InferPredicates.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InferPredicates.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-oid-oid.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/InferPredicatesBCC-oid-oid.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-txt-txt.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/InferPredicatesBCC-txt-txt.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-vc-txt.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/InferPredicatesBCC-vc-txt.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-vc-vc.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/InferPredicatesBCC-vc-vc.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesBCC-vcpart-txt.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/InferPredicatesBCC-vcpart-txt.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesForLimit.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InferPredicatesForLimit.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InferPredicatesForLimit.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InferPredicatesForLimit.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesForPartSQ.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InferPredicatesForPartSQ.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InferPredicatesForPartSQ.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InferPredicatesForPartSQ.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesForProcessedColumn.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InferPredicatesForProcessedColumn.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InferPredicatesForProcessedColumn.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InferPredicatesForProcessedColumn.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesForQuantifiedSQ.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InferPredicatesForQuantifiedSQ.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InferPredicatesForQuantifiedSQ.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InferPredicatesForQuantifiedSQ.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesFromExistsSubquery.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InferPredicatesFromExistsSubquery.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InferPredicatesFromExistsSubquery.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InferPredicatesFromExistsSubquery.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesFromMultiSubquery.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InferPredicatesFromMultiSubquery.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InferPredicatesFromMultiSubquery.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InferPredicatesFromMultiSubquery.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesInnerOfLOJ.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InferPredicatesInnerOfLOJ.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InferPredicatesInnerOfLOJ.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InferPredicatesInnerOfLOJ.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesIntFromExistsSubquery.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InferPredicatesIntFromExistsSubquery.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InferPredicatesIntFromExistsSubquery.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InferPredicatesIntFromExistsSubquery.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesIntFromSubquery.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InferPredicatesIntFromSubquery.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InferPredicatesIntFromSubquery.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InferPredicatesIntFromSubquery.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesJoinSubquery.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InferPredicatesJoinSubquery.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InferPredicatesJoinSubquery.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InferPredicatesJoinSubquery.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InferPredicatesMultiColumns.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InferPredicatesMultiColumns.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InferPredicatesMultiColumns.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InferPredicatesMultiColumns.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InferredPredicatesConstraintSimplification.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InferredPredicatesConstraintSimplification.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InferredPredicatesConstraintSimplification.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InferredPredicatesConstraintSimplification.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InnerJoin-With-OuterRefs.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/InnerJoin-With-OuterRefs.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InnerJoinBroadcastTableHashSpec.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InnerJoinBroadcastTableHashSpec.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InnerJoinBroadcastTableHashSpec.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InnerJoinBroadcastTableHashSpec.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InnerJoinOverJoinExcept.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InnerJoinOverJoinExcept.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InnerJoinOverJoinExcept.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InnerJoinOverJoinExcept.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InnerJoinOverJoinExceptAll.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InnerJoinOverJoinExceptAll.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InnerJoinOverJoinExceptAll.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InnerJoinOverJoinExceptAll.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InnerJoinReplicatedTableHashSpec.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InnerJoinReplicatedTableHashSpec.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InnerJoinReplicatedTableHashSpec.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InnerJoinReplicatedTableHashSpec.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Insert-AO-Partitioned-SortDisabled.mdp b/gpcontrib/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/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/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/orca/gporca/data/dxl/minidump/Insert-AO-Partitioned.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Insert-AO.mdp b/gpcontrib/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/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/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/orca/gporca/data/dxl/minidump/Insert-With-HJ-CTE-Agg.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Insert.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/Insert.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/Insert.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/Insert.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InsertAssertSort.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InsertAssertSort.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InsertAssertSort.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InsertAssertSort.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InsertCheckConstraint.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InsertCheckConstraint.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InsertCheckConstraint.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InsertCheckConstraint.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InsertConstTuple.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InsertConstTuple.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InsertConstTuple.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InsertConstTuple.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InsertConstTupleRandomDistribution.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InsertConstTupleRandomDistribution.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InsertConstTupleRandomDistribution.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InsertConstTupleRandomDistribution.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InsertConstTupleVolatileFunction.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InsertConstTupleVolatileFunction.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InsertConstTupleVolatileFunction.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InsertConstTupleVolatileFunction.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InsertConstTupleVolatileFunctionMOTable.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InsertConstTupleVolatileFunctionMOTable.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InsertConstTupleVolatileFunctionMOTable.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InsertConstTupleVolatileFunctionMOTable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InsertCoordinatorOnlyTable.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InsertCoordinatorOnlyTable.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InsertCoordinatorOnlyTable.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InsertCoordinatorOnlyTable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InsertCoordinatorOnlyTableConstTuple.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InsertCoordinatorOnlyTableConstTuple.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InsertCoordinatorOnlyTableConstTuple.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InsertCoordinatorOnlyTableConstTuple.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InsertDirectedDispatchNullValue.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InsertDirectedDispatchNullValue.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InsertDirectedDispatchNullValue.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InsertDirectedDispatchNullValue.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InsertIntoNonNullAfterDroppingColumn.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InsertIntoNonNullAfterDroppingColumn.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InsertIntoNonNullAfterDroppingColumn.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InsertIntoNonNullAfterDroppingColumn.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InsertMismatchedDistrubution-2.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/InsertMismatchedDistrubution-2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InsertMismatchedDistrubution.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InsertMismatchedDistrubution.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InsertMismatchedDistrubution.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InsertMismatchedDistrubution.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InsertNULLNotNULLConstraint.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InsertNULLNotNULLConstraint.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InsertNULLNotNULLConstraint.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InsertNULLNotNULLConstraint.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InsertNoEnforceConstraints.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InsertNoEnforceConstraints.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InsertNoEnforceConstraints.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InsertNoEnforceConstraints.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InsertNonSingleton.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InsertNonSingleton.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InsertNonSingleton.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InsertNonSingleton.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InsertNotNullCols.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InsertNotNullCols.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InsertNotNullCols.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InsertNotNullCols.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InsertPrimaryKeyFromMOTable.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InsertPrimaryKeyFromMOTable.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InsertPrimaryKeyFromMOTable.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InsertPrimaryKeyFromMOTable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InsertProjectSort.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InsertProjectSort.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InsertProjectSort.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InsertProjectSort.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InsertRandomDistr.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InsertRandomDistr.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InsertRandomDistr.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InsertRandomDistr.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InsertReplicatedIntoSerialHashDistributedTable.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InsertReplicatedIntoSerialHashDistributedTable.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InsertReplicatedIntoSerialHashDistributedTable.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InsertReplicatedIntoSerialHashDistributedTable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InsertSort.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InsertSort.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InsertSort.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InsertSort.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InsertSortDistributed2CoordinatorOnly.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InsertSortDistributed2CoordinatorOnly.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InsertSortDistributed2CoordinatorOnly.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InsertSortDistributed2CoordinatorOnly.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InsertWithDroppedCol.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InsertWithDroppedCol.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InsertWithDroppedCol.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InsertWithDroppedCol.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Int2Predicate.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/Int2Predicate.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/Int2Predicate.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/Int2Predicate.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Intersect-OuterRefs.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Intersect-OuterRefs.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Intersect-Volatile-Func.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Intersect-Volatile-Func.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InvalidDeleteGather.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InvalidDeleteGather.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InvalidDeleteGather.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InvalidDeleteGather.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InvalidPlan_CTE-2-all-plans.mdp b/gpcontrib/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/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/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/orca/gporca/data/dxl/minidump/InvalidPlan_IncompatibleDistributionOnJoinBranches.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InvalidPlan_MotionGatherFromCoordinatorToCoordinator-ScalarDQA.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/InvalidPlan_MotionGatherFromCoordinatorToCoordinator-ScalarDQA.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InvalidPlan_MotionGatherFromCoordinatorToCoordinator.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/InvalidPlan_MotionGatherFromCoordinatorToCoordinator.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/InvalidUpdatePlan.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/InvalidUpdatePlan.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/InvalidUpdatePlan.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/InvalidUpdatePlan.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/IsNullUnionAllIsNotNull.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/IsNullUnionAllIsNotNull.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/IsNullUnionAllIsNotNull.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/IsNullUnionAllIsNotNull.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JOIN-NonRedistributableCol.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/JOIN-NonRedistributableCol.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JOIN-Pred-Cast-Int4.mdp b/gpcontrib/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/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/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/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/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/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/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/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/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/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/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/orca/gporca/data/dxl/minidump/Join-Disj-Subqs.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Join-IDF.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Join-IDF.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Join-INDF-NoBroadcast.mdp b/gpcontrib/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/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/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/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/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/orca/gporca/data/dxl/minidump/Join-INDF.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Join-Varchar-Equality.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Join-Varchar-Equality.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Join-WinFunc-Preds.mdp b/gpcontrib/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/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/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/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/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/orca/gporca/data/dxl/minidump/Join-With-Subq-Preds-2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JoinAbsEqWithoutOpfamilies.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/JoinAbsEqWithoutOpfamilies.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/JoinAbsEqWithoutOpfamilies.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/JoinAbsEqWithoutOpfamilies.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityAboveLimit.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityAboveLimit.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityAboveLimit.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityAboveLimit.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityAtLimit.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityAtLimit.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityAtLimit.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityAtLimit.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityBelowLimit.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityBelowLimit.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityBelowLimit.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/JoinArityAssociativityCommutativityBelowLimit.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JoinBelowUnionAll.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/JoinBelowUnionAll.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/JoinBelowUnionAll.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/JoinBelowUnionAll.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JoinCitextVarchar.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/JoinCitextVarchar.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/JoinCitextVarchar.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/JoinCitextVarchar.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JoinColWithOnlyNDV.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/JoinColWithOnlyNDV.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/JoinColWithOnlyNDV.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/JoinColWithOnlyNDV.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JoinCombinedHashSpecNullsNotColocated.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/JoinCombinedHashSpecNullsNotColocated.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/JoinCombinedHashSpecNullsNotColocated.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/JoinCombinedHashSpecNullsNotColocated.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JoinDefaultOpfamiliesUsingNonDefaultOpfamilyOp.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/JoinDefaultOpfamiliesUsingNonDefaultOpfamilyOp.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/JoinDefaultOpfamiliesUsingNonDefaultOpfamilyOp.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/JoinDefaultOpfamiliesUsingNonDefaultOpfamilyOp.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JoinNDVRemain.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/JoinNDVRemain.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/JoinNDVRemain.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/JoinNDVRemain.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JoinOnReplicatedUniversal.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/JoinOnReplicatedUniversal.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/JoinOnReplicatedUniversal.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/JoinOnReplicatedUniversal.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JoinOnViewWithCastedColumn.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/JoinOnViewWithCastedColumn.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/JoinOnViewWithCastedColumn.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/JoinOnViewWithCastedColumn.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JoinOnViewWithCastedColumnAndSubqueryInPredicate.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/JoinOnViewWithCastedColumnAndSubqueryInPredicate.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/JoinOnViewWithCastedColumnAndSubqueryInPredicate.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/JoinOnViewWithCastedColumnAndSubqueryInPredicate.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JoinOnViewWithMixOfPushableAndNonpushablePredicates.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/JoinOnViewWithMixOfPushableAndNonpushablePredicates.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/JoinOnViewWithMixOfPushableAndNonpushablePredicates.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/JoinOnViewWithMixOfPushableAndNonpushablePredicates.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JoinOnViewWithSetReturningColumn.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/JoinOnViewWithSetReturningColumn.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/JoinOnViewWithSetReturningColumn.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/JoinOnViewWithSetReturningColumn.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JoinOnViewWithVolatileColumn.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/JoinOnViewWithVolatileColumn.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/JoinOnViewWithVolatileColumn.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/JoinOnViewWithVolatileColumn.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JoinOptimizationLevelGreedyNonPartTblInnerJoin.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/JoinOptimizationLevelGreedyNonPartTblInnerJoin.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/JoinOptimizationLevelGreedyNonPartTblInnerJoin.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/JoinOptimizationLevelGreedyNonPartTblInnerJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JoinOptimizationLevelQuery3WayHashJoinPartTbl.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/JoinOptimizationLevelQuery3WayHashJoinPartTbl.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/JoinOptimizationLevelQuery3WayHashJoinPartTbl.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/JoinOptimizationLevelQuery3WayHashJoinPartTbl.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JoinOptimizationLevelQueryNonPartTblInnerJoin.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/JoinOptimizationLevelQueryNonPartTblInnerJoin.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/JoinOptimizationLevelQueryNonPartTblInnerJoin.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/JoinOptimizationLevelQueryNonPartTblInnerJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JoinOrderDPE.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/JoinOrderDPE.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/JoinOrderDPE.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/JoinOrderDPE.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JoinPlan.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/JoinPlan.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/JoinPlan.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/JoinPlan.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JoinPlanWithRedistribute.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/JoinPlanWithRedistribute.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/JoinPlanWithRedistribute.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/JoinPlanWithRedistribute.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JoinPredFalseFilter.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/JoinPredFalseFilter.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/JoinPredFalseFilter.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/JoinPredFalseFilter.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JoinTinterval.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/JoinTinterval.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/JoinTinterval.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/JoinTinterval.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JoinWithSingletonAndSingletonBranches.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/JoinWithSingletonAndSingletonBranches.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/JoinWithSingletonAndSingletonBranches.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/JoinWithSingletonAndSingletonBranches.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JoinWithSingletonAndUniversalBranches.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/JoinWithSingletonAndUniversalBranches.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/JoinWithSingletonAndUniversalBranches.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/JoinWithSingletonAndUniversalBranches.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/JoinWithSubqueryProjectColumn.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/JoinWithSubqueryProjectColumn.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/JoinWithSubqueryProjectColumn.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/JoinWithSubqueryProjectColumn.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Join_OuterChild_DistUniversal.mdp b/gpcontrib/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/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/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/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/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/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/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/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/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/orca/gporca/data/dxl/minidump/LIKE-Pattern-green.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-Condition-False.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/LOJ-Condition-False.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-DynBitmapIndex.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/LOJ-DynBitmapIndex.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-DynBitmapIndexWithSelect.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/LOJ-DynBitmapIndexWithSelect.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-DynBtreeIndex.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/LOJ-DynBtreeIndex.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-DynBtreeIndexWithSelect.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/LOJ-DynBtreeIndexWithSelect.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-HashJoin-MultiDistKeys-WithComplexPreds.mdp b/gpcontrib/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/orca/gporca/data/dxl/minidump/LOJ-IndexApply-NonDistKey.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IndexApply-WithComplexPredicates.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/LOJ-IndexApply-WithComplexPredicates.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-IsNullPred.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/LOJ-IsNullPred.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-PushDown.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/LOJ-PushDown.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LOJ-With-Agg.mdp b/gpcontrib/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/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/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/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/orca/gporca/data/dxl/minidump/LOJNonNullRejectingPredicates.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/LOJNonNullRejectingPredicates.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/LOJNonNullRejectingPredicates.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LOJNullRejectingPredicates.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/LOJNullRejectingPredicates.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/LOJNullRejectingPredicates.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/LOJNullRejectingPredicates.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LOJNullRejectingZeroPlacePredicates.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/LOJNullRejectingZeroPlacePredicates.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/LOJNullRejectingZeroPlacePredicates.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/LOJNullRejectingZeroPlacePredicates.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LOJReorderComplexNestedLOJs.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/LOJReorderComplexNestedLOJs.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/LOJReorderComplexNestedLOJs.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/LOJReorderComplexNestedLOJs.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LOJReorderWithComplexPredicate.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/LOJReorderWithComplexPredicate.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/LOJReorderWithComplexPredicate.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/LOJReorderWithComplexPredicate.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LOJReorderWithIDF.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/LOJReorderWithIDF.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/LOJReorderWithIDF.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/LOJReorderWithIDF.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LOJReorderWithNestedLOJAndFilter.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/LOJReorderWithNestedLOJAndFilter.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/LOJReorderWithNestedLOJAndFilter.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/LOJReorderWithNestedLOJAndFilter.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LOJReorderWithOneSidedFilter.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/LOJReorderWithOneSidedFilter.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/LOJReorderWithOneSidedFilter.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/LOJReorderWithOneSidedFilter.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LOJReorderWithSimplePredicate.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/LOJReorderWithSimplePredicate.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/LOJReorderWithSimplePredicate.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/LOJReorderWithSimplePredicate.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LOJWithFalsePred.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/LOJWithFalsePred.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/LOJWithFalsePred.mdp
rename to gpcontrib/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/orca/gporca/data/dxl/minidump/LargeJoins.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/LargeJoins.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/LargeJoins.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LargeMultiColumnInList.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/LargeMultiColumnInList.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/LargeMultiColumnInList.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/LargeMultiColumnInList.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Lead-Lag-WinFuncs.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Lead-Lag-WinFuncs.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Least-Greatest-Subselect.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Least-Greatest-Subselect.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Least-Greatest.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Least-Greatest.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LeftJoin-DPv2-With-Select.mdp b/gpcontrib/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/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/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/orca/gporca/data/dxl/minidump/LeftJoin-UnsupportedFilter-Cardinality.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LeftJoin-With-Coalesce.mdp b/gpcontrib/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/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/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/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/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/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/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/orca/gporca/data/dxl/minidump/LeftJoin-With-Pred-On-Inner2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LeftJoinBroadcastTableHashSpec.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/LeftJoinBroadcastTableHashSpec.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/LeftJoinBroadcastTableHashSpec.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/LeftJoinBroadcastTableHashSpec.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LeftJoinDPv2JoinOrder.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/LeftJoinDPv2JoinOrder.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/LeftJoinDPv2JoinOrder.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/LeftJoinDPv2JoinOrder.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LeftJoinNullsNotColocated.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/LeftJoinNullsNotColocated.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/LeftJoinNullsNotColocated.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/LeftJoinNullsNotColocated.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LeftJoinPruning.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/LeftJoinPruning.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/LeftJoinPruning.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/LeftJoinPruning.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LeftJoinPruningInOuterInnerQuery.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/LeftJoinPruningInOuterInnerQuery.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/LeftJoinPruningInOuterInnerQuery.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/LeftJoinPruningInOuterInnerQuery.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LeftJoinPruningInnerQuery.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/LeftJoinPruningInnerQuery.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/LeftJoinPruningInnerQuery.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/LeftJoinPruningInnerQuery.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LeftJoinPruningOuterQuery.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/LeftJoinPruningOuterQuery.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/LeftJoinPruningOuterQuery.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/LeftJoinPruningOuterQuery.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LeftOuter2InnerUnionAllAntiSemiJoin-Tpcds.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/LeftOuter2InnerUnionAllAntiSemiJoin-Tpcds.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LeftOuter2InnerUnionAllAntiSemiJoin.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/LeftOuter2InnerUnionAllAntiSemiJoin.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/LeftOuter2InnerUnionAllAntiSemiJoin.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/LeftOuter2InnerUnionAllAntiSemiJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LeftSemiJoinCE.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/LeftSemiJoinCE.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/LeftSemiJoinCE.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/LeftSemiJoinCE.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LeftSemiJoinWithRepOuterTab.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/LeftSemiJoinWithRepOuterTab.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/LeftSemiJoinWithRepOuterTab.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/LeftSemiJoinWithRepOuterTab.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LikePredStatsNotComparable.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/LikePredStatsNotComparable.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/LikePredStatsNotComparable.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/LikePredStatsNotComparable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ListPartLossyCastEq.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ListPartLossyCastEq.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ListPartLossyCastEq.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ListPartLossyCastEq.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ListPartLossyCastLT.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ListPartLossyCastLT.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ListPartLossyCastLT.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ListPartLossyCastLT.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ListPartLossyCastNEq.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ListPartLossyCastNEq.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ListPartLossyCastNEq.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ListPartLossyCastNEq.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/LogicalIndexGetDroppedCols.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/LogicalIndexGetDroppedCols.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/LogicalIndexGetDroppedCols.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/LogicalIndexGetDroppedCols.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/MDQA-SameDQAColumn.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/MDQA-SameDQAColumn.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/MDQAs-Grouping-OrderBy.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/MDQAs-Grouping-OrderBy.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/MDQAs-Grouping.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/MDQAs-Grouping.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/MDQAs-Union.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/MDQAs-Union.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/MDQAs1.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/MDQAs1.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/MDQAs1.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/MDQAs1.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ManyTextUnionsInSubquery.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ManyTextUnionsInSubquery.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ManyTextUnionsInSubquery.mdp
rename to gpcontrib/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/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/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/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/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/orca/gporca/data/dxl/minidump/Minidump.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/Minidump.xml
rename to gpcontrib/orca/gporca/data/dxl/minidump/Minidump.xml
diff --git a/src/backend/gporca/data/dxl/minidump/MissingBoolColStats.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/MissingBoolColStats.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/MissingBoolColStats.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/MissingBoolColStats.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/MissingStats.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/MissingStats.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/MissingStats.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/MissingStats.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/MotionHazard-MaterializeUnderResult.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/MotionHazard-MaterializeUnderResult.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/MotionHazard-NoMaterializeGatherUnderResult.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/MotionHazard-NoMaterializeGatherUnderResult.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/MotionHazard-NoMaterializeHashAggUnderResult.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/MotionHazard-NoMaterializeHashAggUnderResult.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/MotionHazard-NoMaterializeSortUnderResult.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/MotionHazard-NoMaterializeSortUnderResult.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/MultiColumnAggWithDefaultOpfamilies.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/MultiColumnAggWithDefaultOpfamilies.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/MultiColumnAggWithDefaultOpfamilies.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/MultiColumnAggWithDefaultOpfamilies.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/MultiColumnDQA-InnerJoin-GroupBy-HashAggregate.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/MultiColumnDQA-InnerJoin-GroupBy-HashAggregate.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/MultiDistKeyJoinCardinality.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/MultiDistKeyJoinCardinality.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/MultiDistKeyJoinCardinality.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/MultiDistKeyJoinCardinality.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/MultiDistKeyWithOtherPredsJoinCardinality.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/MultiDistKeyWithOtherPredsJoinCardinality.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/MultiDistKeyWithOtherPredsJoinCardinality.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/MultiDistKeyWithOtherPredsJoinCardinality.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/MultiLevel-CorrelatedExec.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/MultiLevel-CorrelatedExec.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/MultiLevel-IN-Subquery.mdp b/gpcontrib/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/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/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/orca/gporca/data/dxl/minidump/MultiLevel-NOT-IN-Subquery.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/MultiLevelDecorrelationWithSemiJoins.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/MultiLevelDecorrelationWithSemiJoins.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/MultiLevelDecorrelationWithSemiJoins.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/MultiLevelDecorrelationWithSemiJoins.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/MultiLevelPartLossyCastNEq.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/MultiLevelPartLossyCastNEq.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/MultiLevelPartLossyCastNEq.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/MultiLevelPartLossyCastNEq.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/MultipleDampedPredJoinCardinality.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/MultipleDampedPredJoinCardinality.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/MultipleDampedPredJoinCardinality.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/MultipleDampedPredJoinCardinality.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/MultipleIndependentPredJoinCardinality.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/MultipleIndependentPredJoinCardinality.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/MultipleIndependentPredJoinCardinality.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/MultipleIndependentPredJoinCardinality.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/MultipleIndexPredicate.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/MultipleIndexPredicate.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/MultipleIndexPredicate.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/MultipleIndexPredicate.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/MultipleSetReturningFunction-1.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/MultipleSetReturningFunction-1.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/MultipleSetReturningFunction-2.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/MultipleSetReturningFunction-2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/MultipleSetReturningFunction-3.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/MultipleSetReturningFunction-3.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/MultipleSubqueriesInSelectClause.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/MultipleSubqueriesInSelectClause.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/MultipleSubqueriesInSelectClause.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/MultipleSubqueriesInSelectClause.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/MultipleUpdateWithJoinOnDistCol.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/MultipleUpdateWithJoinOnDistCol.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/MultipleUpdateWithJoinOnDistCol.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/MultipleUpdateWithJoinOnDistCol.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NLJ-BC-Outer-Spool-Inner.mdp b/gpcontrib/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/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/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/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/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/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/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/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/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/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/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/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/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/orca/gporca/data/dxl/minidump/NLJ-Rewindability-CTAS.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NLJ-Rewindability.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/NLJ-Rewindability.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NOT-IN-ArrayCmp.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/NOT-IN-ArrayCmp.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NOT-IN-NotNullBoth.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/NOT-IN-NotNullBoth.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NOT-IN-NullInner.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/NOT-IN-NullInner.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NOT-IN-NullOuter.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/NOT-IN-NullOuter.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Name-Cardinality.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Name-Cardinality.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NaryWithLojAndNonLojChilds.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/NaryWithLojAndNonLojChilds.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/NaryWithLojAndNonLojChilds.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/NaryWithLojAndNonLojChilds.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NdvPreservingExprProjectionEquiJoin.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/NdvPreservingExprProjectionEquiJoin.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/NdvPreservingExprProjectionEquiJoin.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/NdvPreservingExprProjectionEquiJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NdvPreservingExprProjectionNonEquiJoin.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/NdvPreservingExprProjectionNonEquiJoin.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/NdvPreservingExprProjectionNonEquiJoin.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/NdvPreservingExprProjectionNonEquiJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Negative-IndexApply1.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Negative-IndexApply1.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Negative-IndexApply2.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Negative-IndexApply2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Nested-Or-Predicates.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Nested-Or-Predicates.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Nested-Setops-2.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Nested-Setops-2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Nested-Setops.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Nested-Setops.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NestedInSubqWithPrjListOuterRefNoInnerRef.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/NestedInSubqWithPrjListOuterRefNoInnerRef.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/NestedInSubqWithPrjListOuterRefNoInnerRef.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/NestedInSubqWithPrjListOuterRefNoInnerRef.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NestedJoinWithCastedColumn.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/NestedJoinWithCastedColumn.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/NestedJoinWithCastedColumn.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/NestedJoinWithCastedColumn.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NestedNLJWithBlockingSpool.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/NestedNLJWithBlockingSpool.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/NestedNLJWithBlockingSpool.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/NestedNLJWithBlockingSpool.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NestedProjectCountStarWithOuterRefs.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/NestedProjectCountStarWithOuterRefs.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/NestedProjectCountStarWithOuterRefs.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/NestedProjectCountStarWithOuterRefs.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NestedSubqLimitBindings.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/NestedSubqLimitBindings.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/NestedSubqLimitBindings.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/NestedSubqLimitBindings.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NewBtreeIndexScanCost.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/NewBtreeIndexScanCost.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/NewBtreeIndexScanCost.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/NewBtreeIndexScanCost.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NoBroadcastUnderGatherForWindowFunction.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/NoBroadcastUnderGatherForWindowFunction.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/NoBroadcastUnderGatherForWindowFunction.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/NoBroadcastUnderGatherForWindowFunction.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NoDistKeyMultiPredJoinCardinality.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/NoDistKeyMultiPredJoinCardinality.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/NoDistKeyMultiPredJoinCardinality.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/NoDistKeyMultiPredJoinCardinality.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NoHashAggWithoutPrelimFunc.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/NoHashAggWithoutPrelimFunc.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/NoHashAggWithoutPrelimFunc.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/NoHashAggWithoutPrelimFunc.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NoMissingStats.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/NoMissingStats.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/NoMissingStats.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/NoMissingStats.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NoMissingStatsAfterDroppedCol.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/NoMissingStatsAfterDroppedCol.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/NoMissingStatsAfterDroppedCol.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/NoMissingStatsAfterDroppedCol.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NoMissingStatsAskingForSystemColFOJ.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/NoMissingStatsAskingForSystemColFOJ.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/NoMissingStatsAskingForSystemColFOJ.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/NoMissingStatsAskingForSystemColFOJ.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NoMissingStatsForEmptyTable.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/NoMissingStatsForEmptyTable.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/NoMissingStatsForEmptyTable.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/NoMissingStatsForEmptyTable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NoMotionsPlan.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/NoMotionsPlan.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/NoMotionsPlan.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/NoMotionsPlan.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NoPartConstraint-WhenNoDefaultPartsAndIndices.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/NoPartConstraint-WhenNoDefaultPartsAndIndices.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NoPartPropagationPlan.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/NoPartPropagationPlan.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/NoPartPropagationPlan.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/NoPartPropagationPlan.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NoPushdownPredicateWithCTEAnchor.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/NoPushdownPredicateWithCTEAnchor.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/NoPushdownPredicateWithCTEAnchor.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/NoPushdownPredicateWithCTEAnchor.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NoRedistributeOnAppend.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/NoRedistributeOnAppend.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/NoRedistributeOnAppend.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/NoRedistributeOnAppend.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NoSortPlan.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/NoSortPlan.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/NoSortPlan.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/NoSortPlan.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Non-Hashjoinable-Pred-2.mdp b/gpcontrib/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/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/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/orca/gporca/data/dxl/minidump/Non-Hashjoinable-Pred.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NonOverlappingHomogenousIndexesOnRoot-ANDPredicate-HEAP.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/NonOverlappingHomogenousIndexesOnRoot-ANDPredicate-HEAP.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NonSingleton.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/NonSingleton.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/NonSingleton.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/NonSingleton.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NonSplittableAgg.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/NonSplittableAgg.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/NonSplittableAgg.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/NonSplittableAgg.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NotExists-SuperflousOuterRefWithGbAgg.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/NotExists-SuperflousOuterRefWithGbAgg.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NotExists-SuperfluousEquality.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/NotExists-SuperfluousEquality.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NotInToLASJ.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/NotInToLASJ.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/NotInToLASJ.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/NotInToLASJ.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NotWellDefinedDisjunctConjunctPredicates.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/NotWellDefinedDisjunctConjunctPredicates.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/NotWellDefinedDisjunctConjunctPredicates.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/NotWellDefinedDisjunctConjunctPredicates.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NullConstant-INDF-Col.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/NullConstant-INDF-Col.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/NullIf-With-Subquery.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/NullIf-With-Subquery.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/OR-WithIsNullPred.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/OR-WithIsNullPred.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/OR.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/OR.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/OR.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/OR.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/OneDistKeyMultiPredJoinCardinality.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/OneDistKeyMultiPredJoinCardinality.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/OneDistKeyMultiPredJoinCardinality.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/OneDistKeyMultiPredJoinCardinality.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/OneLevel-CorrelatedExec.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/OneLevel-CorrelatedExec.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/OneSegmentGather.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/OneSegmentGather.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/OneSegmentGather.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/OneSegmentGather.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/OptimizerConfigWithSegmentsForCosting.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/OptimizerConfigWithSegmentsForCosting.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/OptimizerConfigWithSegmentsForCosting.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/OptimizerConfigWithSegmentsForCosting.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/OrderByNoRedundantSort.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/OrderByNoRedundantSort.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/OrderByNoRedundantSort.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/OrderByNoRedundantSort.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/OrderByNullsFirst.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/OrderByNullsFirst.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/OrderByNullsFirst.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/OrderByNullsFirst.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/OrderByOuterRef.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/OrderByOuterRef.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/OrderByOuterRef.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/OrderByOuterRef.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAggUsingGroupColumnInDirectArg.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/OrderedAggUsingGroupColumnInDirectArg.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/OrderedAggUsingGroupColumnInDirectArg.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/OrderedAggUsingGroupColumnInDirectArg.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_array_fraction.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/OrderedAgg_array_fraction.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_computed_col.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/OrderedAgg_computed_col.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_multiple_diffcol.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/OrderedAgg_multiple_diffcol.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_multiple_samecol.mdp b/gpcontrib/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/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/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/orca/gporca/data/dxl/minidump/OrderedAgg_multiple_samecol_difforderespec.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_single.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/OrderedAgg_single.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_skewed_data.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/OrderedAgg_skewed_data.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_with_groupby.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/OrderedAgg_with_groupby.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/OrderedAgg_with_nonOrderedAgg.mdp b/gpcontrib/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/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/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/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/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/orca/gporca/data/dxl/minidump/OuterJoin-With-OuterRefs.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/OuterJoinOnViewWithCastedColumn.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/OuterJoinOnViewWithCastedColumn.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/OuterJoinOnViewWithCastedColumn.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/OuterJoinOnViewWithCastedColumn.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/OverlappingHomogenousIndexesOnRoot-ANDPredicate-HEAP.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/OverlappingHomogenousIndexesOnRoot-ANDPredicate-HEAP.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/OverlappingHomogenousIndexesOnRoot-HEAP.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/OverlappingHomogenousIndexesOnRoot-HEAP.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ParallelUnionAllWithJson.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ParallelUnionAllWithJson.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ParallelUnionAllWithJson.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ParallelUnionAllWithJson.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Part-Selection-ConstArray-1.mdp b/gpcontrib/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/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/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/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/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/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/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/orca/gporca/data/dxl/minidump/Part-Selection-NOT-IN.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartConstraint-WhenDefaultPartsAndIndices.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartConstraint-WhenDefaultPartsAndIndices.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartConstraint-WhenIndicesAndNoDefaultParts.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartConstraint-WhenIndicesAndNoDefaultParts.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartConstraint-WithOnlyDefaultPartInfo.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartConstraint-WithOnlyDefaultPartInfo.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartForeignDifferentExecLocation.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/PartForeignDifferentExecLocation.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/PartForeignDifferentExecLocation.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/PartForeignDifferentExecLocation.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartForeignDifferentServer.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/PartForeignDifferentServer.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/PartForeignDifferentServer.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/PartForeignDifferentServer.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartForeignMixed.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/PartForeignMixed.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/PartForeignMixed.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/PartForeignMixed.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartForeignMixedDPE.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/PartForeignMixedDPE.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/PartForeignMixedDPE.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/PartForeignMixedDPE.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartForeignMixedSPE.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/PartForeignMixedSPE.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/PartForeignMixedSPE.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/PartForeignMixedSPE.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartForeignUniformSPE.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/PartForeignUniformSPE.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/PartForeignUniformSPE.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/PartForeignUniformSPE.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartPredsWithRandom.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/PartPredsWithRandom.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/PartPredsWithRandom.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/PartPredsWithRandom.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartSelectorOnJoinSide.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/PartSelectorOnJoinSide.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/PartSelectorOnJoinSide.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/PartSelectorOnJoinSide.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartSelectorOnJoinSide2.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/PartSelectorOnJoinSide2.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/PartSelectorOnJoinSide2.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/PartSelectorOnJoinSide2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-AggWithExistentialSubquery.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-AggWithExistentialSubquery.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-ArrayCoerce.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-ArrayCoerce.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-ArrayIn.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-ArrayIn.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-AsymmetricRangePredicate.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-AsymmetricRangePredicate.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-AvoidRangePred-DPE.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-AvoidRangePred-DPE.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-CSQ-NonPartKey.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-CSQ-NonPartKey.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-CSQ-PartKey.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-CSQ-PartKey.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-ComplexPredicate1.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-ComplexPredicate1.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-ComplexPredicate2.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-ComplexPredicate2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-ComplexPredicate3.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-ComplexPredicate3.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-ComplexPredicate4.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-ComplexPredicate4.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-ComplexPredicate5.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-ComplexPredicate5.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-ComplexRangePredicate-DefaultPart.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-ComplexRangePredicate-DefaultPart.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-ComplexRangePredicate-NoDefaultPart.mdp b/gpcontrib/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/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/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/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/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/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/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/orca/gporca/data/dxl/minidump/PartTbl-DPE-GroupBy.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-DPE-Limit.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-DPE-Limit.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-DPE-Opfamily.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-DPE-Opfamily.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-DPE-WindowFunction.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-DPE-WindowFunction.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-DPE.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-DPE.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-DTS.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-DTS.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-DTSEq.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-DTSEq.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-DTSLessThan.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-DTSLessThan.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-DateTime.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-DateTime.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-DisablePartSelection.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-DisablePartSelection.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-DisablePartSelectionJoin.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-DisablePartSelectionJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-Disjunction.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-Disjunction.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-EqPredicateWithCastRange.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-EqPredicateWithCastRange.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-HJ1.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-HJ1.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-HJ2.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-HJ2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-HJ3.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-HJ3.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-HJ4.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-HJ4.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-HJ5.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-HJ5.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-IDFList.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-IDFList.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-IDFNull.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-IDFNull.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-IDFWithCast.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-IDFWithCast.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-IndexOnDefPartOnly.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-IndexOnDefPartOnly.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-IsNotNullPredicate.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-IsNotNullPredicate.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-IsNullPredicate.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-IsNullPredicate.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-JoinOverExcept.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-JoinOverExcept.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-JoinOverGbAgg-2.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-JoinOverGbAgg-2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-JoinOverGbAgg.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-JoinOverGbAgg.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-JoinOverIntersect.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-JoinOverIntersect.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-JoinOverUnion-1.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-JoinOverUnion-1.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-JoinOverUnion-2.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-JoinOverUnion-2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-LASJ.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-LASJ.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-LeftOuterHashJoin-DPE-IsNull.mdp b/gpcontrib/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/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/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/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/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/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/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/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/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/orca/gporca/data/dxl/minidump/PartTbl-MultiWayJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-MultiWayJoinWithDPE-2.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-MultiWayJoinWithDPE-2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-MultipleEqPredicates.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-MultipleEqPredicates.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-NEqPredicate.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-NEqPredicate.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-NLJ.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-NLJ.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-NonConstSelect.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-NonConstSelect.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-PredicateWithCast.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-PredicateWithCast.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-PredicateWithCastList.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-PredicateWithCastList.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-PredicateWithCastMultiLevelList.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-PredicateWithCastMultiLevelList.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-RangeJoinPred.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-RangeJoinPred.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-Relabel-Equality.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-Relabel-Equality.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-Relabel-Range.mdp b/gpcontrib/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/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/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/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/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/orca/gporca/data/dxl/minidump/PartTbl-SPE-Boolean1.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SPE-Boolean2.mdp b/gpcontrib/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/orca/gporca/data/dxl/minidump/PartTbl-SQAll.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SQAny.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-SQAny.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SQExists.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-SQExists.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SQNotExists.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-SQNotExists.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SQScalar.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-SQScalar.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-SubqueryOuterRef.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-SubqueryOuterRef.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-VolatileFunc.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-VolatileFunc.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncNoDisjunctPredPushDown.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-WindowFuncNoDisjunctPredPushDown.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncNoPredPushDown.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-WindowFuncNoPredPushDown.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncPartialPredPushDown.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-WindowFuncPartialPredPushDown.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncPredPushDown.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-WindowFuncPredPushDown.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFuncSinglePredPushDown.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-WindowFuncSinglePredPushDown.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PartTbl-WindowFunction.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PartTbl-WindowFunction.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PredStatsNotComparable.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/PredStatsNotComparable.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/PredStatsNotComparable.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/PredStatsNotComparable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PredicateWithConjunctsAndDisjuncts.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/PredicateWithConjunctsAndDisjuncts.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/PredicateWithConjunctsAndDisjuncts.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/PredicateWithConjunctsAndDisjuncts.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PredicateWithConjunctsOfDisjuncts.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/PredicateWithConjunctsOfDisjuncts.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/PredicateWithConjunctsOfDisjuncts.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/PredicateWithConjunctsOfDisjuncts.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PredicateWithLongConjunction.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/PredicateWithLongConjunction.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/PredicateWithLongConjunction.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/PredicateWithLongConjunction.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Preds-Over-WinFunc1.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Preds-Over-WinFunc1.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Preds-Over-WinFunc2.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Preds-Over-WinFunc2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Preds-Over-WinFunc3.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Preds-Over-WinFunc3.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Preds-Over-WinFunc4.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Preds-Over-WinFunc4.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Preds-Over-WinFunc5.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Preds-Over-WinFunc5.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PreventIndexOnlyScanOnAppendOnlyVersion6UpgradedTable.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/PreventIndexOnlyScanOnAppendOnlyVersion6UpgradedTable.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/PreventIndexOnlyScanOnAppendOnlyVersion6UpgradedTable.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/PreventIndexOnlyScanOnAppendOnlyVersion6UpgradedTable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PreventIndexOnlyScanOnMixedAppendOnlyPartitionedTableContainingAppendOnlyVersion6Child.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/PreventIndexOnlyScanOnMixedAppendOnlyPartitionedTableContainingAppendOnlyVersion6Child.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/PreventIndexOnlyScanOnMixedAppendOnlyPartitionedTableContainingAppendOnlyVersion6Child.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/PreventIndexOnlyScanOnMixedAppendOnlyPartitionedTableContainingAppendOnlyVersion6Child.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PreventIndexOnlyScanOnMixedPartitionedTableContainingAppendOnlyVersion6Child.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/PreventIndexOnlyScanOnMixedPartitionedTableContainingAppendOnlyVersion6Child.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/PreventIndexOnlyScanOnMixedPartitionedTableContainingAppendOnlyVersion6Child.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/PreventIndexOnlyScanOnMixedPartitionedTableContainingAppendOnlyVersion6Child.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Project-With-NonScalar-Func.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Project-With-NonScalar-Func.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ProjectCountStar.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ProjectCountStar.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ProjectCountStar.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ProjectCountStar.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ProjectCountStarWithOuterRefs.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ProjectCountStarWithOuterRefs.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ProjectCountStarWithOuterRefs.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ProjectCountStarWithOuterRefs.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ProjectOutsideCountStar.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ProjectOutsideCountStar.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ProjectOutsideCountStar.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ProjectOutsideCountStar.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ProjectRepeatedColumn1.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ProjectRepeatedColumn1.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ProjectRepeatedColumn1.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ProjectRepeatedColumn1.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ProjectRepeatedColumn2.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ProjectRepeatedColumn2.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ProjectRepeatedColumn2.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ProjectRepeatedColumn2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ProjectSetFunction.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ProjectSetFunction.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ProjectSetFunction.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ProjectSetFunction.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ProjectUnderSubq.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ProjectUnderSubq.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ProjectUnderSubq.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ProjectUnderSubq.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ProjectWithConstant.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ProjectWithConstant.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ProjectWithConstant.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ProjectWithConstant.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ProjectWithTextConstant.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ProjectWithTextConstant.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ProjectWithTextConstant.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ProjectWithTextConstant.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Push-Subplan-Below-Union.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Push-Subplan-Below-Union.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-1.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-1.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-10.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-10.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-11.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-11.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-12.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-12.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-13.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-13.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-14.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-14.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-15.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-15.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-16.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-16.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-17.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-17.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-2.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-3.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-3.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-4.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-4.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-5.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-5.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-6.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-6.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-7.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-7.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-8.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-8.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-9.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PushConstantSelectPredicateThruJoin-9.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PushFilterToSemiJoinLeftChild.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/PushFilterToSemiJoinLeftChild.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/PushFilterToSemiJoinLeftChild.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/PushFilterToSemiJoinLeftChild.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PushGbBelowJoin-NegativeCase.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PushGbBelowJoin-NegativeCase.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PushGbBelowNaryUnion-1.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PushGbBelowNaryUnion-1.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PushGbBelowNaryUnion-2.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/PushGbBelowNaryUnion-2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PushGbBelowNaryUnionAll.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/PushGbBelowNaryUnionAll.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/PushGbBelowNaryUnionAll.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/PushGbBelowNaryUnionAll.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PushGbBelowUnion.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/PushGbBelowUnion.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/PushGbBelowUnion.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/PushGbBelowUnion.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PushGbBelowUnionAll.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/PushGbBelowUnionAll.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/PushGbBelowUnionAll.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/PushGbBelowUnionAll.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PushSelectDownUnionAllOfCTG.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/PushSelectDownUnionAllOfCTG.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/PushSelectDownUnionAllOfCTG.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/PushSelectDownUnionAllOfCTG.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/PushSelectWithOuterRefBelowUnion.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/PushSelectWithOuterRefBelowUnion.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/PushSelectWithOuterRefBelowUnion.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/PushSelectWithOuterRefBelowUnion.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Query.xml b/gpcontrib/orca/gporca/data/dxl/minidump/Query.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/Query.xml
rename to gpcontrib/orca/gporca/data/dxl/minidump/Query.xml
diff --git a/src/backend/gporca/data/dxl/minidump/QueryMismatchedDistribution-DynamicIndexScan.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/QueryMismatchedDistribution-DynamicIndexScan.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/QueryMismatchedDistribution.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/QueryMismatchedDistribution.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/QueryMismatchedDistribution.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/QueryMismatchedDistribution.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/RTErequiredPerms.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/RTErequiredPerms.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/RTErequiredPerms.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/RTErequiredPerms.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/RangePartLossyCastEqInPartitionRange.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/RangePartLossyCastEqInPartitionRange.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/RangePartLossyCastEqInPartitionRange.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/RangePartLossyCastEqInPartitionRange.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/RangePartLossyCastEqOnEndPartitionRange.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/RangePartLossyCastEqOnEndPartitionRange.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/RangePartLossyCastEqOnEndPartitionRange.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/RangePartLossyCastEqOnEndPartitionRange.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTEqInPartitionRange.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/RangePartLossyCastLTEqInPartitionRange.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTEqInPartitionRange.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/RangePartLossyCastLTEqInPartitionRange.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTEqOnEndPartitionRange.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/RangePartLossyCastLTEqOnEndPartitionRange.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTEqOnEndPartitionRange.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/RangePartLossyCastLTEqOnEndPartitionRange.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTInPartitionRange.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/RangePartLossyCastLTInPartitionRange.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTInPartitionRange.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/RangePartLossyCastLTInPartitionRange.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTOnEndPartitionRange.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/RangePartLossyCastLTOnEndPartitionRange.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/RangePartLossyCastLTOnEndPartitionRange.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/RangePartLossyCastLTOnEndPartitionRange.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Remove-Distinct-From-Subquery.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Remove-Distinct-From-Subquery.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/RemoveImpliedPredOnBCCPredicates.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/RemoveImpliedPredOnBCCPredicates.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/RemoveImpliedPredOnBCCPredicates.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/RemoveImpliedPredOnBCCPredicates.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/RemoveUnusedProjElements.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/RemoveUnusedProjElements.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/RemoveUnusedProjElements.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/RemoveUnusedProjElements.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/RemoveUnusedProjElementsInGbAgg.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/RemoveUnusedProjElementsInGbAgg.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/RemoveUnusedProjElementsInGbAgg.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/RemoveUnusedProjElementsInGbAgg.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedHashJoinReplicated.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedHashJoinReplicated.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ReplicatedHashJoinReplicated.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedHashJoinReplicated.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedJoinHashDistributedTable.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedJoinHashDistributedTable.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ReplicatedJoinHashDistributedTable.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedJoinHashDistributedTable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedJoinPartitionedTable.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedJoinPartitionedTable.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ReplicatedJoinPartitionedTable.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedJoinPartitionedTable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedJoinRandomDistributedTable.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedJoinRandomDistributedTable.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ReplicatedJoinRandomDistributedTable.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedJoinRandomDistributedTable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedLOJHashDistributedTable.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedLOJHashDistributedTable.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ReplicatedLOJHashDistributedTable.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedLOJHashDistributedTable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedLOJRandomDistributedTable.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedLOJRandomDistributedTable.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ReplicatedLOJRandomDistributedTable.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedLOJRandomDistributedTable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedLOJReplicated.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedLOJReplicated.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ReplicatedLOJReplicated.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedLOJReplicated.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedNLJReplicated.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedNLJReplicated.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ReplicatedNLJReplicated.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedNLJReplicated.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedTable-CTAS.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/ReplicatedTable-CTAS.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedTableAggregate.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedTableAggregate.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ReplicatedTableAggregate.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedTableAggregate.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedTableCTE.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedTableCTE.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ReplicatedTableCTE.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedTableCTE.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedTableGroupBy.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedTableGroupBy.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ReplicatedTableGroupBy.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedTableGroupBy.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedTableInClause.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedTableInClause.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ReplicatedTableInClause.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedTableInClause.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedTableInsert.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedTableInsert.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ReplicatedTableInsert.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedTableInsert.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedTableSelect.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedTableSelect.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ReplicatedTableSelect.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedTableSelect.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedTableSequenceInsert.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedTableSequenceInsert.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ReplicatedTableSequenceInsert.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedTableSequenceInsert.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ReplicatedTableWithAggNoMotion.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedTableWithAggNoMotion.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ReplicatedTableWithAggNoMotion.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ReplicatedTableWithAggNoMotion.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/RightJoinBothReplicated.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/RightJoinBothReplicated.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/RightJoinBothReplicated.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/RightJoinBothReplicated.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/RightJoinDPE.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/RightJoinDPE.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/RightJoinDPE.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/RightJoinDPE.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/RightJoinDpeWithWhereClause.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/RightJoinDpeWithWhereClause.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/RightJoinDpeWithWhereClause.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/RightJoinDpeWithWhereClause.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/RightJoinHashed.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/RightJoinHashed.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/RightJoinHashed.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/RightJoinHashed.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/RightJoinNoDPSNonDistKey.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/RightJoinNoDPSNonDistKey.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/RightJoinNoDPSNonDistKey.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/RightJoinNoDPSNonDistKey.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/RightJoinRedistribute.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/RightJoinRedistribute.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/RightJoinRedistribute.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/RightJoinRedistribute.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/RightJoinReplicated.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/RightJoinReplicated.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/RightJoinReplicated.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/RightJoinReplicated.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/RightJoinTVF.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/RightJoinTVF.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/RightJoinTVF.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/RightJoinTVF.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/RollupNoAgg.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/RollupNoAgg.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/RollupNoAgg.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/RollupNoAgg.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ScSubqueryWithOuterRef.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ScSubqueryWithOuterRef.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ScSubqueryWithOuterRef.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ScSubqueryWithOuterRef.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ScalarCorrelatedSubqueryCountStar.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ScalarCorrelatedSubqueryCountStar.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ScalarCorrelatedSubqueryCountStar.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ScalarCorrelatedSubqueryCountStar.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ScalarDQAWithNonScalarAgg.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ScalarDQAWithNonScalarAgg.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ScalarDQAWithNonScalarAgg.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ScalarDQAWithNonScalarAgg.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ScalarFuncPushedBelowGather.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ScalarFuncPushedBelowGather.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ScalarFuncPushedBelowGather.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ScalarFuncPushedBelowGather.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ScalarSubq-Eq-SubqAll-1.mdp b/gpcontrib/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/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/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/orca/gporca/data/dxl/minidump/ScalarSubq-Eq-SubqAll-2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ScalarSubqueryCountStar.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ScalarSubqueryCountStar.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ScalarSubqueryCountStar.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ScalarSubqueryCountStar.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ScalarSubqueryCountStarInJoin.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ScalarSubqueryCountStarInJoin.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ScalarSubqueryCountStarInJoin.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ScalarSubqueryCountStarInJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Select-Over-CTEAnchor.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Select-Over-CTEAnchor.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Select-Over-PartTbl.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Select-Over-PartTbl.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Select-Proj-OuterJoin.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Select-Proj-OuterJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SelectCheckConstraint.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SelectCheckConstraint.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SelectCheckConstraint.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SelectCheckConstraint.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SelectOnBpchar.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SelectOnBpchar.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SelectOnBpchar.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SelectOnBpchar.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SelectOnCastedCol.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SelectOnCastedCol.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SelectOnCastedCol.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SelectOnCastedCol.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Self-Comparison-Nullable.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Self-Comparison-Nullable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Self-Comparison.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Self-Comparison.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SelfJoinDampedPredJoinCardinality.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SelfJoinDampedPredJoinCardinality.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SelfJoinDampedPredJoinCardinality.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SelfJoinDampedPredJoinCardinality.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SelfUpdate.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SelfUpdate.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SelfUpdate.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SelfUpdate.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SemiJoin2InnerJoin.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SemiJoin2InnerJoin.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SemiJoin2InnerJoin.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SemiJoin2InnerJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SemiJoin2Select-1.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/SemiJoin2Select-1.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SemiJoin2Select-2.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/SemiJoin2Select-2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SemiJoin2Select-EnforceSubplan.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/SemiJoin2Select-EnforceSubplan.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SemiJoinDPE.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SemiJoinDPE.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SemiJoinDPE.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SemiJoinDPE.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SemiJoinWithWindowsFuncInSubquery.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SemiJoinWithWindowsFuncInSubquery.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SemiJoinWithWindowsFuncInSubquery.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SemiJoinWithWindowsFuncInSubquery.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Sequence-With-Universal-Outer.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Sequence-With-Universal-Outer.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SimpleArrayCoerceCast.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SimpleArrayCoerceCast.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SimpleArrayCoerceCast.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SimpleArrayCoerceCast.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SimplifyExistsSubquery2Limit.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SimplifyExistsSubquery2Limit.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SimplifyExistsSubquery2Limit.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SimplifyExistsSubquery2Limit.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SingleColumnHomogenousIndexOnRoot-AO.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/SingleColumnHomogenousIndexOnRoot-AO.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SingleColumnHomogenousIndexOnRoot-HEAP.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/SingleColumnHomogenousIndexOnRoot-HEAP.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SixWayDPv2.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SixWayDPv2.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SixWayDPv2.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SixWayDPv2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SortOverStreamAgg.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SortOverStreamAgg.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SortOverStreamAgg.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SortOverStreamAgg.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SpoolShouldInvalidateUnresolvedDynamicScans.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SpoolShouldInvalidateUnresolvedDynamicScans.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SpoolShouldInvalidateUnresolvedDynamicScans.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SpoolShouldInvalidateUnresolvedDynamicScans.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SqlFuncDmlScalar.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SqlFuncDmlScalar.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SqlFuncDmlScalar.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SqlFuncDmlScalar.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SqlFuncDmlTvf.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SqlFuncDmlTvf.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SqlFuncDmlTvf.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SqlFuncDmlTvf.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SqlFuncNullReject.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SqlFuncNullReject.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SqlFuncNullReject.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SqlFuncNullReject.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SqlFuncPredFactorize.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SqlFuncPredFactorize.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SqlFuncPredFactorize.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SqlFuncPredFactorize.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Stat-Derivation-Leaf-Pattern.mdp b/gpcontrib/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/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/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/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/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/orca/gporca/data/dxl/minidump/StatsFilter-AnyWithNewColStats.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Subq-JoinWithOuterRef.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Subq-JoinWithOuterRef.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Subq-NoParams.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Subq-NoParams.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Subq-On-OuterRef.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Subq-On-OuterRef.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Subq-With-OuterRefCol.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Subq-With-OuterRefCol.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Subq2CorrSQInLOJOn.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/Subq2CorrSQInLOJOn.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/Subq2CorrSQInLOJOn.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/Subq2CorrSQInLOJOn.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Subq2NotInWhereLOJ.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/Subq2NotInWhereLOJ.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/Subq2NotInWhereLOJ.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/Subq2NotInWhereLOJ.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Subq2OuterRef2InJoin.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/Subq2OuterRef2InJoin.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/Subq2OuterRef2InJoin.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/Subq2OuterRef2InJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Subq2OuterRefMultiLevelInOn.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/Subq2OuterRefMultiLevelInOn.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/Subq2OuterRefMultiLevelInOn.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/Subq2OuterRefMultiLevelInOn.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Subq2PartialDecorrelate.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/Subq2PartialDecorrelate.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/Subq2PartialDecorrelate.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/Subq2PartialDecorrelate.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SubqAll-InsideScalarExpression.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/SubqAll-InsideScalarExpression.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SubqAll-Limit1.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/SubqAll-Limit1.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SubqAll-To-ScalarSubq.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/SubqAll-To-ScalarSubq.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SubqAny-InsideScalarExpression.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/SubqAny-InsideScalarExpression.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SubqEnforceSubplan.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SubqEnforceSubplan.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SubqEnforceSubplan.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SubqEnforceSubplan.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SubqExists-With-External-Corrs.mdp b/gpcontrib/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/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/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/orca/gporca/data/dxl/minidump/SubqExists-Without-External-Corrs.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SubqInIndexPred.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SubqInIndexPred.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SubqInIndexPred.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SubqInIndexPred.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SubqOuterReferenceInClause.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SubqOuterReferenceInClause.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SubqOuterReferenceInClause.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SubqOuterReferenceInClause.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Subquery-AnyAllAggregates.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Subquery-AnyAllAggregates.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Subquery-ExistsAllAggregates.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Subquery-ExistsAllAggregates.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Subquery-ExistsAllAggregatesWithDisjuncts.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Subquery-ExistsAllAggregatesWithDisjuncts.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SubqueryInsideArrayRef.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SubqueryInsideArrayRef.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SubqueryInsideArrayRef.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SubqueryInsideArrayRef.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SubqueryInsideArrayRefIndexList.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SubqueryInsideArrayRefIndexList.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SubqueryInsideArrayRefIndexList.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SubqueryInsideArrayRefIndexList.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SubqueryInsideScalarIf.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SubqueryInsideScalarIf.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SubqueryInsideScalarIf.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SubqueryInsideScalarIf.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SubqueryNoPullUpTableValueFunction.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SubqueryNoPullUpTableValueFunction.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SubqueryNoPullUpTableValueFunction.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SubqueryNoPullUpTableValueFunction.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SubqueryNullTest.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SubqueryNullTest.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SubqueryNullTest.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SubqueryNullTest.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SubqueryOuterRefLimit.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SubqueryOuterRefLimit.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SubqueryOuterRefLimit.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SubqueryOuterRefLimit.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SubqueryOuterRefTVF.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SubqueryOuterRefTVF.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SubqueryOuterRefTVF.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SubqueryOuterRefTVF.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Switch-With-Subquery.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Switch-With-Subquery.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SystemColCtidStats.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SystemColCtidStats.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SystemColCtidStats.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SystemColCtidStats.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/SystemColSegIdStats.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/SystemColSegIdStats.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/SystemColSegIdStats.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/SystemColSegIdStats.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/TPCDS-39-InnerJoin-JoinEstimate.mdp b/gpcontrib/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/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/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/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/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/orca/gporca/data/dxl/minidump/TVF-With-Deep-Subq-Args.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/TVF.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/TVF.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/TVF.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/TVF.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/TVFAnyelement.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/TVFAnyelement.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/TVFAnyelement.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/TVFAnyelement.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/TVFCorrelatedExecution.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/TVFCorrelatedExecution.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/TVFCorrelatedExecution.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/TVFCorrelatedExecution.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/TVFGenerateSeries.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/TVFGenerateSeries.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/TVFGenerateSeries.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/TVFGenerateSeries.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/TVFRandom.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/TVFRandom.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/TVFRandom.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/TVFRandom.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/TVFVolatileJoin.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/TVFVolatileJoin.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/TVFVolatileJoin.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/TVFVolatileJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/TaintedReplicatedAgg.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/TaintedReplicatedAgg.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/TaintedReplicatedAgg.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/TaintedReplicatedAgg.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/TaintedReplicatedFilter.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/TaintedReplicatedFilter.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/TaintedReplicatedFilter.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/TaintedReplicatedFilter.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/TaintedReplicatedLimit.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/TaintedReplicatedLimit.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/TaintedReplicatedLimit.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/TaintedReplicatedLimit.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/TaintedReplicatedTablesCTE.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/TaintedReplicatedTablesCTE.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/TaintedReplicatedTablesCTE.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/TaintedReplicatedTablesCTE.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/TaintedReplicatedWindowAgg.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/TaintedReplicatedWindowAgg.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/TaintedReplicatedWindowAgg.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/TaintedReplicatedWindowAgg.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/TextMCVCardinalityEquals.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/TextMCVCardinalityEquals.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/TextMCVCardinalityEquals.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/TextMCVCardinalityEquals.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/TextMCVCardinalityGreaterThan.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/TextMCVCardinalityGreaterThan.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/TextMCVCardinalityGreaterThan.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/TextMCVCardinalityGreaterThan.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ThreeStageAgg-DistinctOnComputedCol.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/ThreeStageAgg-DistinctOnComputedCol.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ThreeStageAgg-DistinctOnDistrCol.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/ThreeStageAgg-DistinctOnDistrCol.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ThreeStageAgg-DistinctOnSameNonDistrCol.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/ThreeStageAgg-DistinctOnSameNonDistrCol.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ThreeStageAgg-GbMultipleCol-DistinctOnDistrCol.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/ThreeStageAgg-GbMultipleCol-DistinctOnDistrCol.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ThreeStageAgg-GbandDistinctOnDistrCol.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/ThreeStageAgg-GbandDistinctOnDistrCol.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ThreeStageAgg-ScalarAgg-DistinctComputedCol.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/ThreeStageAgg-ScalarAgg-DistinctComputedCol.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ThreeStageAgg-ScalarAgg-DistinctDistrCol.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/ThreeStageAgg-ScalarAgg-DistinctDistrCol.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ThreeStageAgg-ScalarAgg-DistinctNonDistrCol.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/ThreeStageAgg-ScalarAgg-DistinctNonDistrCol.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ThreeStageAgg.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ThreeStageAgg.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ThreeStageAgg.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ThreeStageAgg.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/TimeStamp-Date-HashJoin.mdp b/gpcontrib/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/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/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/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/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/orca/gporca/data/dxl/minidump/Tpcds-NonPart-Q70a.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/TranslateFilterDisjunctQuals.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/TranslateFilterDisjunctQuals.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/TranslateFilterDisjunctQuals.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/TranslateFilterDisjunctQuals.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/TranslateFilterWithCTEAndTableScanIntoFilterAndOneTimeFilter.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/TranslateFilterWithCTEAndTableScanIntoFilterAndOneTimeFilter.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/TranslateFilterWithCTEAndTableScanIntoFilterAndOneTimeFilter.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/TranslateFilterWithCTEAndTableScanIntoFilterAndOneTimeFilter.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/TranslateOneTimeFilterConjunctQuals.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/TranslateOneTimeFilterConjunctQuals.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/TranslateOneTimeFilterConjunctQuals.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/TranslateOneTimeFilterConjunctQuals.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/TypeModifierArrayRef.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/TypeModifierArrayRef.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/TypeModifierArrayRef.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/TypeModifierArrayRef.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/TypeModifierCast.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/TypeModifierCast.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/TypeModifierCast.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/TypeModifierCast.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/TypeModifierColumn.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/TypeModifierColumn.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/TypeModifierColumn.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/TypeModifierColumn.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/TypeModifierConst.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/TypeModifierConst.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/TypeModifierConst.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/TypeModifierConst.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/TypeModifierDoubleMappableConst.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/TypeModifierDoubleMappableConst.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/TypeModifierDoubleMappableConst.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/TypeModifierDoubleMappableConst.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UDA-AnyArray.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/UDA-AnyArray.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UDA-AnyElement-1.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/UDA-AnyElement-1.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UDA-AnyElement-2.mdp b/gpcontrib/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/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/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/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/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/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/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/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/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/orca/gporca/data/dxl/minidump/Union-OuterRefs-InnerChild.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Union-OuterRefs-Output.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Union-OuterRefs-Output.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Union-Over-UnionAll.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Union-Over-UnionAll.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/Union-Volatile-Func.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/Union-Volatile-Func.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UnionAll.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UnionAll.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UnionAll.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UnionAll.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UnionAllCompatibleDataType.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UnionAllCompatibleDataType.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UnionAllCompatibleDataType.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UnionAllCompatibleDataType.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UnionAllWithTruncatedOutput.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UnionAllWithTruncatedOutput.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UnionAllWithTruncatedOutput.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UnionAllWithTruncatedOutput.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UnionGbSubquery.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UnionGbSubquery.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UnionGbSubquery.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UnionGbSubquery.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UnionOfDQAQueries.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UnionOfDQAQueries.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UnionOfDQAQueries.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UnionOfDQAQueries.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UnionWithCTE.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UnionWithCTE.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UnionWithCTE.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UnionWithCTE.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UnionWithOuterRefs.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UnionWithOuterRefs.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UnionWithOuterRefs.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UnionWithOuterRefs.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UnnestSQJoins.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UnnestSQJoins.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UnnestSQJoins.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UnnestSQJoins.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UnsupportedStatsPredicate.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UnsupportedStatsPredicate.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UnsupportedStatsPredicate.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UnsupportedStatsPredicate.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UpdateCardinalityAssert.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UpdateCardinalityAssert.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UpdateCardinalityAssert.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UpdateCardinalityAssert.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UpdateCheckConstraint.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UpdateCheckConstraint.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UpdateCheckConstraint.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UpdateCheckConstraint.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UpdateDistKeyMismatchedDistribution.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UpdateDistKeyMismatchedDistribution.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UpdateDistKeyMismatchedDistribution.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UpdateDistKeyMismatchedDistribution.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UpdateDistKeyWithNestedJoin.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UpdateDistKeyWithNestedJoin.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UpdateDistKeyWithNestedJoin.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UpdateDistKeyWithNestedJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UpdateDistrKey.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UpdateDistrKey.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UpdateDistrKey.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UpdateDistrKey.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UpdateDroppedCols.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UpdateDroppedCols.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UpdateDroppedCols.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UpdateDroppedCols.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UpdateNoCardinalityAssert.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UpdateNoCardinalityAssert.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UpdateNoCardinalityAssert.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UpdateNoCardinalityAssert.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UpdateNoDistKeyMismatchedDistribution.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UpdateNoDistKeyMismatchedDistribution.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UpdateNoDistKeyMismatchedDistribution.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UpdateNoDistKeyMismatchedDistribution.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UpdateNoEnforceConstraints.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UpdateNoEnforceConstraints.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UpdateNoEnforceConstraints.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UpdateNoEnforceConstraints.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UpdateNotNullCols.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UpdateNotNullCols.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UpdateNotNullCols.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UpdateNotNullCols.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UpdatePartTable.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UpdatePartTable.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UpdatePartTable.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UpdatePartTable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UpdateRandomDistr.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UpdateRandomDistr.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UpdateRandomDistr.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UpdateRandomDistr.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UpdateUniqueConstraint-2.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/UpdateUniqueConstraint-2.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UpdateUniqueConstraint.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UpdateUniqueConstraint.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UpdateUniqueConstraint.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UpdateUniqueConstraint.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UpdateVolatileFunction.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UpdateVolatileFunction.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UpdateVolatileFunction.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UpdateVolatileFunction.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UpdateWindowGatherMerge.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UpdateWindowGatherMerge.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UpdateWindowGatherMerge.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UpdateWindowGatherMerge.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UpdateWithHashJoin.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UpdateWithHashJoin.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UpdateWithHashJoin.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UpdateWithHashJoin.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UpdateZeroRows.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UpdateZeroRows.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UpdateZeroRows.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UpdateZeroRows.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UpdatingDistributionColumn.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UpdatingDistributionColumn.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UpdatingDistributionColumn.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UpdatingDistributionColumn.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UpdatingMultipleColumn.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UpdatingMultipleColumn.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UpdatingMultipleColumn.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UpdatingMultipleColumn.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UpdatingNonDistColSameTable.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UpdatingNonDistColSameTable.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UpdatingNonDistColSameTable.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UpdatingNonDistColSameTable.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UpdatingNonDistributionColumnFunc.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UpdatingNonDistributionColumnFunc.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UpdatingNonDistributionColumnFunc.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UpdatingNonDistributionColumnFunc.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/UseDistributionSatisfactionForUniversalInnerChild.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/UseDistributionSatisfactionForUniversalInnerChild.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/UseDistributionSatisfactionForUniversalInnerChild.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/UseDistributionSatisfactionForUniversalInnerChild.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/ValueScanWithDuplicateAndSelfComparison.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/ValueScanWithDuplicateAndSelfComparison.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/ValueScanWithDuplicateAndSelfComparison.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/ValueScanWithDuplicateAndSelfComparison.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/VarcharMCVCardinalityEquals.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/VarcharMCVCardinalityEquals.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/VarcharMCVCardinalityEquals.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/VarcharMCVCardinalityEquals.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/VarcharMCVCardinalityGreaterThan.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/VarcharMCVCardinalityGreaterThan.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/VarcharMCVCardinalityGreaterThan.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/VarcharMCVCardinalityGreaterThan.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/VariadicFlagWithFormatQuery.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/VariadicFlagWithFormatQuery.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/VariadicFlagWithFormatQuery.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/VariadicFlagWithFormatQuery.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/VariadicFlagWithJson.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/VariadicFlagWithJson.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/VariadicFlagWithJson.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/VariadicFlagWithJson.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/VariadicFlagWithUnionAll.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/VariadicFlagWithUnionAll.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/VariadicFlagWithUnionAll.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/VariadicFlagWithUnionAll.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/VolatileFunctionsBelowScalarAgg.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/VolatileFunctionsBelowScalarAgg.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/VolatileFunctionsBelowScalarAgg.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/VolatileFunctionsBelowScalarAgg.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/WinFunc-Redistribute-Sort-CTE-Producer.mdp b/gpcontrib/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/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/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/orca/gporca/data/dxl/minidump/WinFunc-Simple.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/WinFuncWithSubqArgs.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/WinFuncWithSubqArgs.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/WinFuncWithSubqArgs.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/WinFuncWithSubqArgs.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/WindowFrame-SingleEdged.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/WindowFrame-SingleEdged.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/WindowFrameExcludeCurrentRow.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/WindowFrameExcludeCurrentRow.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/WindowFrameExcludeCurrentRow.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/WindowFrameExcludeCurrentRow.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/WindowFrameExcludeGroup.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/WindowFrameExcludeGroup.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/WindowFrameExcludeGroup.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/WindowFrameExcludeGroup.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/WindowFrameExcludeTies.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/WindowFrameExcludeTies.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/WindowFrameExcludeTies.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/WindowFrameExcludeTies.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/WindowFrameGroups.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/WindowFrameGroups.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/WindowFrameGroups.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/WindowFrameGroups.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/WindowFrameRangePrecedingAndFollowing.mdp b/gpcontrib/orca/gporca/data/dxl/minidump/WindowFrameRangePrecedingAndFollowing.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/minidump/WindowFrameRangePrecedingAndFollowing.mdp
rename to gpcontrib/orca/gporca/data/dxl/minidump/WindowFrameRangePrecedingAndFollowing.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/cte-duplicate-columns-1.mdp b/gpcontrib/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/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/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/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/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/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/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/orca/gporca/data/dxl/minidump/cte-duplicate-columns-4.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/retail_28.mdp b/gpcontrib/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/orca/gporca/data/dxl/minidump/retail_28.mdp
diff --git a/src/backend/gporca/data/dxl/minidump/sql/BitmapIndexScan.sql b/gpcontrib/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/orca/gporca/data/dxl/minidump/sql/BitmapIndexScan.sql
diff --git a/src/backend/gporca/data/dxl/minidump/sql/DynamicBitmapIndexScan.sql b/gpcontrib/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/orca/gporca/data/dxl/minidump/sql/DynamicBitmapIndexScan.sql
diff --git a/src/backend/gporca/data/dxl/minidump/window-count-gpdb6.mdp b/gpcontrib/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/orca/gporca/data/dxl/multilevel-partitioning/Multilevel-Nary-Join.mdp
diff --git a/src/backend/gporca/data/dxl/parse_tests/CostModelConfigCalibrated.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/CostModelConfigCalibrated.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/MDRequest.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/MDRequest.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/OptimizerConfig.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/OptimizerConfig.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/f1-MissingAttribute.xml b/gpcontrib/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/orca/gporca/data/dxl/parse_tests/f2-UnrecognizedOp.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/f3-UnexpectedTag.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/f3-UnexpectedTag.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/f4-InvalidAttrValue.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/f4-InvalidAttrValue.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/f5-UnexpectedTag.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/f5-UnexpectedTag.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/f6-UnexpectedTag.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/f6-UnexpectedTag.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/f7-UnexpectedTag.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/f7-UnexpectedTag.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/f8-UnexpectedTag.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/f8-UnexpectedTag.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/f9-UnexpectedTag.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/f9-UnexpectedTag.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q1-TS.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q1-TS.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q10-Case.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q10-Case.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q11-Limit.xml b/gpcontrib/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/orca/gporca/data/dxl/parse_tests/q19-DistinctFrom.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q2-HJ.xml b/gpcontrib/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/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/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/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/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/orca/gporca/data/dxl/parse_tests/q22-Result.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q23-MJ.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q23-MJ.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q25-AppendPartTable.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q25-AppendPartTable.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q26-Metadata.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q26-Metadata.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q28-Materialize.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q28-Materialize.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q3-HJ2.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q3-HJ2.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q30-LogicalOrderBy.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q30-LogicalOrderBy.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q31-LogicalLimit.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q31-LogicalLimit.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q32-ScalarSubquery.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q32-ScalarSubquery.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q33-ScalarSubqueryAny.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q33-ScalarSubqueryAny.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q34-SubqueryExists.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q34-SubqueryExists.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q35-ConstTable.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q35-ConstTable.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q36-Statistics.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q36-Statistics.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q37-IndexScan.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q37-IndexScan.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q39-Array.xml b/gpcontrib/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/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/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/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/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/orca/gporca/data/dxl/parse_tests/q40-SubPlan.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q41-LogicalTVF.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q41-LogicalTVF.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q41-SetOp.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q41-SetOp.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q42-TableValuedFunction.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q42-TableValuedFunction.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q43-LogicalCTE.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q43-LogicalCTE.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q44-Window.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q44-Window.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q45-WindowWithFraming.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q45-WindowWithFraming.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q46-LogicalWindow.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q46-LogicalWindow.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q47-WindowWithFraming.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q47-WindowWithFraming.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q48-IndexOnlyScan.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q48-IndexOnlyScan.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q49-Coalesce.xml b/gpcontrib/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/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/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/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/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/orca/gporca/data/dxl/parse_tests/q50-Switch.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q51-SwitchNoDefault.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q51-SwitchNoDefault.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q52-CaseTest.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q52-CaseTest.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q53-NullIf.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q53-NullIf.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q54-WindowWithNoLeadingFrameEdge.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q54-WindowWithNoLeadingFrameEdge.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q55-Insert.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q55-Insert.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q56-Delete.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q56-Delete.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q57-DMLDelete.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q57-DMLDelete.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q59-Update.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q59-Update.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q6-opexpr.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q6-opexpr.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q60-DMLUpdate.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q60-DMLUpdate.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q61-PlanWithStats.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q61-PlanWithStats.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q62-CTEPlan.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q62-CTEPlan.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q63-LogicalForeignGet.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q63-LogicalForeignGet.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q64-ExternalScan.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q64-ExternalScan.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q65-LogicalCTASHash.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q65-LogicalCTASHash.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q66-LogicalCTASRandom.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q66-LogicalCTASRandom.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q67-PhysicalCTAS.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q67-PhysicalCTAS.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q68-ArrayRef1.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q68-ArrayRef1.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q69-ArrayRef2.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q69-ArrayRef2.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q7-boolexpr.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q7-boolexpr.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q70-BitmapIndexProbe.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q70-BitmapIndexProbe.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q72-BitmapBoolOp.xml b/gpcontrib/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/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/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/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/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/orca/gporca/data/dxl/parse_tests/q74-DirectDispatchInfo.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q75-MinMax.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/q75-MinMax.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/q76-ValuesScan.xml b/gpcontrib/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/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/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/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/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/orca/gporca/data/dxl/parse_tests/q9-constval.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/s01-ConstValue.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/s01-ConstValue.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/s02-NestedFuncExpr.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/s02-NestedFuncExpr.xml
diff --git a/src/backend/gporca/data/dxl/parse_tests/sax-fail.xml b/gpcontrib/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/orca/gporca/data/dxl/parse_tests/sax-fail.xml
diff --git a/src/backend/gporca/data/dxl/query/dxl-q17.xml b/gpcontrib/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/orca/gporca/data/dxl/query/dxl-q17.xml
diff --git a/src/backend/gporca/data/dxl/query/dxl-q18.xml b/gpcontrib/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/orca/gporca/data/dxl/query/dxl-q18.xml
diff --git a/src/backend/gporca/data/dxl/query/dxl-q19.xml b/gpcontrib/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/orca/gporca/data/dxl/query/dxl-q19.xml
diff --git a/src/backend/gporca/data/dxl/query/dxl-q23.xml b/gpcontrib/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/orca/gporca/data/dxl/query/dxl-q23.xml
diff --git a/src/backend/gporca/data/dxl/search/strategy0.xml b/gpcontrib/orca/gporca/data/dxl/search/strategy0.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/search/strategy0.xml
rename to gpcontrib/orca/gporca/data/dxl/search/strategy0.xml
diff --git a/src/backend/gporca/data/dxl/search/timeout-strategy.xml b/gpcontrib/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/orca/gporca/data/dxl/search/timeout-strategy.xml
diff --git a/src/backend/gporca/data/dxl/search/wrong-strategy.xml b/gpcontrib/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/orca/gporca/data/dxl/search/wrong-strategy.xml
diff --git a/src/backend/gporca/data/dxl/statistics/ArrayCmpAny-Input-1.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/ArrayCmpAny-Input-1.xml
diff --git a/src/backend/gporca/data/dxl/statistics/ArrayCmpAny-Output-1.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/ArrayCmpAny-Output-1.xml
diff --git a/src/backend/gporca/data/dxl/statistics/Basic-Statistics-Input.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/Basic-Statistics-Input.xml
diff --git a/src/backend/gporca/data/dxl/statistics/Basic-Statistics-Output.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/Basic-Statistics-Output.xml
diff --git a/src/backend/gporca/data/dxl/statistics/Disj-Input-1.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/Disj-Input-1.xml
diff --git a/src/backend/gporca/data/dxl/statistics/Disj-Input-2.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/Disj-Input-2.xml
diff --git a/src/backend/gporca/data/dxl/statistics/Disj-Output-1.xml b/gpcontrib/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/orca/gporca/data/dxl/statistics/Join-Statistics-Output.xml
diff --git a/src/backend/gporca/data/dxl/statistics/LOJ-Input.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/LOJ-Input.xml
diff --git a/src/backend/gporca/data/dxl/statistics/LOJ-Output.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/LOJ-Output.xml
diff --git a/src/backend/gporca/data/dxl/statistics/MCV-Sort-Output.xml b/gpcontrib/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/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/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/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/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/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/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/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/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/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/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/orca/gporca/data/dxl/statistics/Merge-Output-Int.xml
diff --git a/src/backend/gporca/data/dxl/statistics/Merge-Output-Numeric.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/Merge-Output-Numeric.xml
diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Input-1.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/NestedPred-Input-1.xml
diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Input-10.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/NestedPred-Input-10.xml
diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Input-2.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/NestedPred-Input-2.xml
diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Input-3.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/NestedPred-Input-3.xml
diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Input-8.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/NestedPred-Input-8.xml
diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Input-9.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/NestedPred-Input-9.xml
diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Output-1.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/NestedPred-Output-1.xml
diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Output-10.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/NestedPred-Output-10.xml
diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Output-2.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/NestedPred-Output-2.xml
diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Output-3.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/NestedPred-Output-3.xml
diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Output-4.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/NestedPred-Output-4.xml
diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Output-5.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/NestedPred-Output-5.xml
diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Output-6.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/NestedPred-Output-6.xml
diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Output-7.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/NestedPred-Output-7.xml
diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Output-8.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/NestedPred-Output-8.xml
diff --git a/src/backend/gporca/data/dxl/statistics/NestedPred-Output-9.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/NestedPred-Output-9.xml
diff --git a/src/backend/gporca/data/dxl/statistics/Numeric-Input.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/Numeric-Input.xml
diff --git a/src/backend/gporca/data/dxl/statistics/Numeric-Input2.xml b/gpcontrib/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/orca/gporca/data/dxl/statistics/Select-Statistics-Output-Null-Constant.xml
diff --git a/src/backend/gporca/data/dxl/statistics/SelectPlan.xml b/gpcontrib/orca/gporca/data/dxl/statistics/SelectPlan.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/statistics/SelectPlan.xml
rename to gpcontrib/orca/gporca/data/dxl/statistics/SelectPlan.xml
diff --git a/src/backend/gporca/data/dxl/statistics/SelectQuery.xml b/gpcontrib/orca/gporca/data/dxl/statistics/SelectQuery.xml
similarity index 100%
rename from src/backend/gporca/data/dxl/statistics/SelectQuery.xml
rename to gpcontrib/orca/gporca/data/dxl/statistics/SelectQuery.xml
diff --git a/src/backend/gporca/data/dxl/statistics/UnionAll-Input-1.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/UnionAll-Input-1.xml
diff --git a/src/backend/gporca/data/dxl/statistics/UnionAll-Output-1.xml b/gpcontrib/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/orca/gporca/data/dxl/statistics/UnionAll-Output-1.xml
diff --git a/src/backend/gporca/data/dxl/tpch/q1-partitioned.mdp b/gpcontrib/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/orca/gporca/data/dxl/tpch/q1-partitioned.mdp
diff --git a/src/backend/gporca/data/dxl/tpch/q1.mdp b/gpcontrib/orca/gporca/data/dxl/tpch/q1.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/tpch/q1.mdp
rename to gpcontrib/orca/gporca/data/dxl/tpch/q1.mdp
diff --git a/src/backend/gporca/data/dxl/tpch/q10.mdp b/gpcontrib/orca/gporca/data/dxl/tpch/q10.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/tpch/q10.mdp
rename to gpcontrib/orca/gporca/data/dxl/tpch/q10.mdp
diff --git a/src/backend/gporca/data/dxl/tpch/q11.mdp b/gpcontrib/orca/gporca/data/dxl/tpch/q11.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/tpch/q11.mdp
rename to gpcontrib/orca/gporca/data/dxl/tpch/q11.mdp
diff --git a/src/backend/gporca/data/dxl/tpch/q12.mdp b/gpcontrib/orca/gporca/data/dxl/tpch/q12.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/tpch/q12.mdp
rename to gpcontrib/orca/gporca/data/dxl/tpch/q12.mdp
diff --git a/src/backend/gporca/data/dxl/tpch/q13.mdp b/gpcontrib/orca/gporca/data/dxl/tpch/q13.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/tpch/q13.mdp
rename to gpcontrib/orca/gporca/data/dxl/tpch/q13.mdp
diff --git a/src/backend/gporca/data/dxl/tpch/q14.mdp b/gpcontrib/orca/gporca/data/dxl/tpch/q14.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/tpch/q14.mdp
rename to gpcontrib/orca/gporca/data/dxl/tpch/q14.mdp
diff --git a/src/backend/gporca/data/dxl/tpch/q15.mdp b/gpcontrib/orca/gporca/data/dxl/tpch/q15.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/tpch/q15.mdp
rename to gpcontrib/orca/gporca/data/dxl/tpch/q15.mdp
diff --git a/src/backend/gporca/data/dxl/tpch/q16.mdp b/gpcontrib/orca/gporca/data/dxl/tpch/q16.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/tpch/q16.mdp
rename to gpcontrib/orca/gporca/data/dxl/tpch/q16.mdp
diff --git a/src/backend/gporca/data/dxl/tpch/q17.mdp b/gpcontrib/orca/gporca/data/dxl/tpch/q17.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/tpch/q17.mdp
rename to gpcontrib/orca/gporca/data/dxl/tpch/q17.mdp
diff --git a/src/backend/gporca/data/dxl/tpch/q18.mdp b/gpcontrib/orca/gporca/data/dxl/tpch/q18.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/tpch/q18.mdp
rename to gpcontrib/orca/gporca/data/dxl/tpch/q18.mdp
diff --git a/src/backend/gporca/data/dxl/tpch/q19.mdp b/gpcontrib/orca/gporca/data/dxl/tpch/q19.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/tpch/q19.mdp
rename to gpcontrib/orca/gporca/data/dxl/tpch/q19.mdp
diff --git a/src/backend/gporca/data/dxl/tpch/q2.mdp b/gpcontrib/orca/gporca/data/dxl/tpch/q2.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/tpch/q2.mdp
rename to gpcontrib/orca/gporca/data/dxl/tpch/q2.mdp
diff --git a/src/backend/gporca/data/dxl/tpch/q20.mdp b/gpcontrib/orca/gporca/data/dxl/tpch/q20.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/tpch/q20.mdp
rename to gpcontrib/orca/gporca/data/dxl/tpch/q20.mdp
diff --git a/src/backend/gporca/data/dxl/tpch/q21.mdp b/gpcontrib/orca/gporca/data/dxl/tpch/q21.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/tpch/q21.mdp
rename to gpcontrib/orca/gporca/data/dxl/tpch/q21.mdp
diff --git a/src/backend/gporca/data/dxl/tpch/q22.mdp b/gpcontrib/orca/gporca/data/dxl/tpch/q22.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/tpch/q22.mdp
rename to gpcontrib/orca/gporca/data/dxl/tpch/q22.mdp
diff --git a/src/backend/gporca/data/dxl/tpch/q3.mdp b/gpcontrib/orca/gporca/data/dxl/tpch/q3.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/tpch/q3.mdp
rename to gpcontrib/orca/gporca/data/dxl/tpch/q3.mdp
diff --git a/src/backend/gporca/data/dxl/tpch/q4.mdp b/gpcontrib/orca/gporca/data/dxl/tpch/q4.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/tpch/q4.mdp
rename to gpcontrib/orca/gporca/data/dxl/tpch/q4.mdp
diff --git a/src/backend/gporca/data/dxl/tpch/q5.mdp b/gpcontrib/orca/gporca/data/dxl/tpch/q5.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/tpch/q5.mdp
rename to gpcontrib/orca/gporca/data/dxl/tpch/q5.mdp
diff --git a/src/backend/gporca/data/dxl/tpch/q6.mdp b/gpcontrib/orca/gporca/data/dxl/tpch/q6.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/tpch/q6.mdp
rename to gpcontrib/orca/gporca/data/dxl/tpch/q6.mdp
diff --git a/src/backend/gporca/data/dxl/tpch/q7.mdp b/gpcontrib/orca/gporca/data/dxl/tpch/q7.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/tpch/q7.mdp
rename to gpcontrib/orca/gporca/data/dxl/tpch/q7.mdp
diff --git a/src/backend/gporca/data/dxl/tpch/q8.mdp b/gpcontrib/orca/gporca/data/dxl/tpch/q8.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/tpch/q8.mdp
rename to gpcontrib/orca/gporca/data/dxl/tpch/q8.mdp
diff --git a/src/backend/gporca/data/dxl/tpch/q9.mdp b/gpcontrib/orca/gporca/data/dxl/tpch/q9.mdp
similarity index 100%
rename from src/backend/gporca/data/dxl/tpch/q9.mdp
rename to gpcontrib/orca/gporca/data/dxl/tpch/q9.mdp
diff --git a/src/backend/gporca/libgpdbcost/CMakeLists.txt b/gpcontrib/orca/gporca/libgpdbcost/CMakeLists.txt
similarity index 100%
rename from src/backend/gporca/libgpdbcost/CMakeLists.txt
rename to gpcontrib/orca/gporca/libgpdbcost/CMakeLists.txt
diff --git a/src/backend/gporca/libgpdbcost/include/gpdbcost/CCostModelGPDB.h b/gpcontrib/orca/gporca/libgpdbcost/include/gpdbcost/CCostModelGPDB.h
similarity index 100%
rename from src/backend/gporca/libgpdbcost/include/gpdbcost/CCostModelGPDB.h
rename to gpcontrib/orca/gporca/libgpdbcost/include/gpdbcost/CCostModelGPDB.h
diff --git a/src/backend/gporca/libgpdbcost/include/gpdbcost/CCostModelParamsGPDB.h b/gpcontrib/orca/gporca/libgpdbcost/include/gpdbcost/CCostModelParamsGPDB.h
similarity index 100%
rename from src/backend/gporca/libgpdbcost/include/gpdbcost/CCostModelParamsGPDB.h
rename to gpcontrib/orca/gporca/libgpdbcost/include/gpdbcost/CCostModelParamsGPDB.h
diff --git a/src/backend/gporca/libgpdbcost/src/CCostModelGPDB.cpp b/gpcontrib/orca/gporca/libgpdbcost/src/CCostModelGPDB.cpp
similarity index 100%
rename from src/backend/gporca/libgpdbcost/src/CCostModelGPDB.cpp
rename to gpcontrib/orca/gporca/libgpdbcost/src/CCostModelGPDB.cpp
diff --git a/src/backend/gporca/libgpdbcost/src/CCostModelParamsGPDB.cpp b/gpcontrib/orca/gporca/libgpdbcost/src/CCostModelParamsGPDB.cpp
similarity index 100%
rename from src/backend/gporca/libgpdbcost/src/CCostModelParamsGPDB.cpp
rename to gpcontrib/orca/gporca/libgpdbcost/src/CCostModelParamsGPDB.cpp
diff --git a/src/backend/gporca/libgpdbcost/src/ICostModel.cpp b/gpcontrib/orca/gporca/libgpdbcost/src/ICostModel.cpp
similarity index 100%
rename from src/backend/gporca/libgpdbcost/src/ICostModel.cpp
rename to gpcontrib/orca/gporca/libgpdbcost/src/ICostModel.cpp
diff --git a/src/backend/gporca/libgpopt/CMakeLists.txt b/gpcontrib/orca/gporca/libgpopt/CMakeLists.txt
similarity index 100%
rename from src/backend/gporca/libgpopt/CMakeLists.txt
rename to gpcontrib/orca/gporca/libgpopt/CMakeLists.txt
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CAutoOptCtxt.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CAutoOptCtxt.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CCTEInfo.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CCTEInfo.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CCTEMap.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CCTEMap.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CCTEReq.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CCTEReq.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CCastUtils.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CCastUtils.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CColConstraintsArrayMapper.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CColConstraintsArrayMapper.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CColConstraintsHashMapper.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CColConstraintsHashMapper.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CColRef.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CColRef.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CColRefComputed.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CColRefComputed.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CColRefSet.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CColRefSet.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CColRefSetIter.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CColRefSetIter.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CColRefTable.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CColRefTable.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CColumnFactory.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CColumnFactory.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CConstraint.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CConstraint.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CConstraintConjunction.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CConstraintConjunction.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CConstraintDisjunction.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CConstraintDisjunction.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CConstraintInterval.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CConstraintInterval.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CConstraintNegation.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CConstraintNegation.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CCostContext.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CCostContext.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDatumSortedSet.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CDatumSortedSet.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDefaultComparator.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CDefaultComparator.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpec.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CDistributionSpec.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecAny.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecAny.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecHashed.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecHashed.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecHashedNoOp.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecHashedNoOp.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecNonReplicated.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecNonReplicated.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecNonSingleton.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecNonSingleton.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecRandom.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecRandom.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecReplicated.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecReplicated.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecRouted.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecRouted.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecSingleton.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecSingleton.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecStrictHashed.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecStrictHashed.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecStrictRandom.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecStrictRandom.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecStrictSingleton.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecStrictSingleton.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDistributionSpecUniversal.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CDistributionSpecUniversal.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDrvdProp.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CDrvdProp.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDrvdPropCtxt.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CDrvdPropCtxt.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDrvdPropCtxtPlan.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CDrvdPropCtxtPlan.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDrvdPropCtxtRelational.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CDrvdPropCtxtRelational.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDrvdPropPlan.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CDrvdPropPlan.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDrvdPropRelational.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CDrvdPropRelational.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CDrvdPropScalar.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CDrvdPropScalar.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CEnfdDistribution.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CEnfdDistribution.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CEnfdOrder.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CEnfdOrder.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CEnfdPartitionPropagation.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CEnfdPartitionPropagation.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CEnfdProp.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CEnfdProp.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CEnfdRewindability.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CEnfdRewindability.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CFunctionProp.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CFunctionProp.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CFunctionalDependency.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CFunctionalDependency.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CIOUtils.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CIOUtils.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CKHeap.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CKHeap.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CKeyCollection.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CKeyCollection.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CMaxCard.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CMaxCard.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/COptCtxt.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/COptCtxt.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/COptimizationContext.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/COptimizationContext.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/COrderSpec.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/COrderSpec.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CPartInfo.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CPartInfo.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CPartKeys.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CPartKeys.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CPartitionPropagationSpec.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CPartitionPropagationSpec.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CPrintPrefix.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CPrintPrefix.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CPropConstraint.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CPropConstraint.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CPropSpec.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CPropSpec.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CQueryContext.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CQueryContext.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CRange.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CRange.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CReqdProp.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CReqdProp.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CReqdPropPlan.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CReqdPropPlan.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CReqdPropRelational.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CReqdPropRelational.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CRewindabilitySpec.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CRewindabilitySpec.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CStateMachine.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CStateMachine.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CUtils.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CUtils.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CWindowFrame.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CWindowFrame.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/CWindowOids.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/CWindowOids.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/IColConstraintsMapper.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/IColConstraintsMapper.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/IComparator.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/IComparator.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/base/SPartSelectorInfo.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/base/SPartSelectorInfo.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/cost/CCost.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/cost/CCost.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/cost/ICostModel.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/cost/ICostModel.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/cost/ICostModelParams.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/cost/ICostModelParams.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/engine/CCTEConfig.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/engine/CCTEConfig.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/engine/CEngine.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/engine/CEngine.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/engine/CEnumeratorConfig.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/engine/CEnumeratorConfig.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/engine/CHint.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/engine/CHint.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/engine/CPartialPlan.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/engine/CPartialPlan.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/engine/CStatisticsConfig.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/engine/CStatisticsConfig.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/eval/CConstExprEvaluatorDXL.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/eval/CConstExprEvaluatorDXL.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/eval/CConstExprEvaluatorDefault.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/eval/CConstExprEvaluatorDefault.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/eval/IConstDXLNodeEvaluator.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/eval/IConstDXLNodeEvaluator.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/eval/IConstExprEvaluator.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/eval/IConstExprEvaluator.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/exception.h b/gpcontrib/orca/gporca/libgpopt/include/gpopt/exception.h
similarity index 100%
rename from src/backend/gporca/libgpopt/include/gpopt/exception.h
rename to gpcontrib/orca/gporca/libgpopt/include/gpopt/exception.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/hints/CHintUtils.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/hints/CHintUtils.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/hints/CJoinHint.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/hints/CJoinHint.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/hints/CPlanHint.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/hints/CPlanHint.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/hints/CRowHint.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/hints/CRowHint.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/hints/CScanHint.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/hints/CScanHint.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/hints/IHint.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/hints/IHint.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/init.h b/gpcontrib/orca/gporca/libgpopt/include/gpopt/init.h
similarity index 100%
rename from src/backend/gporca/libgpopt/include/gpopt/init.h
rename to gpcontrib/orca/gporca/libgpopt/include/gpopt/init.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/mdcache/CAutoMDAccessor.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/mdcache/CAutoMDAccessor.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/mdcache/CMDAccessor.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/mdcache/CMDAccessor.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/mdcache/CMDAccessorUtils.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/mdcache/CMDAccessorUtils.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/mdcache/CMDCache.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/mdcache/CMDCache.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/mdcache/CMDKey.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/mdcache/CMDKey.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/metadata/CColumnDescriptor.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/metadata/CColumnDescriptor.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/metadata/CIndexDescriptor.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/metadata/CIndexDescriptor.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/metadata/CName.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/metadata/CName.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/metadata/CTableDescriptor.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/metadata/CTableDescriptor.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/minidump/CDXLMinidump.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/minidump/CDXLMinidump.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/minidump/CMetadataAccessorFactory.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/minidump/CMetadataAccessorFactory.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/minidump/CMiniDumperDXL.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/minidump/CMiniDumperDXL.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/minidump/CMinidumperUtils.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/minidump/CMinidumperUtils.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/minidump/CSerializableMDAccessor.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/minidump/CSerializableMDAccessor.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/minidump/CSerializableOptimizerConfig.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/minidump/CSerializableOptimizerConfig.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/minidump/CSerializablePlan.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/minidump/CSerializablePlan.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/minidump/CSerializableQuery.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/minidump/CSerializableQuery.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/minidump/CSerializableStackTrace.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/minidump/CSerializableStackTrace.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CExpression.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CExpression.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CExpressionFactorizer.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CExpressionFactorizer.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CExpressionHandle.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CExpressionHandle.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CExpressionPreprocessor.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CExpressionPreprocessor.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CExpressionUtils.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CExpressionUtils.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CHashedDistributions.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CHashedDistributions.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CJoinOrderHintsPreprocessor.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CJoinOrderHintsPreprocessor.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLeftJoinPruningPreprocessor.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLeftJoinPruningPreprocessor.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogical.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogical.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalApply.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalApply.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalAssert.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalAssert.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalBitmapTableGet.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalBitmapTableGet.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalCTEAnchor.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalCTEAnchor.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalCTEConsumer.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalCTEConsumer.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalCTEProducer.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalCTEProducer.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalConstTableGet.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalConstTableGet.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDML.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalDML.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDelete.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalDelete.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDifference.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalDifference.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDifferenceAll.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalDifferenceAll.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicBitmapTableGet.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicBitmapTableGet.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicForeignGet.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicForeignGet.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicGet.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicGet.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicGetBase.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicGetBase.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicIndexGet.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicIndexGet.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicIndexOnlyGet.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalDynamicIndexOnlyGet.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalForeignGet.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalForeignGet.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalFullOuterJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalFullOuterJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalGbAgg.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalGbAgg.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalGbAggDeduplicate.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalGbAggDeduplicate.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalGet.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalGet.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalIndexApply.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalIndexApply.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalIndexGet.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalIndexGet.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalIndexOnlyGet.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalIndexOnlyGet.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalInnerApply.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalInnerApply.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalInnerCorrelatedApply.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalInnerCorrelatedApply.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalInnerJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalInnerJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalInsert.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalInsert.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalIntersect.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalIntersect.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalIntersectAll.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalIntersectAll.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiApply.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiApply.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiApplyNotIn.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiApplyNotIn.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiCorrelatedApply.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiCorrelatedApply.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiCorrelatedApplyNotIn.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiCorrelatedApplyNotIn.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiJoinNotIn.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftAntiSemiJoinNotIn.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftOuterApply.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftOuterApply.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftOuterCorrelatedApply.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftOuterCorrelatedApply.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftOuterJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftOuterJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiApply.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiApply.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiApplyIn.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiApplyIn.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiCorrelatedApply.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiCorrelatedApply.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiCorrelatedApplyIn.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiCorrelatedApplyIn.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalLeftSemiJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalLimit.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalLimit.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalMaxOneRow.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalMaxOneRow.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalNAryJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalNAryJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalProject.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalProject.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalRightOuterJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalRightOuterJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalSelect.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalSelect.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalSequence.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalSequence.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalSequenceProject.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalSequenceProject.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalSetOp.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalSetOp.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalSplit.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalSplit.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalTVF.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalTVF.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalUnary.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalUnary.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalUnion.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalUnion.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalUnionAll.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalUnionAll.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CLogicalUpdate.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CLogicalUpdate.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CNormalizer.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CNormalizer.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/COperator.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/COperator.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/COrderedAggPreprocessor.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/COrderedAggPreprocessor.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPattern.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPattern.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPatternLeaf.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPatternLeaf.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPatternMultiLeaf.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPatternMultiLeaf.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPatternMultiTree.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPatternMultiTree.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPatternNode.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPatternNode.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPatternTree.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPatternTree.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysical.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysical.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalAgg.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalAgg.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalAssert.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalAssert.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalBitmapTableScan.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalBitmapTableScan.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCTEConsumer.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalCTEConsumer.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCTEProducer.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalCTEProducer.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalComputeScalar.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalComputeScalar.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalConstTableGet.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalConstTableGet.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedInLeftSemiNLJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedInLeftSemiNLJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedInnerNLJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedInnerNLJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedLeftAntiSemiNLJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedLeftAntiSemiNLJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedLeftOuterNLJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedLeftOuterNLJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedLeftSemiNLJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedLeftSemiNLJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedNotInLeftAntiSemiNLJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalCorrelatedNotInLeftAntiSemiNLJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalDML.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalDML.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicBitmapTableScan.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicBitmapTableScan.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicForeignScan.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicForeignScan.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicIndexOnlyScan.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicIndexOnlyScan.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicIndexScan.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicIndexScan.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicScan.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicScan.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicTableScan.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalDynamicTableScan.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalFilter.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalFilter.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalForeignScan.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalForeignScan.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalFullHashJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalFullHashJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalFullMergeJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalFullMergeJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalHashAgg.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalHashAgg.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalHashAggDeduplicate.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalHashAggDeduplicate.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalHashJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalHashJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalIndexOnlyScan.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalIndexOnlyScan.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalIndexScan.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalIndexScan.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalInnerHashJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalInnerHashJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalInnerIndexNLJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalInnerIndexNLJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalInnerNLJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalInnerNLJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiHashJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiHashJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiHashJoinNotIn.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiHashJoinNotIn.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiNLJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiNLJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiNLJoinNotIn.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftAntiSemiNLJoinNotIn.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftOuterHashJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftOuterHashJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftOuterIndexNLJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftOuterIndexNLJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftOuterNLJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftOuterNLJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftSemiHashJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftSemiHashJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftSemiNLJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLeftSemiNLJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalLimit.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalLimit.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalMotion.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalMotion.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionBroadcast.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionBroadcast.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionGather.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionGather.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionHashDistribute.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionHashDistribute.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionRandom.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionRandom.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionRoutedDistribute.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalMotionRoutedDistribute.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalNLJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalNLJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalParallelUnionAll.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalParallelUnionAll.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalPartitionSelector.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalPartitionSelector.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalRightOuterHashJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalRightOuterHashJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalScalarAgg.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalScalarAgg.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalScan.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalScan.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalSequence.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalSequence.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalSequenceProject.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalSequenceProject.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalSerialUnionAll.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalSerialUnionAll.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalSort.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalSort.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalSplit.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalSplit.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalSpool.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalSpool.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalStreamAgg.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalStreamAgg.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalStreamAggDeduplicate.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalStreamAggDeduplicate.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalTVF.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalTVF.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalTableScan.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalTableScan.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalUnionAll.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalUnionAll.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPhysicalUnionAllFactory.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPhysicalUnionAllFactory.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CPredicateUtils.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CPredicateUtils.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalar.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalar.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarAggFunc.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarAggFunc.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarArray.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarArray.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarArrayCmp.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarArrayCmp.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarArrayCoerceExpr.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarArrayCoerceExpr.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarArrayRef.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarArrayRef.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarArrayRefIndexList.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarArrayRefIndexList.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarAssertConstraint.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarAssertConstraint.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarAssertConstraintList.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarAssertConstraintList.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarBitmapBoolOp.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarBitmapBoolOp.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarBitmapIndexProbe.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarBitmapIndexProbe.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarBoolOp.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarBoolOp.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarBooleanTest.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarBooleanTest.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarCaseTest.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarCaseTest.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarCast.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarCast.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarCmp.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarCmp.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarCoalesce.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarCoalesce.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarCoerceBase.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarCoerceBase.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarCoerceToDomain.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarCoerceToDomain.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarCoerceViaIO.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarCoerceViaIO.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarConst.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarConst.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarDMLAction.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarDMLAction.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarFieldSelect.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarFieldSelect.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarFunc.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarFunc.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarIdent.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarIdent.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarIf.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarIf.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarIsDistinctFrom.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarIsDistinctFrom.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarMinMax.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarMinMax.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarNAryJoinPredList.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarNAryJoinPredList.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarNullIf.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarNullIf.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarNullTest.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarNullTest.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarOp.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarOp.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarParam.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarParam.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarProjectElement.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarProjectElement.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarProjectList.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarProjectList.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSortGroupClause.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarSortGroupClause.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSubquery.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarSubquery.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryAll.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryAll.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryAny.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryAny.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryExistential.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryExistential.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryExists.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryExists.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryNotExists.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryNotExists.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryQuantified.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarSubqueryQuantified.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSwitch.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarSwitch.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarSwitchCase.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarSwitchCase.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarValuesList.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarValuesList.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CScalarWindowFunc.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CScalarWindowFunc.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/operators/CStrictHashedDistributions.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/operators/CStrictHashedDistributions.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/optimizer/COptimizer.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/optimizer/COptimizer.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/optimizer/COptimizerConfig.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/optimizer/COptimizerConfig.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CBinding.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/search/CBinding.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CGroup.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/search/CGroup.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CGroupExpression.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/search/CGroupExpression.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CGroupProxy.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/search/CGroupProxy.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJob.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/search/CJob.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJobFactory.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/search/CJobFactory.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJobGroup.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/search/CJobGroup.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJobGroupExploration.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/search/CJobGroupExploration.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJobGroupExpression.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/search/CJobGroupExpression.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJobGroupExpressionExploration.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/search/CJobGroupExpressionExploration.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJobGroupExpressionImplementation.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/search/CJobGroupExpressionImplementation.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJobGroupExpressionOptimization.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/search/CJobGroupExpressionOptimization.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJobGroupImplementation.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/search/CJobGroupImplementation.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJobGroupOptimization.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/search/CJobGroupOptimization.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJobQueue.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/search/CJobQueue.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJobStateMachine.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/search/CJobStateMachine.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJobTest.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/search/CJobTest.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CJobTransformation.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/search/CJobTransformation.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CMemo.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/search/CMemo.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CScheduler.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/search/CScheduler.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CSchedulerContext.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/search/CSchedulerContext.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CSearchStage.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/search/CSearchStage.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/search/CTreeMap.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/search/CTreeMap.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/translate/CTranslatorDXLToExpr.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/translate/CTranslatorDXLToExpr.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/translate/CTranslatorDXLToExprUtils.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/translate/CTranslatorDXLToExprUtils.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/translate/CTranslatorExprToDXL.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/translate/CTranslatorExprToDXL.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/translate/CTranslatorExprToDXLUtils.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/translate/CTranslatorExprToDXLUtils.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CDecorrelator.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CDecorrelator.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrder.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CJoinOrder.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrderDP.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CJoinOrderDP.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrderDPv2.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CJoinOrderDPv2.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrderGreedy.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CJoinOrderGreedy.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CJoinOrderMinCard.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CJoinOrderMinCard.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CSubqueryHandler.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CSubqueryHandler.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXform.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXform.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinAntiSemiJoinNotInSwap.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinAntiSemiJoinNotInSwap.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinAntiSemiJoinSwap.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinAntiSemiJoinSwap.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinInnerJoinSwap.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinInnerJoinSwap.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInAntiSemiJoinNotInSwap.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInAntiSemiJoinNotInSwap.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInAntiSemiJoinSwap.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInAntiSemiJoinSwap.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInInnerJoinSwap.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInInnerJoinSwap.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInSemiJoinSwap.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinNotInSemiJoinSwap.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinSemiJoinSwap.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformAntiSemiJoinSemiJoinSwap.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformApply2Join.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformApply2Join.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformCTEAnchor2Sequence.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformCTEAnchor2Sequence.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformCTEAnchor2TrivialSelect.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformCTEAnchor2TrivialSelect.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformCollapseGbAgg.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformCollapseGbAgg.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformCollapseProject.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformCollapseProject.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformContext.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformContext.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformDelete2DML.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformDelete2DML.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformDifference2LeftAntiSemiJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformDifference2LeftAntiSemiJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformDifferenceAll2LeftAntiSemiJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformDifferenceAll2LeftAntiSemiJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformDynamicForeignGet2DynamicForeignScan.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformDynamicForeignGet2DynamicForeignScan.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformDynamicGet2DynamicTableScan.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformDynamicGet2DynamicTableScan.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformDynamicIndexGet2DynamicIndexScan.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformDynamicIndexGet2DynamicIndexScan.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformDynamicIndexOnlyGet2DynamicIndexOnlyScan.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformDynamicIndexOnlyGet2DynamicIndexOnlyScan.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformEagerAgg.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformEagerAgg.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformExpandDynamicGetWithForeignPartitions.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformExpandDynamicGetWithForeignPartitions.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformExpandFullOuterJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformExpandFullOuterJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinDP.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinDP.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinDPv2.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinDPv2.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinGreedy.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinGreedy.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinMinCard.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformExpandNAryJoinMinCard.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformExploration.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformExploration.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformFactory.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformFactory.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformForeignGet2ForeignScan.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformForeignGet2ForeignScan.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformFullJoinCommutativity.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformFullJoinCommutativity.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformFullOuterJoin2HashJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformFullOuterJoin2HashJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2Apply.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2Apply.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2HashAgg.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2HashAgg.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2ScalarAgg.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2ScalarAgg.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2StreamAgg.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformGbAgg2StreamAgg.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformGbAggDedup2HashAggDedup.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformGbAggDedup2HashAggDedup.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformGbAggDedup2StreamAggDedup.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformGbAggDedup2StreamAggDedup.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformGbAggWithMDQA2Join.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformGbAggWithMDQA2Join.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformGet2TableScan.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformGet2TableScan.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementAssert.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementAssert.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementBitmapTableGet.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementBitmapTableGet.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementCTEConsumer.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementCTEConsumer.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementCTEProducer.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementCTEProducer.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementConstTableGet.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementConstTableGet.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementCorrelatedApply.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementCorrelatedApply.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementDML.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementDML.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementDynamicBitmapTableGet.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementDynamicBitmapTableGet.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementFullOuterMergeJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementFullOuterMergeJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementIndexApply.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementIndexApply.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementInnerCorrelatedApply.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementInnerCorrelatedApply.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementInnerJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementInnerJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftAntiSemiCorrelatedApply.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftAntiSemiCorrelatedApply.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftAntiSemiCorrelatedApplyNotIn.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftAntiSemiCorrelatedApplyNotIn.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftOuterCorrelatedApply.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftOuterCorrelatedApply.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftSemiCorrelatedApply.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftSemiCorrelatedApply.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftSemiCorrelatedApplyIn.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementLeftSemiCorrelatedApplyIn.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementLimit.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementLimit.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementSequence.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementSequence.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementSequenceProject.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementSequenceProject.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementSplit.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementSplit.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementTVF.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementTVF.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementTVFNoArgs.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementTVFNoArgs.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementUnionAll.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementUnionAll.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformImplementation.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformImplementation.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformIndexGet2IndexScan.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformIndexGet2IndexScan.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformIndexOnlyGet2IndexOnlyScan.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformIndexOnlyGet2IndexOnlyScan.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInlineCTEConsumer.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformInlineCTEConsumer.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInlineCTEConsumerUnderSelect.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformInlineCTEConsumerUnderSelect.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInnerApply2InnerJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformInnerApply2InnerJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInnerApply2InnerJoinNoCorrelations.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformInnerApply2InnerJoinNoCorrelations.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInnerApplyWithOuterKey2InnerJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformInnerApplyWithOuterKey2InnerJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinAntiSemiJoinNotInSwap.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinAntiSemiJoinNotInSwap.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinAntiSemiJoinSwap.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinAntiSemiJoinSwap.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinCommutativity.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinCommutativity.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinSemiJoinSwap.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformInnerJoinSemiJoinSwap.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformInsert2DML.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformInsert2DML.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformIntersect2Join.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformIntersect2Join.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformIntersectAll2LeftSemiJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformIntersectAll2LeftSemiJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformJoin2BitmapIndexGetApply.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformJoin2BitmapIndexGetApply.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformJoin2IndexApply.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformJoin2IndexApply.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformJoin2IndexApplyGeneric.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformJoin2IndexApplyGeneric.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformJoin2IndexGetApply.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformJoin2IndexGetApply.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformJoinAssociativity.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformJoinAssociativity.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformJoinSwap.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformJoinSwap.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoinNoCorrelations.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoinNoCorrelations.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotIn.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotIn.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotInNoCorrelations.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotInNoCorrelations.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoin2CrossProduct.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoin2CrossProduct.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoin2HashJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoin2HashJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoin2NLJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoin2NLJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoinNotIn2CrossProduct.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoinNotIn2CrossProduct.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoinNotIn2HashJoinNotIn.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoinNotIn2HashJoinNotIn.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoinNotIn2NLJoinNotIn.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftAntiSemiJoinNotIn2NLJoinNotIn.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftJoin2RightJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftJoin2RightJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuter2InnerUnionAllLeftAntiSemiJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuter2InnerUnionAllLeftAntiSemiJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterApply2LeftOuterJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterApply2LeftOuterJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterApply2LeftOuterJoinNoCorrelations.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterApply2LeftOuterJoinNoCorrelations.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterJoin2HashJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterJoin2HashJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterJoin2NLJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftOuterJoin2NLJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApply2LeftSemiJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApply2LeftSemiJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApply2LeftSemiJoinNoCorrelations.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApply2LeftSemiJoinNoCorrelations.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyIn2LeftSemiJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyIn2LeftSemiJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyIn2LeftSemiJoinNoCorrelations.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyIn2LeftSemiJoinNoCorrelations.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyInWithExternalCorrs2InnerJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyInWithExternalCorrs2InnerJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyWithExternalCorrs2InnerJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiApplyWithExternalCorrs2InnerJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2CrossProduct.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2CrossProduct.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2HashJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2HashJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2InnerJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2InnerJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2InnerJoinUnderGb.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2InnerJoinUnderGb.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2NLJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLeftSemiJoin2NLJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLimit2IndexGet.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLimit2IndexGet.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformLimit2IndexOnlyGet.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformLimit2IndexOnlyGet.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformMaxOneRow2Assert.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformMaxOneRow2Assert.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformMinMax2IndexGet.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformMinMax2IndexGet.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformMinMax2IndexOnlyGet.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformMinMax2IndexOnlyGet.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformProject2Apply.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformProject2Apply.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformProject2ComputeScalar.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformProject2ComputeScalar.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushDownLeftOuterJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformPushDownLeftOuterJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowSetOp.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowSetOp.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowUnion.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowUnion.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowUnionAll.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformPushGbBelowUnionAll.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushGbDedupBelowJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformPushGbDedupBelowJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushGbWithHavingBelowJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformPushGbWithHavingBelowJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushJoinBelowLeftUnionAll.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformPushJoinBelowLeftUnionAll.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushJoinBelowRightUnionAll.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformPushJoinBelowRightUnionAll.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformPushJoinBelowUnionAll.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformPushJoinBelowUnionAll.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformRemoveSubqDistinct.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformRemoveSubqDistinct.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformResult.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformResult.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformRightOuterJoin2HashJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformRightOuterJoin2HashJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSelect2Apply.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformSelect2Apply.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSelect2BitmapBoolOp.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformSelect2BitmapBoolOp.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSelect2DynamicBitmapBoolOp.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformSelect2DynamicBitmapBoolOp.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSelect2DynamicIndexGet.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformSelect2DynamicIndexGet.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSelect2DynamicIndexOnlyGet.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformSelect2DynamicIndexOnlyGet.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSelect2Filter.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformSelect2Filter.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSelect2IndexGet.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformSelect2IndexGet.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSelect2IndexOnlyGet.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformSelect2IndexOnlyGet.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinAntiSemiJoinNotInSwap.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinAntiSemiJoinNotInSwap.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinAntiSemiJoinSwap.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinAntiSemiJoinSwap.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinInnerJoinSwap.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinInnerJoinSwap.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinSemiJoinSwap.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformSemiJoinSemiJoinSwap.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSequenceProject2Apply.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformSequenceProject2Apply.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSimplifyGbAgg.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformSimplifyGbAgg.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSimplifyLeftOuterJoin.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformSimplifyLeftOuterJoin.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSimplifyProjectWithSubquery.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformSimplifyProjectWithSubquery.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSimplifySelectWithSubquery.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformSimplifySelectWithSubquery.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSimplifySubquery.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformSimplifySubquery.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSplitDQA.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformSplitDQA.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSplitGbAgg.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformSplitGbAgg.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSplitGbAggDedup.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformSplitGbAggDedup.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSplitLimit.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformSplitLimit.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSubqJoin2Apply.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformSubqJoin2Apply.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSubqNAryJoin2Apply.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformSubqNAryJoin2Apply.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformSubqueryUnnest.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformSubqueryUnnest.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformUnion2UnionAll.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformUnion2UnionAll.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformUnnestTVF.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformUnnestTVF.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformUpdate2DML.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformUpdate2DML.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/CXformUtils.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/CXformUtils.h
diff --git a/src/backend/gporca/libgpopt/include/gpopt/xforms/xforms.h b/gpcontrib/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/orca/gporca/libgpopt/include/gpopt/xforms/xforms.h
diff --git a/src/backend/gporca/libgpopt/src/base/CAutoOptCtxt.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CAutoOptCtxt.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CAutoOptCtxt.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CAutoOptCtxt.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CCTEInfo.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CCTEInfo.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CCTEInfo.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CCTEInfo.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CCTEMap.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CCTEMap.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CCTEMap.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CCTEMap.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CCTEReq.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CCTEReq.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CCTEReq.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CCTEReq.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CCastUtils.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CCastUtils.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CCastUtils.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CCastUtils.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CColConstraintsArrayMapper.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CColConstraintsArrayMapper.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CColConstraintsArrayMapper.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CColConstraintsArrayMapper.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CColConstraintsHashMapper.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CColConstraintsHashMapper.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CColConstraintsHashMapper.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CColConstraintsHashMapper.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CColRef.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CColRef.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CColRef.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CColRef.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CColRefComputed.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CColRefComputed.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CColRefComputed.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CColRefComputed.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CColRefSet.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CColRefSet.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CColRefSet.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CColRefSet.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CColRefSetIter.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CColRefSetIter.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CColRefSetIter.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CColRefSetIter.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CColRefTable.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CColRefTable.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CColRefTable.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CColRefTable.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CColumnFactory.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CColumnFactory.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CColumnFactory.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CColumnFactory.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CConstraint.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CConstraint.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CConstraint.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CConstraint.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CConstraintConjunction.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CConstraintConjunction.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CConstraintConjunction.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CConstraintConjunction.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CConstraintDisjunction.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CConstraintDisjunction.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CConstraintDisjunction.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CConstraintDisjunction.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CConstraintInterval.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CConstraintInterval.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CConstraintInterval.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CConstraintInterval.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CConstraintNegation.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CConstraintNegation.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CConstraintNegation.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CConstraintNegation.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CCostContext.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CCostContext.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CCostContext.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CCostContext.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CDatumSortedSet.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CDatumSortedSet.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CDatumSortedSet.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CDatumSortedSet.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CDefaultComparator.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CDefaultComparator.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CDefaultComparator.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CDefaultComparator.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CDistributionSpecHashed.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CDistributionSpecHashed.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CDistributionSpecHashed.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CDistributionSpecHashed.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CDistributionSpecHashedNoOp.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CDistributionSpecHashedNoOp.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CDistributionSpecHashedNoOp.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CDistributionSpecHashedNoOp.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CDistributionSpecNonSingleton.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CDistributionSpecNonSingleton.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CDistributionSpecNonSingleton.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CDistributionSpecNonSingleton.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CDistributionSpecRandom.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CDistributionSpecRandom.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CDistributionSpecRandom.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CDistributionSpecRandom.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CDistributionSpecReplicated.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CDistributionSpecReplicated.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CDistributionSpecReplicated.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CDistributionSpecReplicated.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CDistributionSpecRouted.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CDistributionSpecRouted.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CDistributionSpecRouted.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CDistributionSpecRouted.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CDistributionSpecSingleton.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CDistributionSpecSingleton.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CDistributionSpecSingleton.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CDistributionSpecSingleton.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CDistributionSpecStrictHashed.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CDistributionSpecStrictHashed.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CDistributionSpecStrictHashed.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CDistributionSpecStrictHashed.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CDistributionSpecStrictRandom.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CDistributionSpecStrictRandom.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CDistributionSpecStrictRandom.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CDistributionSpecStrictRandom.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CDistributionSpecStrictSingleton.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CDistributionSpecStrictSingleton.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CDistributionSpecStrictSingleton.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CDistributionSpecStrictSingleton.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CDistributionSpecUniversal.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CDistributionSpecUniversal.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CDistributionSpecUniversal.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CDistributionSpecUniversal.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CDrvdProp.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CDrvdProp.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CDrvdProp.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CDrvdProp.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CDrvdPropCtxt.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CDrvdPropCtxt.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CDrvdPropCtxt.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CDrvdPropCtxt.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CDrvdPropCtxtPlan.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CDrvdPropCtxtPlan.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CDrvdPropCtxtPlan.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CDrvdPropCtxtPlan.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CDrvdPropPlan.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CDrvdPropPlan.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CDrvdPropPlan.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CDrvdPropPlan.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CDrvdPropRelational.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CDrvdPropRelational.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CDrvdPropRelational.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CDrvdPropRelational.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CDrvdPropScalar.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CDrvdPropScalar.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CDrvdPropScalar.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CDrvdPropScalar.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CEnfdDistribution.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CEnfdDistribution.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CEnfdDistribution.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CEnfdDistribution.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CEnfdOrder.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CEnfdOrder.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CEnfdOrder.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CEnfdOrder.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CEnfdPartitionPropagation.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CEnfdPartitionPropagation.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CEnfdPartitionPropagation.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CEnfdPartitionPropagation.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CEnfdProp.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CEnfdProp.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CEnfdProp.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CEnfdProp.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CEnfdRewindability.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CEnfdRewindability.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CEnfdRewindability.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CEnfdRewindability.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CFunctionProp.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CFunctionProp.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CFunctionProp.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CFunctionProp.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CFunctionalDependency.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CFunctionalDependency.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CFunctionalDependency.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CFunctionalDependency.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CIOUtils.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CIOUtils.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CIOUtils.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CIOUtils.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CKeyCollection.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CKeyCollection.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CKeyCollection.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CKeyCollection.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/COptCtxt.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/COptCtxt.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/COptCtxt.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/COptCtxt.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/COptimizationContext.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/COptimizationContext.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/COptimizationContext.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/COptimizationContext.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/COrderSpec.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/COrderSpec.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/COrderSpec.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/COrderSpec.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CPartInfo.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CPartInfo.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CPartInfo.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CPartInfo.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CPartKeys.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CPartKeys.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CPartKeys.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CPartKeys.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CPartitionPropagationSpec.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CPartitionPropagationSpec.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CPartitionPropagationSpec.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CPartitionPropagationSpec.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CPrintPrefix.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CPrintPrefix.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CPrintPrefix.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CPrintPrefix.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CPropConstraint.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CPropConstraint.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CPropConstraint.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CPropConstraint.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CQueryContext.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CQueryContext.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CQueryContext.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CQueryContext.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CRange.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CRange.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CRange.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CRange.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CReqdProp.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CReqdProp.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CReqdProp.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CReqdProp.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CReqdPropPlan.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CReqdPropPlan.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CReqdPropPlan.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CReqdPropPlan.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CReqdPropRelational.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CReqdPropRelational.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CReqdPropRelational.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CReqdPropRelational.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CRewindabilitySpec.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CRewindabilitySpec.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CRewindabilitySpec.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CRewindabilitySpec.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CUtils.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CUtils.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CUtils.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CUtils.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CWindowFrame.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CWindowFrame.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CWindowFrame.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CWindowFrame.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/CWindowOids.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/CWindowOids.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/CWindowOids.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/CWindowOids.cpp
diff --git a/src/backend/gporca/libgpopt/src/base/IColConstraintsMapper.cpp b/gpcontrib/orca/gporca/libgpopt/src/base/IColConstraintsMapper.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/base/IColConstraintsMapper.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/base/IColConstraintsMapper.cpp
diff --git a/src/backend/gporca/libgpopt/src/engine/CEngine.cpp b/gpcontrib/orca/gporca/libgpopt/src/engine/CEngine.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/engine/CEngine.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/engine/CEngine.cpp
diff --git a/src/backend/gporca/libgpopt/src/engine/CEnumeratorConfig.cpp b/gpcontrib/orca/gporca/libgpopt/src/engine/CEnumeratorConfig.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/engine/CEnumeratorConfig.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/engine/CEnumeratorConfig.cpp
diff --git a/src/backend/gporca/libgpopt/src/engine/CPartialPlan.cpp b/gpcontrib/orca/gporca/libgpopt/src/engine/CPartialPlan.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/engine/CPartialPlan.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/engine/CPartialPlan.cpp
diff --git a/src/backend/gporca/libgpopt/src/engine/CStatisticsConfig.cpp b/gpcontrib/orca/gporca/libgpopt/src/engine/CStatisticsConfig.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/engine/CStatisticsConfig.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/engine/CStatisticsConfig.cpp
diff --git a/src/backend/gporca/libgpopt/src/eval/CConstExprEvaluatorDXL.cpp b/gpcontrib/orca/gporca/libgpopt/src/eval/CConstExprEvaluatorDXL.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/eval/CConstExprEvaluatorDXL.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/eval/CConstExprEvaluatorDXL.cpp
diff --git a/src/backend/gporca/libgpopt/src/eval/CConstExprEvaluatorDefault.cpp b/gpcontrib/orca/gporca/libgpopt/src/eval/CConstExprEvaluatorDefault.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/eval/CConstExprEvaluatorDefault.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/eval/CConstExprEvaluatorDefault.cpp
diff --git a/src/backend/gporca/libgpopt/src/exception.cpp b/gpcontrib/orca/gporca/libgpopt/src/exception.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/exception.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/exception.cpp
diff --git a/src/backend/gporca/libgpopt/src/hints/CHintUtils.cpp b/gpcontrib/orca/gporca/libgpopt/src/hints/CHintUtils.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/hints/CHintUtils.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/hints/CHintUtils.cpp
diff --git a/src/backend/gporca/libgpopt/src/hints/CJoinHint.cpp b/gpcontrib/orca/gporca/libgpopt/src/hints/CJoinHint.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/hints/CJoinHint.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/hints/CJoinHint.cpp
diff --git a/src/backend/gporca/libgpopt/src/hints/CPlanHint.cpp b/gpcontrib/orca/gporca/libgpopt/src/hints/CPlanHint.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/hints/CPlanHint.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/hints/CPlanHint.cpp
diff --git a/src/backend/gporca/libgpopt/src/hints/CRowHint.cpp b/gpcontrib/orca/gporca/libgpopt/src/hints/CRowHint.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/hints/CRowHint.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/hints/CRowHint.cpp
diff --git a/src/backend/gporca/libgpopt/src/hints/CScanHint.cpp b/gpcontrib/orca/gporca/libgpopt/src/hints/CScanHint.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/hints/CScanHint.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/hints/CScanHint.cpp
diff --git a/src/backend/gporca/libgpopt/src/hints/README b/gpcontrib/orca/gporca/libgpopt/src/hints/README
similarity index 100%
rename from src/backend/gporca/libgpopt/src/hints/README
rename to gpcontrib/orca/gporca/libgpopt/src/hints/README
diff --git a/src/backend/gporca/libgpopt/src/init.cpp b/gpcontrib/orca/gporca/libgpopt/src/init.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/init.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/init.cpp
diff --git a/src/backend/gporca/libgpopt/src/mdcache/CMDAccessor.cpp b/gpcontrib/orca/gporca/libgpopt/src/mdcache/CMDAccessor.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/mdcache/CMDAccessor.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/mdcache/CMDAccessor.cpp
diff --git a/src/backend/gporca/libgpopt/src/mdcache/CMDAccessorUtils.cpp b/gpcontrib/orca/gporca/libgpopt/src/mdcache/CMDAccessorUtils.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/mdcache/CMDAccessorUtils.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/mdcache/CMDAccessorUtils.cpp
diff --git a/src/backend/gporca/libgpopt/src/mdcache/CMDCache.cpp b/gpcontrib/orca/gporca/libgpopt/src/mdcache/CMDCache.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/mdcache/CMDCache.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/mdcache/CMDCache.cpp
diff --git a/src/backend/gporca/libgpopt/src/mdcache/CMDKey.cpp b/gpcontrib/orca/gporca/libgpopt/src/mdcache/CMDKey.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/mdcache/CMDKey.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/mdcache/CMDKey.cpp
diff --git a/src/backend/gporca/libgpopt/src/metadata/CColumnDescriptor.cpp b/gpcontrib/orca/gporca/libgpopt/src/metadata/CColumnDescriptor.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/metadata/CColumnDescriptor.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/metadata/CColumnDescriptor.cpp
diff --git a/src/backend/gporca/libgpopt/src/metadata/CIndexDescriptor.cpp b/gpcontrib/orca/gporca/libgpopt/src/metadata/CIndexDescriptor.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/metadata/CIndexDescriptor.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/metadata/CIndexDescriptor.cpp
diff --git a/src/backend/gporca/libgpopt/src/metadata/CName.cpp b/gpcontrib/orca/gporca/libgpopt/src/metadata/CName.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/metadata/CName.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/metadata/CName.cpp
diff --git a/src/backend/gporca/libgpopt/src/metadata/CTableDescriptor.cpp b/gpcontrib/orca/gporca/libgpopt/src/metadata/CTableDescriptor.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/metadata/CTableDescriptor.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/metadata/CTableDescriptor.cpp
diff --git a/src/backend/gporca/libgpopt/src/minidump/CDXLMinidump.cpp b/gpcontrib/orca/gporca/libgpopt/src/minidump/CDXLMinidump.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/minidump/CDXLMinidump.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/minidump/CDXLMinidump.cpp
diff --git a/src/backend/gporca/libgpopt/src/minidump/CMetadataAccessorFactory.cpp b/gpcontrib/orca/gporca/libgpopt/src/minidump/CMetadataAccessorFactory.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/minidump/CMetadataAccessorFactory.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/minidump/CMetadataAccessorFactory.cpp
diff --git a/src/backend/gporca/libgpopt/src/minidump/CMiniDumperDXL.cpp b/gpcontrib/orca/gporca/libgpopt/src/minidump/CMiniDumperDXL.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/minidump/CMiniDumperDXL.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/minidump/CMiniDumperDXL.cpp
diff --git a/src/backend/gporca/libgpopt/src/minidump/CMinidumperUtils.cpp b/gpcontrib/orca/gporca/libgpopt/src/minidump/CMinidumperUtils.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/minidump/CMinidumperUtils.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/minidump/CMinidumperUtils.cpp
diff --git a/src/backend/gporca/libgpopt/src/minidump/CSerializableMDAccessor.cpp b/gpcontrib/orca/gporca/libgpopt/src/minidump/CSerializableMDAccessor.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/minidump/CSerializableMDAccessor.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/minidump/CSerializableMDAccessor.cpp
diff --git a/src/backend/gporca/libgpopt/src/minidump/CSerializableOptimizerConfig.cpp b/gpcontrib/orca/gporca/libgpopt/src/minidump/CSerializableOptimizerConfig.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/minidump/CSerializableOptimizerConfig.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/minidump/CSerializableOptimizerConfig.cpp
diff --git a/src/backend/gporca/libgpopt/src/minidump/CSerializablePlan.cpp b/gpcontrib/orca/gporca/libgpopt/src/minidump/CSerializablePlan.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/minidump/CSerializablePlan.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/minidump/CSerializablePlan.cpp
diff --git a/src/backend/gporca/libgpopt/src/minidump/CSerializableQuery.cpp b/gpcontrib/orca/gporca/libgpopt/src/minidump/CSerializableQuery.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/minidump/CSerializableQuery.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/minidump/CSerializableQuery.cpp
diff --git a/src/backend/gporca/libgpopt/src/minidump/CSerializableStackTrace.cpp b/gpcontrib/orca/gporca/libgpopt/src/minidump/CSerializableStackTrace.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/minidump/CSerializableStackTrace.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/minidump/CSerializableStackTrace.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CExpression.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CExpression.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CExpression.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CExpression.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CExpressionFactorizer.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CExpressionFactorizer.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CExpressionFactorizer.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CExpressionFactorizer.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CExpressionHandle.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CExpressionHandle.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CExpressionHandle.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CExpressionHandle.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CExpressionPreprocessor.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CExpressionPreprocessor.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CExpressionPreprocessor.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CExpressionPreprocessor.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CExpressionUtils.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CExpressionUtils.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CExpressionUtils.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CExpressionUtils.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CHashedDistributions.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CHashedDistributions.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CHashedDistributions.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CHashedDistributions.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CJoinOrderHintsPreprocessor.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CJoinOrderHintsPreprocessor.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CJoinOrderHintsPreprocessor.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CJoinOrderHintsPreprocessor.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLeftJoinPruningPreprocessor.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLeftJoinPruningPreprocessor.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLeftJoinPruningPreprocessor.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLeftJoinPruningPreprocessor.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogical.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogical.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogical.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogical.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalApply.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalApply.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalApply.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalApply.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalAssert.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalAssert.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalAssert.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalAssert.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalBitmapTableGet.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalBitmapTableGet.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalBitmapTableGet.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalBitmapTableGet.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalCTEAnchor.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalCTEAnchor.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalCTEAnchor.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalCTEAnchor.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalCTEConsumer.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalCTEConsumer.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalCTEConsumer.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalCTEConsumer.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalCTEProducer.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalCTEProducer.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalCTEProducer.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalCTEProducer.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalConstTableGet.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalConstTableGet.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalConstTableGet.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalConstTableGet.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalDML.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalDML.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalDML.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalDML.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalDelete.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalDelete.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalDelete.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalDelete.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalDifference.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalDifference.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalDifference.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalDifference.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalDifferenceAll.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalDifferenceAll.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalDifferenceAll.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalDifferenceAll.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalDynamicBitmapTableGet.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalDynamicBitmapTableGet.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalDynamicBitmapTableGet.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalDynamicBitmapTableGet.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalDynamicForeignGet.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalDynamicForeignGet.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalDynamicForeignGet.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalDynamicForeignGet.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalDynamicGet.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalDynamicGet.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalDynamicGet.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalDynamicGet.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalDynamicGetBase.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalDynamicGetBase.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalDynamicGetBase.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalDynamicGetBase.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalDynamicIndexGet.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalDynamicIndexGet.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalDynamicIndexGet.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalDynamicIndexGet.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalForeignGet.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalForeignGet.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalForeignGet.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalForeignGet.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalFullOuterJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalFullOuterJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalFullOuterJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalFullOuterJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalGbAgg.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalGbAgg.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalGbAgg.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalGbAgg.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalGbAggDeduplicate.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalGbAggDeduplicate.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalGbAggDeduplicate.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalGbAggDeduplicate.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalGet.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalGet.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalGet.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalGet.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalIndexApply.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalIndexApply.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalIndexApply.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalIndexApply.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalIndexGet.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalIndexGet.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalIndexGet.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalIndexGet.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalInnerApply.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalInnerApply.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalInnerApply.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalInnerApply.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalInnerCorrelatedApply.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalInnerCorrelatedApply.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalInnerCorrelatedApply.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalInnerCorrelatedApply.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalInnerJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalInnerJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalInnerJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalInnerJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalInsert.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalInsert.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalInsert.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalInsert.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalIntersect.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalIntersect.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalIntersect.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalIntersect.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalIntersectAll.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalIntersectAll.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalIntersectAll.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalIntersectAll.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiApply.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiApply.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiApply.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiApply.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiApplyNotIn.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiApplyNotIn.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiApplyNotIn.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiApplyNotIn.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiCorrelatedApply.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiCorrelatedApply.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiCorrelatedApply.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiCorrelatedApply.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiCorrelatedApplyNotIn.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiCorrelatedApplyNotIn.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiCorrelatedApplyNotIn.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiCorrelatedApplyNotIn.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiJoinNotIn.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiJoinNotIn.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiJoinNotIn.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftAntiSemiJoinNotIn.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftOuterApply.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftOuterApply.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftOuterApply.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftOuterApply.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftOuterCorrelatedApply.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftOuterCorrelatedApply.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftOuterCorrelatedApply.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftOuterCorrelatedApply.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftOuterJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftOuterJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftOuterJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftOuterJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftSemiApply.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftSemiApply.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftSemiApply.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftSemiApply.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftSemiApplyIn.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftSemiApplyIn.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftSemiApplyIn.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftSemiApplyIn.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftSemiCorrelatedApply.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftSemiCorrelatedApply.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftSemiCorrelatedApply.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftSemiCorrelatedApply.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftSemiCorrelatedApplyIn.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftSemiCorrelatedApplyIn.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftSemiCorrelatedApplyIn.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftSemiCorrelatedApplyIn.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLeftSemiJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftSemiJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalLeftSemiJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLeftSemiJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalLimit.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLimit.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalLimit.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalLimit.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalMaxOneRow.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalMaxOneRow.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalMaxOneRow.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalMaxOneRow.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalNAryJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalNAryJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalNAryJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalNAryJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalProject.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalProject.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalProject.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalProject.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalRightOuterJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalRightOuterJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalRightOuterJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalRightOuterJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalSelect.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalSelect.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalSelect.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalSelect.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalSequence.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalSequence.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalSequence.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalSequence.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalSequenceProject.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalSequenceProject.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalSequenceProject.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalSequenceProject.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalSetOp.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalSetOp.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalSetOp.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalSetOp.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalSplit.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalSplit.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalSplit.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalSplit.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalTVF.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalTVF.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalTVF.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalTVF.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalUnary.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalUnary.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalUnary.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalUnary.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalUnion.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalUnion.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalUnion.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalUnion.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalUnionAll.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalUnionAll.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalUnionAll.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalUnionAll.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CLogicalUpdate.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalUpdate.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CLogicalUpdate.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CLogicalUpdate.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CNormalizer.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CNormalizer.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CNormalizer.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CNormalizer.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/COperator.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/COperator.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/COperator.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/COperator.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/COrderedAggPreprocessor.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/COrderedAggPreprocessor.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/COrderedAggPreprocessor.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/COrderedAggPreprocessor.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPattern.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPattern.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPattern.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPattern.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysical.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysical.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysical.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysical.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalAgg.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalAgg.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalAgg.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalAgg.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalAssert.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalAssert.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalAssert.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalAssert.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalBitmapTableScan.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalBitmapTableScan.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalBitmapTableScan.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalBitmapTableScan.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalCTEConsumer.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalCTEConsumer.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalCTEConsumer.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalCTEConsumer.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalCTEProducer.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalCTEProducer.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalCTEProducer.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalCTEProducer.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalComputeScalar.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalComputeScalar.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalComputeScalar.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalComputeScalar.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalConstTableGet.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalConstTableGet.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalConstTableGet.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalConstTableGet.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalDML.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalDML.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalDML.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalDML.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicBitmapTableScan.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalDynamicBitmapTableScan.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicBitmapTableScan.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalDynamicBitmapTableScan.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicForeignScan.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalDynamicForeignScan.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicForeignScan.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalDynamicForeignScan.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicIndexOnlyScan.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalDynamicIndexOnlyScan.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicIndexOnlyScan.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalDynamicIndexOnlyScan.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicIndexScan.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalDynamicIndexScan.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicIndexScan.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalDynamicIndexScan.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicScan.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalDynamicScan.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicScan.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalDynamicScan.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicTableScan.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalDynamicTableScan.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalDynamicTableScan.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalDynamicTableScan.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalFilter.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalFilter.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalFilter.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalFilter.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalForeignScan.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalForeignScan.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalForeignScan.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalForeignScan.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalFullHashJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalFullHashJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalFullHashJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalFullHashJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalFullMergeJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalFullMergeJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalFullMergeJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalFullMergeJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalHashAgg.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalHashAgg.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalHashAgg.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalHashAgg.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalHashAggDeduplicate.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalHashAggDeduplicate.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalHashAggDeduplicate.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalHashAggDeduplicate.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalHashJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalHashJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalHashJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalHashJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalIndexOnlyScan.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalIndexOnlyScan.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalIndexOnlyScan.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalIndexOnlyScan.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalIndexScan.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalIndexScan.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalIndexScan.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalIndexScan.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalInnerHashJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalInnerHashJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalInnerHashJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalInnerHashJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalInnerIndexNLJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalInnerIndexNLJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalInnerIndexNLJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalInnerIndexNLJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalInnerNLJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalInnerNLJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalInnerNLJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalInnerNLJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiHashJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiHashJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiHashJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiHashJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiHashJoinNotIn.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiHashJoinNotIn.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiHashJoinNotIn.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiHashJoinNotIn.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiNLJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiNLJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiNLJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalLeftAntiSemiNLJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalLeftOuterHashJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalLeftOuterHashJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalLeftOuterHashJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalLeftOuterHashJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalLeftOuterIndexNLJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalLeftOuterIndexNLJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalLeftOuterIndexNLJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalLeftOuterIndexNLJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalLeftOuterNLJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalLeftOuterNLJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalLeftOuterNLJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalLeftOuterNLJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalLeftSemiHashJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalLeftSemiHashJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalLeftSemiHashJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalLeftSemiHashJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalLeftSemiNLJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalLeftSemiNLJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalLeftSemiNLJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalLeftSemiNLJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalLimit.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalLimit.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalLimit.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalLimit.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalMotion.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalMotion.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalMotion.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalMotion.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalMotionBroadcast.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalMotionBroadcast.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalMotionBroadcast.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalMotionBroadcast.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalMotionGather.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalMotionGather.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalMotionGather.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalMotionGather.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalMotionHashDistribute.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalMotionHashDistribute.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalMotionHashDistribute.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalMotionHashDistribute.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalMotionRandom.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalMotionRandom.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalMotionRandom.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalMotionRandom.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalMotionRoutedDistribute.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalMotionRoutedDistribute.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalMotionRoutedDistribute.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalMotionRoutedDistribute.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalNLJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalNLJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalNLJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalNLJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalParallelUnionAll.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalParallelUnionAll.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalParallelUnionAll.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalParallelUnionAll.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalPartitionSelector.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalPartitionSelector.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalPartitionSelector.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalPartitionSelector.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalRightOuterHashJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalRightOuterHashJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalRightOuterHashJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalRightOuterHashJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalScalarAgg.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalScalarAgg.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalScalarAgg.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalScalarAgg.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalScan.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalScan.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalScan.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalScan.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalSequence.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalSequence.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalSequence.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalSequence.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalSequenceProject.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalSequenceProject.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalSequenceProject.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalSequenceProject.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalSerialUnionAll.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalSerialUnionAll.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalSerialUnionAll.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalSerialUnionAll.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalSort.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalSort.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalSort.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalSort.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalSplit.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalSplit.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalSplit.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalSplit.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalSpool.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalSpool.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalSpool.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalSpool.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalStreamAgg.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalStreamAgg.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalStreamAgg.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalStreamAgg.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalStreamAggDeduplicate.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalStreamAggDeduplicate.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalStreamAggDeduplicate.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalStreamAggDeduplicate.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalTVF.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalTVF.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalTVF.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalTVF.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalTableScan.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalTableScan.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalTableScan.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalTableScan.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalUnionAll.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalUnionAll.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalUnionAll.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalUnionAll.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPhysicalUnionAllFactory.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalUnionAllFactory.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPhysicalUnionAllFactory.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPhysicalUnionAllFactory.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CPredicateUtils.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CPredicateUtils.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CPredicateUtils.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CPredicateUtils.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalar.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalar.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalar.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalar.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarAggFunc.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarAggFunc.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarAggFunc.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarAggFunc.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarArray.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarArray.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarArray.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarArray.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarArrayCmp.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarArrayCmp.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarArrayCmp.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarArrayCmp.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarArrayCoerceExpr.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarArrayCoerceExpr.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarArrayCoerceExpr.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarArrayCoerceExpr.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarArrayRef.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarArrayRef.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarArrayRef.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarArrayRef.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarArrayRefIndexList.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarArrayRefIndexList.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarArrayRefIndexList.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarArrayRefIndexList.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarAssertConstraint.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarAssertConstraint.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarAssertConstraint.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarAssertConstraint.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarAssertConstraintList.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarAssertConstraintList.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarAssertConstraintList.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarAssertConstraintList.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarBitmapBoolOp.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarBitmapBoolOp.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarBitmapBoolOp.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarBitmapBoolOp.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarBitmapIndexProbe.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarBitmapIndexProbe.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarBitmapIndexProbe.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarBitmapIndexProbe.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarBoolOp.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarBoolOp.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarBoolOp.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarBoolOp.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarBooleanTest.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarBooleanTest.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarBooleanTest.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarBooleanTest.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarCaseTest.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarCaseTest.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarCaseTest.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarCaseTest.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarCast.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarCast.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarCast.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarCast.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarCmp.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarCmp.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarCmp.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarCmp.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarCoalesce.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarCoalesce.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarCoalesce.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarCoalesce.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarCoerceBase.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarCoerceBase.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarCoerceBase.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarCoerceBase.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarCoerceToDomain.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarCoerceToDomain.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarCoerceToDomain.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarCoerceToDomain.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarCoerceViaIO.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarCoerceViaIO.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarCoerceViaIO.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarCoerceViaIO.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarConst.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarConst.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarConst.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarConst.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarDMLAction.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarDMLAction.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarDMLAction.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarDMLAction.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarFieldSelect.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarFieldSelect.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarFieldSelect.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarFieldSelect.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarFunc.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarFunc.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarFunc.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarFunc.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarIdent.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarIdent.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarIdent.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarIdent.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarIf.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarIf.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarIf.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarIf.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarIsDistinctFrom.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarIsDistinctFrom.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarIsDistinctFrom.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarIsDistinctFrom.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarMinMax.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarMinMax.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarMinMax.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarMinMax.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarNAryJoinPredList.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarNAryJoinPredList.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarNAryJoinPredList.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarNAryJoinPredList.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarNullIf.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarNullIf.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarNullIf.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarNullIf.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarNullTest.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarNullTest.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarNullTest.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarNullTest.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarOp.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarOp.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarOp.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarOp.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarParam.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarParam.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarParam.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarParam.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarProjectElement.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarProjectElement.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarProjectElement.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarProjectElement.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarProjectList.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarProjectList.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarProjectList.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarProjectList.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarSortGroupClause.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarSortGroupClause.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarSortGroupClause.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarSortGroupClause.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarSubquery.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarSubquery.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarSubquery.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarSubquery.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarSubqueryAll.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarSubqueryAll.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarSubqueryAll.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarSubqueryAll.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarSubqueryAny.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarSubqueryAny.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarSubqueryAny.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarSubqueryAny.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarSubqueryExistential.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarSubqueryExistential.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarSubqueryExistential.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarSubqueryExistential.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarSubqueryQuantified.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarSubqueryQuantified.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarSubqueryQuantified.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarSubqueryQuantified.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarSwitch.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarSwitch.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarSwitch.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarSwitch.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarSwitchCase.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarSwitchCase.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarSwitchCase.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarSwitchCase.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarValuesList.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarValuesList.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarValuesList.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarValuesList.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CScalarWindowFunc.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CScalarWindowFunc.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CScalarWindowFunc.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CScalarWindowFunc.cpp
diff --git a/src/backend/gporca/libgpopt/src/operators/CStrictHashedDistributions.cpp b/gpcontrib/orca/gporca/libgpopt/src/operators/CStrictHashedDistributions.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/operators/CStrictHashedDistributions.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/operators/CStrictHashedDistributions.cpp
diff --git a/src/backend/gporca/libgpopt/src/optimizer/COptimizer.cpp b/gpcontrib/orca/gporca/libgpopt/src/optimizer/COptimizer.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/optimizer/COptimizer.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/optimizer/COptimizer.cpp
diff --git a/src/backend/gporca/libgpopt/src/optimizer/COptimizerConfig.cpp b/gpcontrib/orca/gporca/libgpopt/src/optimizer/COptimizerConfig.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/optimizer/COptimizerConfig.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/optimizer/COptimizerConfig.cpp
diff --git a/src/backend/gporca/libgpopt/src/search/CBinding.cpp b/gpcontrib/orca/gporca/libgpopt/src/search/CBinding.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/search/CBinding.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/search/CBinding.cpp
diff --git a/src/backend/gporca/libgpopt/src/search/CGroup.cpp b/gpcontrib/orca/gporca/libgpopt/src/search/CGroup.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/search/CGroup.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/search/CGroup.cpp
diff --git a/src/backend/gporca/libgpopt/src/search/CGroupExpression.cpp b/gpcontrib/orca/gporca/libgpopt/src/search/CGroupExpression.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/search/CGroupExpression.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/search/CGroupExpression.cpp
diff --git a/src/backend/gporca/libgpopt/src/search/CGroupProxy.cpp b/gpcontrib/orca/gporca/libgpopt/src/search/CGroupProxy.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/search/CGroupProxy.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/search/CGroupProxy.cpp
diff --git a/src/backend/gporca/libgpopt/src/search/CJob.cpp b/gpcontrib/orca/gporca/libgpopt/src/search/CJob.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/search/CJob.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/search/CJob.cpp
diff --git a/src/backend/gporca/libgpopt/src/search/CJobFactory.cpp b/gpcontrib/orca/gporca/libgpopt/src/search/CJobFactory.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/search/CJobFactory.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/search/CJobFactory.cpp
diff --git a/src/backend/gporca/libgpopt/src/search/CJobGroup.cpp b/gpcontrib/orca/gporca/libgpopt/src/search/CJobGroup.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/search/CJobGroup.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/search/CJobGroup.cpp
diff --git a/src/backend/gporca/libgpopt/src/search/CJobGroupExploration.cpp b/gpcontrib/orca/gporca/libgpopt/src/search/CJobGroupExploration.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/search/CJobGroupExploration.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/search/CJobGroupExploration.cpp
diff --git a/src/backend/gporca/libgpopt/src/search/CJobGroupExpression.cpp b/gpcontrib/orca/gporca/libgpopt/src/search/CJobGroupExpression.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/search/CJobGroupExpression.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/search/CJobGroupExpression.cpp
diff --git a/src/backend/gporca/libgpopt/src/search/CJobGroupExpressionExploration.cpp b/gpcontrib/orca/gporca/libgpopt/src/search/CJobGroupExpressionExploration.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/search/CJobGroupExpressionExploration.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/search/CJobGroupExpressionExploration.cpp
diff --git a/src/backend/gporca/libgpopt/src/search/CJobGroupExpressionImplementation.cpp b/gpcontrib/orca/gporca/libgpopt/src/search/CJobGroupExpressionImplementation.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/search/CJobGroupExpressionImplementation.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/search/CJobGroupExpressionImplementation.cpp
diff --git a/src/backend/gporca/libgpopt/src/search/CJobGroupExpressionOptimization.cpp b/gpcontrib/orca/gporca/libgpopt/src/search/CJobGroupExpressionOptimization.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/search/CJobGroupExpressionOptimization.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/search/CJobGroupExpressionOptimization.cpp
diff --git a/src/backend/gporca/libgpopt/src/search/CJobGroupImplementation.cpp b/gpcontrib/orca/gporca/libgpopt/src/search/CJobGroupImplementation.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/search/CJobGroupImplementation.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/search/CJobGroupImplementation.cpp
diff --git a/src/backend/gporca/libgpopt/src/search/CJobGroupOptimization.cpp b/gpcontrib/orca/gporca/libgpopt/src/search/CJobGroupOptimization.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/search/CJobGroupOptimization.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/search/CJobGroupOptimization.cpp
diff --git a/src/backend/gporca/libgpopt/src/search/CJobQueue.cpp b/gpcontrib/orca/gporca/libgpopt/src/search/CJobQueue.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/search/CJobQueue.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/search/CJobQueue.cpp
diff --git a/src/backend/gporca/libgpopt/src/search/CJobTest.cpp b/gpcontrib/orca/gporca/libgpopt/src/search/CJobTest.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/search/CJobTest.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/search/CJobTest.cpp
diff --git a/src/backend/gporca/libgpopt/src/search/CJobTransformation.cpp b/gpcontrib/orca/gporca/libgpopt/src/search/CJobTransformation.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/search/CJobTransformation.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/search/CJobTransformation.cpp
diff --git a/src/backend/gporca/libgpopt/src/search/CMemo.cpp b/gpcontrib/orca/gporca/libgpopt/src/search/CMemo.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/search/CMemo.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/search/CMemo.cpp
diff --git a/src/backend/gporca/libgpopt/src/search/CScheduler.cpp b/gpcontrib/orca/gporca/libgpopt/src/search/CScheduler.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/search/CScheduler.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/search/CScheduler.cpp
diff --git a/src/backend/gporca/libgpopt/src/search/CSchedulerContext.cpp b/gpcontrib/orca/gporca/libgpopt/src/search/CSchedulerContext.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/search/CSchedulerContext.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/search/CSchedulerContext.cpp
diff --git a/src/backend/gporca/libgpopt/src/search/CSearchStage.cpp b/gpcontrib/orca/gporca/libgpopt/src/search/CSearchStage.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/search/CSearchStage.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/search/CSearchStage.cpp
diff --git a/src/backend/gporca/libgpopt/src/translate/CTranslatorDXLToExpr.cpp b/gpcontrib/orca/gporca/libgpopt/src/translate/CTranslatorDXLToExpr.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/translate/CTranslatorDXLToExpr.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/translate/CTranslatorDXLToExpr.cpp
diff --git a/src/backend/gporca/libgpopt/src/translate/CTranslatorDXLToExprUtils.cpp b/gpcontrib/orca/gporca/libgpopt/src/translate/CTranslatorDXLToExprUtils.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/translate/CTranslatorDXLToExprUtils.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/translate/CTranslatorDXLToExprUtils.cpp
diff --git a/src/backend/gporca/libgpopt/src/translate/CTranslatorExprToDXL.cpp b/gpcontrib/orca/gporca/libgpopt/src/translate/CTranslatorExprToDXL.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/translate/CTranslatorExprToDXL.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/translate/CTranslatorExprToDXL.cpp
diff --git a/src/backend/gporca/libgpopt/src/translate/CTranslatorExprToDXLUtils.cpp b/gpcontrib/orca/gporca/libgpopt/src/translate/CTranslatorExprToDXLUtils.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/translate/CTranslatorExprToDXLUtils.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/translate/CTranslatorExprToDXLUtils.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CDecorrelator.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CDecorrelator.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CDecorrelator.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CDecorrelator.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CJoinOrder.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CJoinOrder.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CJoinOrder.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CJoinOrder.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CJoinOrderDP.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CJoinOrderDP.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CJoinOrderDP.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CJoinOrderDP.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CJoinOrderDPv2.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CJoinOrderDPv2.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CJoinOrderDPv2.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CJoinOrderDPv2.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CJoinOrderGreedy.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CJoinOrderGreedy.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CJoinOrderGreedy.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CJoinOrderGreedy.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CJoinOrderMinCard.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CJoinOrderMinCard.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CJoinOrderMinCard.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CJoinOrderMinCard.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CSubqueryHandler.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CSubqueryHandler.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CSubqueryHandler.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CSubqueryHandler.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXform.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXform.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXform.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXform.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformCTEAnchor2Sequence.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformCTEAnchor2Sequence.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformCTEAnchor2Sequence.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformCTEAnchor2Sequence.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformCTEAnchor2TrivialSelect.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformCTEAnchor2TrivialSelect.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformCTEAnchor2TrivialSelect.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformCTEAnchor2TrivialSelect.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformCollapseGbAgg.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformCollapseGbAgg.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformCollapseGbAgg.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformCollapseGbAgg.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformCollapseProject.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformCollapseProject.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformCollapseProject.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformCollapseProject.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformDelete2DML.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformDelete2DML.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformDelete2DML.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformDelete2DML.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformDifference2LeftAntiSemiJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformDifference2LeftAntiSemiJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformDifference2LeftAntiSemiJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformDifference2LeftAntiSemiJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformDifferenceAll2LeftAntiSemiJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformDifferenceAll2LeftAntiSemiJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformDifferenceAll2LeftAntiSemiJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformDifferenceAll2LeftAntiSemiJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformDynamicForeignGet2DynamicForeignScan.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformDynamicForeignGet2DynamicForeignScan.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformDynamicForeignGet2DynamicForeignScan.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformDynamicForeignGet2DynamicForeignScan.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformDynamicGet2DynamicTableScan.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformDynamicGet2DynamicTableScan.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformDynamicGet2DynamicTableScan.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformDynamicGet2DynamicTableScan.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformDynamicIndexGet2DynamicIndexScan.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformDynamicIndexGet2DynamicIndexScan.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformDynamicIndexGet2DynamicIndexScan.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformDynamicIndexGet2DynamicIndexScan.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformDynamicIndexOnlyGet2DynamicIndexOnlyScan.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformDynamicIndexOnlyGet2DynamicIndexOnlyScan.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformDynamicIndexOnlyGet2DynamicIndexOnlyScan.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformDynamicIndexOnlyGet2DynamicIndexOnlyScan.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformEagerAgg.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformEagerAgg.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformEagerAgg.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformEagerAgg.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformExpandDynamicGetWithForeignPartitions.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformExpandDynamicGetWithForeignPartitions.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformExpandDynamicGetWithForeignPartitions.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformExpandDynamicGetWithForeignPartitions.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformExpandFullOuterJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformExpandFullOuterJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformExpandFullOuterJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformExpandFullOuterJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformExpandNAryJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformExpandNAryJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformExpandNAryJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformExpandNAryJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformExpandNAryJoinDP.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformExpandNAryJoinDP.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformExpandNAryJoinDP.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformExpandNAryJoinDP.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformExpandNAryJoinDPv2.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformExpandNAryJoinDPv2.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformExpandNAryJoinDPv2.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformExpandNAryJoinDPv2.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformExpandNAryJoinGreedy.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformExpandNAryJoinGreedy.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformExpandNAryJoinGreedy.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformExpandNAryJoinGreedy.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformExpandNAryJoinMinCard.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformExpandNAryJoinMinCard.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformExpandNAryJoinMinCard.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformExpandNAryJoinMinCard.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformExploration.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformExploration.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformExploration.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformExploration.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformFactory.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformFactory.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformFactory.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformFactory.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformForeignGet2ForeignScan.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformForeignGet2ForeignScan.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformForeignGet2ForeignScan.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformForeignGet2ForeignScan.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformFullJoinCommutativity.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformFullJoinCommutativity.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformFullJoinCommutativity.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformFullJoinCommutativity.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformFullOuterJoin2HashJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformFullOuterJoin2HashJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformFullOuterJoin2HashJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformFullOuterJoin2HashJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2Apply.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformGbAgg2Apply.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2Apply.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformGbAgg2Apply.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2HashAgg.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformGbAgg2HashAgg.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2HashAgg.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformGbAgg2HashAgg.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2ScalarAgg.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformGbAgg2ScalarAgg.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2ScalarAgg.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformGbAgg2ScalarAgg.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2StreamAgg.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformGbAgg2StreamAgg.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformGbAgg2StreamAgg.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformGbAgg2StreamAgg.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformGbAggDedup2HashAggDedup.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformGbAggDedup2HashAggDedup.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformGbAggDedup2HashAggDedup.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformGbAggDedup2HashAggDedup.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformGbAggDedup2StreamAggDedup.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformGbAggDedup2StreamAggDedup.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformGbAggDedup2StreamAggDedup.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformGbAggDedup2StreamAggDedup.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformGbAggWithMDQA2Join.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformGbAggWithMDQA2Join.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformGbAggWithMDQA2Join.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformGbAggWithMDQA2Join.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformGet2TableScan.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformGet2TableScan.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformGet2TableScan.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformGet2TableScan.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementAssert.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementAssert.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementAssert.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementAssert.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementBitmapTableGet.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementBitmapTableGet.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementBitmapTableGet.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementBitmapTableGet.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementCTEConsumer.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementCTEConsumer.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementCTEConsumer.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementCTEConsumer.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementCTEProducer.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementCTEProducer.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementCTEProducer.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementCTEProducer.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementConstTableGet.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementConstTableGet.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementConstTableGet.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementConstTableGet.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementDML.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementDML.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementDML.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementDML.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementDynamicBitmapTableGet.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementDynamicBitmapTableGet.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementDynamicBitmapTableGet.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementDynamicBitmapTableGet.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementFullOuterMergeJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementFullOuterMergeJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementFullOuterMergeJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementFullOuterMergeJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementInnerJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementInnerJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementInnerJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementInnerJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementLimit.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementLimit.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementLimit.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementLimit.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementSequence.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementSequence.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementSequence.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementSequence.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementSequenceProject.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementSequenceProject.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementSequenceProject.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementSequenceProject.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementSplit.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementSplit.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementSplit.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementSplit.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementTVF.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementTVF.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementTVF.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementTVF.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementTVFNoArgs.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementTVFNoArgs.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementTVFNoArgs.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementTVFNoArgs.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementUnionAll.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementUnionAll.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementUnionAll.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementUnionAll.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformImplementation.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementation.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformImplementation.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformImplementation.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformIndexGet2IndexScan.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformIndexGet2IndexScan.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformIndexGet2IndexScan.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformIndexGet2IndexScan.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformIndexOnlyGet2IndexOnlyScan.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformIndexOnlyGet2IndexOnlyScan.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformIndexOnlyGet2IndexOnlyScan.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformIndexOnlyGet2IndexOnlyScan.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformInlineCTEConsumer.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformInlineCTEConsumer.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformInlineCTEConsumer.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformInlineCTEConsumer.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformInlineCTEConsumerUnderSelect.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformInlineCTEConsumerUnderSelect.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformInlineCTEConsumerUnderSelect.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformInlineCTEConsumerUnderSelect.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformInnerApply2InnerJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformInnerApply2InnerJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformInnerApply2InnerJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformInnerApply2InnerJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformInnerApply2InnerJoinNoCorrelations.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformInnerApply2InnerJoinNoCorrelations.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformInnerApply2InnerJoinNoCorrelations.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformInnerApply2InnerJoinNoCorrelations.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformInnerApplyWithOuterKey2InnerJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformInnerApplyWithOuterKey2InnerJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformInnerApplyWithOuterKey2InnerJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformInnerApplyWithOuterKey2InnerJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformInnerJoinCommutativity.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformInnerJoinCommutativity.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformInnerJoinCommutativity.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformInnerJoinCommutativity.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformInsert2DML.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformInsert2DML.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformInsert2DML.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformInsert2DML.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformIntersect2Join.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformIntersect2Join.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformIntersect2Join.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformIntersect2Join.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformIntersectAll2LeftSemiJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformIntersectAll2LeftSemiJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformIntersectAll2LeftSemiJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformIntersectAll2LeftSemiJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformJoin2IndexApply.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformJoin2IndexApply.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformJoin2IndexApply.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformJoin2IndexApply.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformJoin2IndexApplyGeneric.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformJoin2IndexApplyGeneric.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformJoin2IndexApplyGeneric.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformJoin2IndexApplyGeneric.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformJoinAssociativity.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformJoinAssociativity.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformJoinAssociativity.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformJoinAssociativity.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoinNoCorrelations.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoinNoCorrelations.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoinNoCorrelations.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApply2LeftAntiSemiJoinNoCorrelations.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotIn.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotIn.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotIn.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotIn.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotInNoCorrelations.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotInNoCorrelations.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotInNoCorrelations.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiApplyNotIn2LeftAntiSemiJoinNotInNoCorrelations.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2CrossProduct.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2CrossProduct.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2CrossProduct.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2CrossProduct.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2HashJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2HashJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2HashJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2HashJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2NLJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2NLJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2NLJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoin2NLJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoinNotIn2HashJoinNotIn.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoinNotIn2HashJoinNotIn.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoinNotIn2HashJoinNotIn.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoinNotIn2HashJoinNotIn.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoinNotIn2NLJoinNotIn.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoinNotIn2NLJoinNotIn.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoinNotIn2NLJoinNotIn.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftAntiSemiJoinNotIn2NLJoinNotIn.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftJoin2RightJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftJoin2RightJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftJoin2RightJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftJoin2RightJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftOuter2InnerUnionAllLeftAntiSemiJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftOuter2InnerUnionAllLeftAntiSemiJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftOuter2InnerUnionAllLeftAntiSemiJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftOuter2InnerUnionAllLeftAntiSemiJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftOuterApply2LeftOuterJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftOuterApply2LeftOuterJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftOuterApply2LeftOuterJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftOuterApply2LeftOuterJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftOuterApply2LeftOuterJoinNoCorrelations.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftOuterApply2LeftOuterJoinNoCorrelations.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftOuterApply2LeftOuterJoinNoCorrelations.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftOuterApply2LeftOuterJoinNoCorrelations.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftOuterJoin2HashJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftOuterJoin2HashJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftOuterJoin2HashJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftOuterJoin2HashJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftOuterJoin2NLJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftOuterJoin2NLJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftOuterJoin2NLJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftOuterJoin2NLJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiApply2LeftSemiJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftSemiApply2LeftSemiJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiApply2LeftSemiJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftSemiApply2LeftSemiJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiApply2LeftSemiJoinNoCorrelations.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftSemiApply2LeftSemiJoinNoCorrelations.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiApply2LeftSemiJoinNoCorrelations.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftSemiApply2LeftSemiJoinNoCorrelations.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiApplyWithExternalCorrs2InnerJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftSemiApplyWithExternalCorrs2InnerJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiApplyWithExternalCorrs2InnerJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftSemiApplyWithExternalCorrs2InnerJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2CrossProduct.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2CrossProduct.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2CrossProduct.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2CrossProduct.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2HashJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2HashJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2HashJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2HashJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2InnerJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2InnerJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2InnerJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2InnerJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2InnerJoinUnderGb.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2InnerJoinUnderGb.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2InnerJoinUnderGb.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2InnerJoinUnderGb.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2NLJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2NLJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2NLJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLeftSemiJoin2NLJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformLimit2IndexGet.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLimit2IndexGet.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformLimit2IndexGet.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformLimit2IndexGet.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformMaxOneRow2Assert.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformMaxOneRow2Assert.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformMaxOneRow2Assert.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformMaxOneRow2Assert.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformMinMax2IndexGet.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformMinMax2IndexGet.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformMinMax2IndexGet.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformMinMax2IndexGet.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformProject2Apply.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformProject2Apply.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformProject2Apply.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformProject2Apply.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformProject2ComputeScalar.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformProject2ComputeScalar.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformProject2ComputeScalar.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformProject2ComputeScalar.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformPushDownLeftOuterJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformPushDownLeftOuterJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformPushDownLeftOuterJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformPushDownLeftOuterJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformPushGbBelowJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformPushGbBelowJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformPushGbBelowJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformPushGbBelowJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformPushGbDedupBelowJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformPushGbDedupBelowJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformPushGbDedupBelowJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformPushGbDedupBelowJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformPushGbWithHavingBelowJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformPushGbWithHavingBelowJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformPushGbWithHavingBelowJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformPushGbWithHavingBelowJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformPushJoinBelowUnionAll.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformPushJoinBelowUnionAll.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformPushJoinBelowUnionAll.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformPushJoinBelowUnionAll.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformRemoveSubqDistinct.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformRemoveSubqDistinct.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformRemoveSubqDistinct.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformRemoveSubqDistinct.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformResult.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformResult.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformResult.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformResult.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformRightOuterJoin2HashJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformRightOuterJoin2HashJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformRightOuterJoin2HashJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformRightOuterJoin2HashJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSelect2Apply.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSelect2Apply.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformSelect2Apply.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSelect2Apply.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSelect2BitmapBoolOp.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSelect2BitmapBoolOp.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformSelect2BitmapBoolOp.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSelect2BitmapBoolOp.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSelect2DynamicIndexGet.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSelect2DynamicIndexGet.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformSelect2DynamicIndexGet.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSelect2DynamicIndexGet.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSelect2DynamicIndexOnlyGet.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSelect2DynamicIndexOnlyGet.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformSelect2DynamicIndexOnlyGet.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSelect2DynamicIndexOnlyGet.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSelect2Filter.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSelect2Filter.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformSelect2Filter.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSelect2Filter.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSelect2IndexGet.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSelect2IndexGet.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformSelect2IndexGet.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSelect2IndexGet.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSelect2IndexOnlyGet.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSelect2IndexOnlyGet.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformSelect2IndexOnlyGet.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSelect2IndexOnlyGet.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSequenceProject2Apply.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSequenceProject2Apply.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformSequenceProject2Apply.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSequenceProject2Apply.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSimplifyGbAgg.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSimplifyGbAgg.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformSimplifyGbAgg.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSimplifyGbAgg.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSimplifyLeftOuterJoin.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSimplifyLeftOuterJoin.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformSimplifyLeftOuterJoin.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSimplifyLeftOuterJoin.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSimplifySubquery.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSimplifySubquery.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformSimplifySubquery.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSimplifySubquery.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSplitDQA.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSplitDQA.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformSplitDQA.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSplitDQA.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSplitGbAgg.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSplitGbAgg.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformSplitGbAgg.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSplitGbAgg.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSplitGbAggDedup.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSplitGbAggDedup.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformSplitGbAggDedup.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSplitGbAggDedup.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSplitLimit.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSplitLimit.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformSplitLimit.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSplitLimit.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSubqJoin2Apply.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSubqJoin2Apply.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformSubqJoin2Apply.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSubqJoin2Apply.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformSubqueryUnnest.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSubqueryUnnest.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformSubqueryUnnest.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformSubqueryUnnest.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformUnion2UnionAll.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformUnion2UnionAll.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformUnion2UnionAll.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformUnion2UnionAll.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformUnnestTVF.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformUnnestTVF.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformUnnestTVF.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformUnnestTVF.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformUpdate2DML.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformUpdate2DML.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformUpdate2DML.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformUpdate2DML.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CXformUtils.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CXformUtils.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CXformUtils.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CXformUtils.cpp
diff --git a/src/backend/gporca/libgpopt/src/xforms/CxformSelect2DynamicBitmapBoolOp.cpp b/gpcontrib/orca/gporca/libgpopt/src/xforms/CxformSelect2DynamicBitmapBoolOp.cpp
similarity index 100%
rename from src/backend/gporca/libgpopt/src/xforms/CxformSelect2DynamicBitmapBoolOp.cpp
rename to gpcontrib/orca/gporca/libgpopt/src/xforms/CxformSelect2DynamicBitmapBoolOp.cpp
diff --git a/src/backend/gporca/libgpos/CMakeLists.txt b/gpcontrib/orca/gporca/libgpos/CMakeLists.txt
similarity index 100%
rename from src/backend/gporca/libgpos/CMakeLists.txt
rename to gpcontrib/orca/gporca/libgpos/CMakeLists.txt
diff --git a/src/backend/gporca/libgpos/include/gpos/_api.h b/gpcontrib/orca/gporca/libgpos/include/gpos/_api.h
similarity index 100%
rename from src/backend/gporca/libgpos/include/gpos/_api.h
rename to gpcontrib/orca/gporca/libgpos/include/gpos/_api.h
diff --git a/src/backend/gporca/libgpos/include/gpos/assert.h b/gpcontrib/orca/gporca/libgpos/include/gpos/assert.h
similarity index 100%
rename from src/backend/gporca/libgpos/include/gpos/assert.h
rename to gpcontrib/orca/gporca/libgpos/include/gpos/assert.h
diff --git a/src/backend/gporca/libgpos/include/gpos/attributes.h b/gpcontrib/orca/gporca/libgpos/include/gpos/attributes.h
similarity index 100%
rename from src/backend/gporca/libgpos/include/gpos/attributes.h
rename to gpcontrib/orca/gporca/libgpos/include/gpos/attributes.h
diff --git a/src/backend/gporca/libgpos/include/gpos/base.h b/gpcontrib/orca/gporca/libgpos/include/gpos/base.h
similarity index 100%
rename from src/backend/gporca/libgpos/include/gpos/base.h
rename to gpcontrib/orca/gporca/libgpos/include/gpos/base.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CAutoP.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CAutoP.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CAutoRef.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CAutoRef.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CAutoRg.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CAutoRg.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CAutoTimer.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CAutoTimer.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CBitSet.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CBitSet.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CBitSetIter.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CBitSetIter.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CBitVector.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CBitVector.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CDebugCounter.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CDebugCounter.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CDouble.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CDouble.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CDynamicPtrArray.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CDynamicPtrArray.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CEnumSet.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CEnumSet.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CEnumSetIter.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CEnumSetIter.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CHashMap.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CHashMap.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CHashMapIter.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CHashMapIter.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CHashSet.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CHashSet.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CHashSetIter.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CHashSetIter.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CHeapObject.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CHeapObject.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CLink.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CLink.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CList.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CList.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CMainArgs.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CMainArgs.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CPrintablePointer.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CPrintablePointer.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CRandom.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CRandom.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CRefCount.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CRefCount.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CStack.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CStack.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CStackDescriptor.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CStackDescriptor.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CStackObject.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CStackObject.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CSyncHashtable.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CSyncHashtable.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CSyncHashtableAccessByIter.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CSyncHashtableAccessByIter.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CSyncHashtableAccessByKey.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CSyncHashtableAccessByKey.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CSyncHashtableAccessorBase.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CSyncHashtableAccessorBase.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CSyncHashtableIter.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CSyncHashtableIter.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CSyncList.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CSyncList.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CSyncPool.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CSyncPool.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CTimerUser.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CTimerUser.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/CWallClock.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/CWallClock.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/DbgPrintMixin.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/DbgPrintMixin.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/ITimer.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/ITimer.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/clibtypes.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/clibtypes.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/clibwrapper.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/clibwrapper.h
diff --git a/src/backend/gporca/libgpos/include/gpos/common/syslibwrapper.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/common/syslibwrapper.h
diff --git a/src/backend/gporca/libgpos/include/gpos/error/CAutoExceptionStack.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/error/CAutoExceptionStack.h
diff --git a/src/backend/gporca/libgpos/include/gpos/error/CAutoTrace.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/error/CAutoTrace.h
diff --git a/src/backend/gporca/libgpos/include/gpos/error/CErrorContext.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/error/CErrorContext.h
diff --git a/src/backend/gporca/libgpos/include/gpos/error/CErrorHandler.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/error/CErrorHandler.h
diff --git a/src/backend/gporca/libgpos/include/gpos/error/CErrorHandlerStandard.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/error/CErrorHandlerStandard.h
diff --git a/src/backend/gporca/libgpos/include/gpos/error/CException.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/error/CException.h
diff --git a/src/backend/gporca/libgpos/include/gpos/error/CLogger.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/error/CLogger.h
diff --git a/src/backend/gporca/libgpos/include/gpos/error/CLoggerStream.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/error/CLoggerStream.h
diff --git a/src/backend/gporca/libgpos/include/gpos/error/CLoggerSyslog.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/error/CLoggerSyslog.h
diff --git a/src/backend/gporca/libgpos/include/gpos/error/CMessage.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/error/CMessage.h
diff --git a/src/backend/gporca/libgpos/include/gpos/error/CMessageRepository.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/error/CMessageRepository.h
diff --git a/src/backend/gporca/libgpos/include/gpos/error/CMessageTable.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/error/CMessageTable.h
diff --git a/src/backend/gporca/libgpos/include/gpos/error/CMiniDumper.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/error/CMiniDumper.h
diff --git a/src/backend/gporca/libgpos/include/gpos/error/CSerializable.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/error/CSerializable.h
diff --git a/src/backend/gporca/libgpos/include/gpos/error/IErrorContext.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/error/IErrorContext.h
diff --git a/src/backend/gporca/libgpos/include/gpos/error/ILogger.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/error/ILogger.h
diff --git a/src/backend/gporca/libgpos/include/gpos/io/CFileDescriptor.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/io/CFileDescriptor.h
diff --git a/src/backend/gporca/libgpos/include/gpos/io/CFileReader.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/io/CFileReader.h
diff --git a/src/backend/gporca/libgpos/include/gpos/io/CFileWriter.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/io/CFileWriter.h
diff --git a/src/backend/gporca/libgpos/include/gpos/io/COstream.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/io/COstream.h
diff --git a/src/backend/gporca/libgpos/include/gpos/io/COstreamBasic.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/io/COstreamBasic.h
diff --git a/src/backend/gporca/libgpos/include/gpos/io/COstreamStdString.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/io/COstreamStdString.h
diff --git a/src/backend/gporca/libgpos/include/gpos/io/COstreamString.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/io/COstreamString.h
diff --git a/src/backend/gporca/libgpos/include/gpos/io/IOstream.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/io/IOstream.h
diff --git a/src/backend/gporca/libgpos/include/gpos/io/iotypes.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/io/iotypes.h
diff --git a/src/backend/gporca/libgpos/include/gpos/io/ioutils.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/io/ioutils.h
diff --git a/src/backend/gporca/libgpos/include/gpos/memory/CAutoMemoryPool.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/memory/CAutoMemoryPool.h
diff --git a/src/backend/gporca/libgpos/include/gpos/memory/CCache.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/memory/CCache.h
diff --git a/src/backend/gporca/libgpos/include/gpos/memory/CCacheAccessor.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/memory/CCacheAccessor.h
diff --git a/src/backend/gporca/libgpos/include/gpos/memory/CCacheEntry.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/memory/CCacheEntry.h
diff --git a/src/backend/gporca/libgpos/include/gpos/memory/CCacheFactory.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/memory/CCacheFactory.h
diff --git a/src/backend/gporca/libgpos/include/gpos/memory/CMemoryPool.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/memory/CMemoryPool.h
diff --git a/src/backend/gporca/libgpos/include/gpos/memory/CMemoryPoolManager.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/memory/CMemoryPoolManager.h
diff --git a/src/backend/gporca/libgpos/include/gpos/memory/CMemoryPoolStatistics.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/memory/CMemoryPoolStatistics.h
diff --git a/src/backend/gporca/libgpos/include/gpos/memory/CMemoryPoolTracker.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/memory/CMemoryPoolTracker.h
diff --git a/src/backend/gporca/libgpos/include/gpos/memory/CMemoryVisitorPrint.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/memory/CMemoryVisitorPrint.h
diff --git a/src/backend/gporca/libgpos/include/gpos/memory/IMemoryVisitor.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/memory/IMemoryVisitor.h
diff --git a/src/backend/gporca/libgpos/include/gpos/memory/MemoryPoolAllocator.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/memory/MemoryPoolAllocator.h
diff --git a/src/backend/gporca/libgpos/include/gpos/memory/README.md b/gpcontrib/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/orca/gporca/libgpos/include/gpos/memory/README.md
diff --git a/src/backend/gporca/libgpos/include/gpos/memory/deque.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/memory/deque.h
diff --git a/src/backend/gporca/libgpos/include/gpos/memory/queue.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/memory/queue.h
diff --git a/src/backend/gporca/libgpos/include/gpos/memory/stack.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/memory/stack.h
diff --git a/src/backend/gporca/libgpos/include/gpos/string/CStringStatic.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/string/CStringStatic.h
diff --git a/src/backend/gporca/libgpos/include/gpos/string/CWString.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/string/CWString.h
diff --git a/src/backend/gporca/libgpos/include/gpos/string/CWStringBase.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/string/CWStringBase.h
diff --git a/src/backend/gporca/libgpos/include/gpos/string/CWStringConst.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/string/CWStringConst.h
diff --git a/src/backend/gporca/libgpos/include/gpos/string/CWStringDynamic.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/string/CWStringDynamic.h
diff --git a/src/backend/gporca/libgpos/include/gpos/string/CWStringStatic.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/string/CWStringStatic.h
diff --git a/src/backend/gporca/libgpos/include/gpos/task/CAutoSuspendAbort.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/task/CAutoSuspendAbort.h
diff --git a/src/backend/gporca/libgpos/include/gpos/task/CAutoTaskProxy.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/task/CAutoTaskProxy.h
diff --git a/src/backend/gporca/libgpos/include/gpos/task/CAutoTraceFlag.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/task/CAutoTraceFlag.h
diff --git a/src/backend/gporca/libgpos/include/gpos/task/CTask.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/task/CTask.h
diff --git a/src/backend/gporca/libgpos/include/gpos/task/CTaskContext.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/task/CTaskContext.h
diff --git a/src/backend/gporca/libgpos/include/gpos/task/CTaskId.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/task/CTaskId.h
diff --git a/src/backend/gporca/libgpos/include/gpos/task/CTaskLocalStorage.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/task/CTaskLocalStorage.h
diff --git a/src/backend/gporca/libgpos/include/gpos/task/CTaskLocalStorageObject.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/task/CTaskLocalStorageObject.h
diff --git a/src/backend/gporca/libgpos/include/gpos/task/CTaskSchedulerFifo.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/task/CTaskSchedulerFifo.h
diff --git a/src/backend/gporca/libgpos/include/gpos/task/CTraceFlagIter.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/task/CTraceFlagIter.h
diff --git a/src/backend/gporca/libgpos/include/gpos/task/CWorker.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/task/CWorker.h
diff --git a/src/backend/gporca/libgpos/include/gpos/task/CWorkerPoolManager.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/task/CWorkerPoolManager.h
diff --git a/src/backend/gporca/libgpos/include/gpos/task/ITask.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/task/ITask.h
diff --git a/src/backend/gporca/libgpos/include/gpos/task/ITaskScheduler.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/task/ITaskScheduler.h
diff --git a/src/backend/gporca/libgpos/include/gpos/task/IWorker.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/task/IWorker.h
diff --git a/src/backend/gporca/libgpos/include/gpos/task/traceflags.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/task/traceflags.h
diff --git a/src/backend/gporca/libgpos/include/gpos/test/CUnittest.h b/gpcontrib/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/orca/gporca/libgpos/include/gpos/test/CUnittest.h
diff --git a/src/backend/gporca/libgpos/include/gpos/types.h b/gpcontrib/orca/gporca/libgpos/include/gpos/types.h
similarity index 100%
rename from src/backend/gporca/libgpos/include/gpos/types.h
rename to gpcontrib/orca/gporca/libgpos/include/gpos/types.h
diff --git a/src/backend/gporca/libgpos/include/gpos/utils.h b/gpcontrib/orca/gporca/libgpos/include/gpos/utils.h
similarity index 100%
rename from src/backend/gporca/libgpos/include/gpos/utils.h
rename to gpcontrib/orca/gporca/libgpos/include/gpos/utils.h
diff --git a/src/backend/gporca/libgpos/server/CMakeLists.txt b/gpcontrib/orca/gporca/libgpos/server/CMakeLists.txt
similarity index 100%
rename from src/backend/gporca/libgpos/server/CMakeLists.txt
rename to gpcontrib/orca/gporca/libgpos/server/CMakeLists.txt
diff --git a/src/backend/gporca/libgpos/server/include/unittest/gpos/common/CAutoPTest.h b/gpcontrib/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/orca/gporca/libgpos/server/include/unittest/gpos/test/CUnittestTest.h
diff --git a/src/backend/gporca/libgpos/server/src/startup/main.cpp b/gpcontrib/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/orca/gporca/libgpos/server/src/startup/main.cpp
diff --git a/src/backend/gporca/libgpos/server/src/unittest/gpos/common/CAutoPTest.cpp b/gpcontrib/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/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/orca/gporca/libgpos/server/src/unittest/gpos/test/CUnittestTest.cpp
diff --git a/src/backend/gporca/libgpos/src/_api.cpp b/gpcontrib/orca/gporca/libgpos/src/_api.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/_api.cpp
rename to gpcontrib/orca/gporca/libgpos/src/_api.cpp
diff --git a/src/backend/gporca/libgpos/src/common/CAutoTimer.cpp b/gpcontrib/orca/gporca/libgpos/src/common/CAutoTimer.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/common/CAutoTimer.cpp
rename to gpcontrib/orca/gporca/libgpos/src/common/CAutoTimer.cpp
diff --git a/src/backend/gporca/libgpos/src/common/CBitSet.cpp b/gpcontrib/orca/gporca/libgpos/src/common/CBitSet.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/common/CBitSet.cpp
rename to gpcontrib/orca/gporca/libgpos/src/common/CBitSet.cpp
diff --git a/src/backend/gporca/libgpos/src/common/CBitSetIter.cpp b/gpcontrib/orca/gporca/libgpos/src/common/CBitSetIter.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/common/CBitSetIter.cpp
rename to gpcontrib/orca/gporca/libgpos/src/common/CBitSetIter.cpp
diff --git a/src/backend/gporca/libgpos/src/common/CBitVector.cpp b/gpcontrib/orca/gporca/libgpos/src/common/CBitVector.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/common/CBitVector.cpp
rename to gpcontrib/orca/gporca/libgpos/src/common/CBitVector.cpp
diff --git a/src/backend/gporca/libgpos/src/common/CDebugCounter.cpp b/gpcontrib/orca/gporca/libgpos/src/common/CDebugCounter.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/common/CDebugCounter.cpp
rename to gpcontrib/orca/gporca/libgpos/src/common/CDebugCounter.cpp
diff --git a/src/backend/gporca/libgpos/src/common/CHeapObject.cpp b/gpcontrib/orca/gporca/libgpos/src/common/CHeapObject.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/common/CHeapObject.cpp
rename to gpcontrib/orca/gporca/libgpos/src/common/CHeapObject.cpp
diff --git a/src/backend/gporca/libgpos/src/common/CMainArgs.cpp b/gpcontrib/orca/gporca/libgpos/src/common/CMainArgs.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/common/CMainArgs.cpp
rename to gpcontrib/orca/gporca/libgpos/src/common/CMainArgs.cpp
diff --git a/src/backend/gporca/libgpos/src/common/CRandom.cpp b/gpcontrib/orca/gporca/libgpos/src/common/CRandom.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/common/CRandom.cpp
rename to gpcontrib/orca/gporca/libgpos/src/common/CRandom.cpp
diff --git a/src/backend/gporca/libgpos/src/common/CRefCount.cpp b/gpcontrib/orca/gporca/libgpos/src/common/CRefCount.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/common/CRefCount.cpp
rename to gpcontrib/orca/gporca/libgpos/src/common/CRefCount.cpp
diff --git a/src/backend/gporca/libgpos/src/common/CStackDescriptor.cpp b/gpcontrib/orca/gporca/libgpos/src/common/CStackDescriptor.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/common/CStackDescriptor.cpp
rename to gpcontrib/orca/gporca/libgpos/src/common/CStackDescriptor.cpp
diff --git a/src/backend/gporca/libgpos/src/common/CStackObject.cpp b/gpcontrib/orca/gporca/libgpos/src/common/CStackObject.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/common/CStackObject.cpp
rename to gpcontrib/orca/gporca/libgpos/src/common/CStackObject.cpp
diff --git a/src/backend/gporca/libgpos/src/common/CTimerUser.cpp b/gpcontrib/orca/gporca/libgpos/src/common/CTimerUser.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/common/CTimerUser.cpp
rename to gpcontrib/orca/gporca/libgpos/src/common/CTimerUser.cpp
diff --git a/src/backend/gporca/libgpos/src/common/CWallClock.cpp b/gpcontrib/orca/gporca/libgpos/src/common/CWallClock.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/common/CWallClock.cpp
rename to gpcontrib/orca/gporca/libgpos/src/common/CWallClock.cpp
diff --git a/src/backend/gporca/libgpos/src/common/clibwrapper.cpp b/gpcontrib/orca/gporca/libgpos/src/common/clibwrapper.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/common/clibwrapper.cpp
rename to gpcontrib/orca/gporca/libgpos/src/common/clibwrapper.cpp
diff --git a/src/backend/gporca/libgpos/src/common/syslibwrapper.cpp b/gpcontrib/orca/gporca/libgpos/src/common/syslibwrapper.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/common/syslibwrapper.cpp
rename to gpcontrib/orca/gporca/libgpos/src/common/syslibwrapper.cpp
diff --git a/src/backend/gporca/libgpos/src/error/CAutoExceptionStack.cpp b/gpcontrib/orca/gporca/libgpos/src/error/CAutoExceptionStack.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/error/CAutoExceptionStack.cpp
rename to gpcontrib/orca/gporca/libgpos/src/error/CAutoExceptionStack.cpp
diff --git a/src/backend/gporca/libgpos/src/error/CAutoTrace.cpp b/gpcontrib/orca/gporca/libgpos/src/error/CAutoTrace.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/error/CAutoTrace.cpp
rename to gpcontrib/orca/gporca/libgpos/src/error/CAutoTrace.cpp
diff --git a/src/backend/gporca/libgpos/src/error/CErrorContext.cpp b/gpcontrib/orca/gporca/libgpos/src/error/CErrorContext.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/error/CErrorContext.cpp
rename to gpcontrib/orca/gporca/libgpos/src/error/CErrorContext.cpp
diff --git a/src/backend/gporca/libgpos/src/error/CErrorHandlerStandard.cpp b/gpcontrib/orca/gporca/libgpos/src/error/CErrorHandlerStandard.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/error/CErrorHandlerStandard.cpp
rename to gpcontrib/orca/gporca/libgpos/src/error/CErrorHandlerStandard.cpp
diff --git a/src/backend/gporca/libgpos/src/error/CException.cpp b/gpcontrib/orca/gporca/libgpos/src/error/CException.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/error/CException.cpp
rename to gpcontrib/orca/gporca/libgpos/src/error/CException.cpp
diff --git a/src/backend/gporca/libgpos/src/error/CLogger.cpp b/gpcontrib/orca/gporca/libgpos/src/error/CLogger.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/error/CLogger.cpp
rename to gpcontrib/orca/gporca/libgpos/src/error/CLogger.cpp
diff --git a/src/backend/gporca/libgpos/src/error/CLoggerStream.cpp b/gpcontrib/orca/gporca/libgpos/src/error/CLoggerStream.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/error/CLoggerStream.cpp
rename to gpcontrib/orca/gporca/libgpos/src/error/CLoggerStream.cpp
diff --git a/src/backend/gporca/libgpos/src/error/CLoggerSyslog.cpp b/gpcontrib/orca/gporca/libgpos/src/error/CLoggerSyslog.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/error/CLoggerSyslog.cpp
rename to gpcontrib/orca/gporca/libgpos/src/error/CLoggerSyslog.cpp
diff --git a/src/backend/gporca/libgpos/src/error/CMessage.cpp b/gpcontrib/orca/gporca/libgpos/src/error/CMessage.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/error/CMessage.cpp
rename to gpcontrib/orca/gporca/libgpos/src/error/CMessage.cpp
diff --git a/src/backend/gporca/libgpos/src/error/CMessageRepository.cpp b/gpcontrib/orca/gporca/libgpos/src/error/CMessageRepository.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/error/CMessageRepository.cpp
rename to gpcontrib/orca/gporca/libgpos/src/error/CMessageRepository.cpp
diff --git a/src/backend/gporca/libgpos/src/error/CMessageTable.cpp b/gpcontrib/orca/gporca/libgpos/src/error/CMessageTable.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/error/CMessageTable.cpp
rename to gpcontrib/orca/gporca/libgpos/src/error/CMessageTable.cpp
diff --git a/src/backend/gporca/libgpos/src/error/CMiniDumper.cpp b/gpcontrib/orca/gporca/libgpos/src/error/CMiniDumper.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/error/CMiniDumper.cpp
rename to gpcontrib/orca/gporca/libgpos/src/error/CMiniDumper.cpp
diff --git a/src/backend/gporca/libgpos/src/error/CSerializable.cpp b/gpcontrib/orca/gporca/libgpos/src/error/CSerializable.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/error/CSerializable.cpp
rename to gpcontrib/orca/gporca/libgpos/src/error/CSerializable.cpp
diff --git a/src/backend/gporca/libgpos/src/error/ILogger.cpp b/gpcontrib/orca/gporca/libgpos/src/error/ILogger.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/error/ILogger.cpp
rename to gpcontrib/orca/gporca/libgpos/src/error/ILogger.cpp
diff --git a/src/backend/gporca/libgpos/src/io/CFileDescriptor.cpp b/gpcontrib/orca/gporca/libgpos/src/io/CFileDescriptor.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/io/CFileDescriptor.cpp
rename to gpcontrib/orca/gporca/libgpos/src/io/CFileDescriptor.cpp
diff --git a/src/backend/gporca/libgpos/src/io/CFileReader.cpp b/gpcontrib/orca/gporca/libgpos/src/io/CFileReader.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/io/CFileReader.cpp
rename to gpcontrib/orca/gporca/libgpos/src/io/CFileReader.cpp
diff --git a/src/backend/gporca/libgpos/src/io/CFileWriter.cpp b/gpcontrib/orca/gporca/libgpos/src/io/CFileWriter.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/io/CFileWriter.cpp
rename to gpcontrib/orca/gporca/libgpos/src/io/CFileWriter.cpp
diff --git a/src/backend/gporca/libgpos/src/io/COstream.cpp b/gpcontrib/orca/gporca/libgpos/src/io/COstream.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/io/COstream.cpp
rename to gpcontrib/orca/gporca/libgpos/src/io/COstream.cpp
diff --git a/src/backend/gporca/libgpos/src/io/COstreamBasic.cpp b/gpcontrib/orca/gporca/libgpos/src/io/COstreamBasic.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/io/COstreamBasic.cpp
rename to gpcontrib/orca/gporca/libgpos/src/io/COstreamBasic.cpp
diff --git a/src/backend/gporca/libgpos/src/io/COstreamStdString.cpp b/gpcontrib/orca/gporca/libgpos/src/io/COstreamStdString.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/io/COstreamStdString.cpp
rename to gpcontrib/orca/gporca/libgpos/src/io/COstreamStdString.cpp
diff --git a/src/backend/gporca/libgpos/src/io/COstreamString.cpp b/gpcontrib/orca/gporca/libgpos/src/io/COstreamString.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/io/COstreamString.cpp
rename to gpcontrib/orca/gporca/libgpos/src/io/COstreamString.cpp
diff --git a/src/backend/gporca/libgpos/src/io/ioutils.cpp b/gpcontrib/orca/gporca/libgpos/src/io/ioutils.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/io/ioutils.cpp
rename to gpcontrib/orca/gporca/libgpos/src/io/ioutils.cpp
diff --git a/src/backend/gporca/libgpos/src/memory/CAutoMemoryPool.cpp b/gpcontrib/orca/gporca/libgpos/src/memory/CAutoMemoryPool.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/memory/CAutoMemoryPool.cpp
rename to gpcontrib/orca/gporca/libgpos/src/memory/CAutoMemoryPool.cpp
diff --git a/src/backend/gporca/libgpos/src/memory/CCacheFactory.cpp b/gpcontrib/orca/gporca/libgpos/src/memory/CCacheFactory.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/memory/CCacheFactory.cpp
rename to gpcontrib/orca/gporca/libgpos/src/memory/CCacheFactory.cpp
diff --git a/src/backend/gporca/libgpos/src/memory/CMemoryPool.cpp b/gpcontrib/orca/gporca/libgpos/src/memory/CMemoryPool.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/memory/CMemoryPool.cpp
rename to gpcontrib/orca/gporca/libgpos/src/memory/CMemoryPool.cpp
diff --git a/src/backend/gporca/libgpos/src/memory/CMemoryPoolManager.cpp b/gpcontrib/orca/gporca/libgpos/src/memory/CMemoryPoolManager.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/memory/CMemoryPoolManager.cpp
rename to gpcontrib/orca/gporca/libgpos/src/memory/CMemoryPoolManager.cpp
diff --git a/src/backend/gporca/libgpos/src/memory/CMemoryPoolTracker.cpp b/gpcontrib/orca/gporca/libgpos/src/memory/CMemoryPoolTracker.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/memory/CMemoryPoolTracker.cpp
rename to gpcontrib/orca/gporca/libgpos/src/memory/CMemoryPoolTracker.cpp
diff --git a/src/backend/gporca/libgpos/src/memory/CMemoryVisitorPrint.cpp b/gpcontrib/orca/gporca/libgpos/src/memory/CMemoryVisitorPrint.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/memory/CMemoryVisitorPrint.cpp
rename to gpcontrib/orca/gporca/libgpos/src/memory/CMemoryVisitorPrint.cpp
diff --git a/src/backend/gporca/libgpos/src/string/CStringStatic.cpp b/gpcontrib/orca/gporca/libgpos/src/string/CStringStatic.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/string/CStringStatic.cpp
rename to gpcontrib/orca/gporca/libgpos/src/string/CStringStatic.cpp
diff --git a/src/backend/gporca/libgpos/src/string/CWString.cpp b/gpcontrib/orca/gporca/libgpos/src/string/CWString.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/string/CWString.cpp
rename to gpcontrib/orca/gporca/libgpos/src/string/CWString.cpp
diff --git a/src/backend/gporca/libgpos/src/string/CWStringBase.cpp b/gpcontrib/orca/gporca/libgpos/src/string/CWStringBase.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/string/CWStringBase.cpp
rename to gpcontrib/orca/gporca/libgpos/src/string/CWStringBase.cpp
diff --git a/src/backend/gporca/libgpos/src/string/CWStringConst.cpp b/gpcontrib/orca/gporca/libgpos/src/string/CWStringConst.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/string/CWStringConst.cpp
rename to gpcontrib/orca/gporca/libgpos/src/string/CWStringConst.cpp
diff --git a/src/backend/gporca/libgpos/src/string/CWStringDynamic.cpp b/gpcontrib/orca/gporca/libgpos/src/string/CWStringDynamic.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/string/CWStringDynamic.cpp
rename to gpcontrib/orca/gporca/libgpos/src/string/CWStringDynamic.cpp
diff --git a/src/backend/gporca/libgpos/src/string/CWStringStatic.cpp b/gpcontrib/orca/gporca/libgpos/src/string/CWStringStatic.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/string/CWStringStatic.cpp
rename to gpcontrib/orca/gporca/libgpos/src/string/CWStringStatic.cpp
diff --git a/src/backend/gporca/libgpos/src/task/CAutoSuspendAbort.cpp b/gpcontrib/orca/gporca/libgpos/src/task/CAutoSuspendAbort.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/task/CAutoSuspendAbort.cpp
rename to gpcontrib/orca/gporca/libgpos/src/task/CAutoSuspendAbort.cpp
diff --git a/src/backend/gporca/libgpos/src/task/CAutoTaskProxy.cpp b/gpcontrib/orca/gporca/libgpos/src/task/CAutoTaskProxy.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/task/CAutoTaskProxy.cpp
rename to gpcontrib/orca/gporca/libgpos/src/task/CAutoTaskProxy.cpp
diff --git a/src/backend/gporca/libgpos/src/task/CAutoTraceFlag.cpp b/gpcontrib/orca/gporca/libgpos/src/task/CAutoTraceFlag.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/task/CAutoTraceFlag.cpp
rename to gpcontrib/orca/gporca/libgpos/src/task/CAutoTraceFlag.cpp
diff --git a/src/backend/gporca/libgpos/src/task/CTask.cpp b/gpcontrib/orca/gporca/libgpos/src/task/CTask.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/task/CTask.cpp
rename to gpcontrib/orca/gporca/libgpos/src/task/CTask.cpp
diff --git a/src/backend/gporca/libgpos/src/task/CTaskContext.cpp b/gpcontrib/orca/gporca/libgpos/src/task/CTaskContext.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/task/CTaskContext.cpp
rename to gpcontrib/orca/gporca/libgpos/src/task/CTaskContext.cpp
diff --git a/src/backend/gporca/libgpos/src/task/CTaskLocalStorage.cpp b/gpcontrib/orca/gporca/libgpos/src/task/CTaskLocalStorage.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/task/CTaskLocalStorage.cpp
rename to gpcontrib/orca/gporca/libgpos/src/task/CTaskLocalStorage.cpp
diff --git a/src/backend/gporca/libgpos/src/task/CTaskSchedulerFifo.cpp b/gpcontrib/orca/gporca/libgpos/src/task/CTaskSchedulerFifo.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/task/CTaskSchedulerFifo.cpp
rename to gpcontrib/orca/gporca/libgpos/src/task/CTaskSchedulerFifo.cpp
diff --git a/src/backend/gporca/libgpos/src/task/CWorker.cpp b/gpcontrib/orca/gporca/libgpos/src/task/CWorker.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/task/CWorker.cpp
rename to gpcontrib/orca/gporca/libgpos/src/task/CWorker.cpp
diff --git a/src/backend/gporca/libgpos/src/task/CWorkerPoolManager.cpp b/gpcontrib/orca/gporca/libgpos/src/task/CWorkerPoolManager.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/task/CWorkerPoolManager.cpp
rename to gpcontrib/orca/gporca/libgpos/src/task/CWorkerPoolManager.cpp
diff --git a/src/backend/gporca/libgpos/src/task/ITask.cpp b/gpcontrib/orca/gporca/libgpos/src/task/ITask.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/task/ITask.cpp
rename to gpcontrib/orca/gporca/libgpos/src/task/ITask.cpp
diff --git a/src/backend/gporca/libgpos/src/task/IWorker.cpp b/gpcontrib/orca/gporca/libgpos/src/task/IWorker.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/task/IWorker.cpp
rename to gpcontrib/orca/gporca/libgpos/src/task/IWorker.cpp
diff --git a/src/backend/gporca/libgpos/src/test/CUnittest.cpp b/gpcontrib/orca/gporca/libgpos/src/test/CUnittest.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/test/CUnittest.cpp
rename to gpcontrib/orca/gporca/libgpos/src/test/CUnittest.cpp
diff --git a/src/backend/gporca/libgpos/src/utils.cpp b/gpcontrib/orca/gporca/libgpos/src/utils.cpp
similarity index 100%
rename from src/backend/gporca/libgpos/src/utils.cpp
rename to gpcontrib/orca/gporca/libgpos/src/utils.cpp
diff --git a/src/backend/gporca/libnaucrates/CMakeLists.txt b/gpcontrib/orca/gporca/libnaucrates/CMakeLists.txt
similarity index 100%
rename from src/backend/gporca/libnaucrates/CMakeLists.txt
rename to gpcontrib/orca/gporca/libnaucrates/CMakeLists.txt
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/CDatumBoolGPDB.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/base/CDatumBoolGPDB.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/CDatumGenericGPDB.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/base/CDatumGenericGPDB.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/CDatumInt2GPDB.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/base/CDatumInt2GPDB.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/CDatumInt4GPDB.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/base/CDatumInt4GPDB.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/CDatumInt8GPDB.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/base/CDatumInt8GPDB.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/CDatumOidGPDB.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/base/CDatumOidGPDB.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/CQueryToDXLResult.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/base/CQueryToDXLResult.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/IDatum.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/base/IDatum.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/IDatumBool.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/base/IDatumBool.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/IDatumGeneric.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/base/IDatumGeneric.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/IDatumInt2.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/base/IDatumInt2.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/IDatumInt4.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/base/IDatumInt4.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/IDatumInt8.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/base/IDatumInt8.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/base/IDatumOid.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/base/IDatumOid.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/CCostModelConfigSerializer.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/CCostModelConfigSerializer.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/CDXLUtils.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/CDXLUtils.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/CIdGenerator.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/CIdGenerator.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/errorcodes.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/errorcodes.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/gpdb_types.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/gpdb_types.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLColDescr.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLColDescr.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLColRef.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLColRef.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLCtasStorageOptions.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLCtasStorageOptions.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatum.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatum.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumBool.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumBool.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumGeneric.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumGeneric.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumInt2.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumInt2.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumInt4.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumInt4.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumInt8.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumInt8.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumOid.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumOid.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumStatsDoubleMappable.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumStatsDoubleMappable.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumStatsLintMappable.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDatumStatsLintMappable.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDirectDispatchInfo.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLDirectDispatchInfo.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLIndexDescr.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLIndexDescr.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogical.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogical.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTAS.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTAS.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTEAnchor.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTEAnchor.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTEConsumer.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTEConsumer.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTEProducer.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalCTEProducer.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalConstTable.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalConstTable.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalDelete.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalDelete.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalForeignGet.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalForeignGet.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalGet.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalGet.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalGroupBy.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalGroupBy.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalInsert.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalInsert.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalJoin.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalJoin.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalLimit.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalLimit.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalProject.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalProject.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalSelect.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalSelect.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalSetOp.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalSetOp.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalTVF.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalTVF.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalUpdate.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalUpdate.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalWindow.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLLogicalWindow.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLNode.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLNode.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLOperator.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLOperator.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLOperatorCost.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLOperatorCost.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLOperatorFactory.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLOperatorFactory.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysical.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysical.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAbstractBitmapScan.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAbstractBitmapScan.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAgg.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAgg.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAppend.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAppend.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAssert.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalAssert.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalBitmapTableScan.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalBitmapTableScan.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalBroadcastMotion.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalBroadcastMotion.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTAS.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTAS.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTEConsumer.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTEConsumer.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTEProducer.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalCTEProducer.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDML.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDML.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicBitmapTableScan.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicBitmapTableScan.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicForeignScan.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicForeignScan.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicIndexOnlyScan.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicIndexOnlyScan.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicIndexScan.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicIndexScan.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicTableScan.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalDynamicTableScan.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalForeignScan.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalForeignScan.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalGatherMotion.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalGatherMotion.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalHashJoin.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalHashJoin.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalIndexOnlyScan.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalIndexOnlyScan.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalIndexScan.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalIndexScan.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalJoin.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalJoin.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalLimit.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalLimit.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalMaterialize.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalMaterialize.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalMergeJoin.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalMergeJoin.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalMotion.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalMotion.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalNLJoin.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalNLJoin.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalPartitionSelector.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalPartitionSelector.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalProperties.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalProperties.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalRandomMotion.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalRandomMotion.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalRedistributeMotion.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalRedistributeMotion.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalResult.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalResult.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalRoutedDistributeMotion.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalRoutedDistributeMotion.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalSequence.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalSequence.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalSort.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalSort.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalSplit.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalSplit.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalTVF.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalTVF.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalTableScan.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalTableScan.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalValuesScan.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalValuesScan.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalWindow.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLPhysicalWindow.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLProperties.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLProperties.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalar.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalar.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarAggref.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarAggref.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArray.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArray.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayCoerceExpr.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayCoerceExpr.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayComp.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayComp.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayRef.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayRef.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayRefIndexList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarArrayRefIndexList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarAssertConstraint.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarAssertConstraint.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarAssertConstraintList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarAssertConstraintList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBitmapBoolOp.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBitmapBoolOp.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBitmapIndexProbe.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBitmapIndexProbe.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBoolExpr.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBoolExpr.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBooleanTest.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarBooleanTest.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCaseTest.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCaseTest.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCast.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCast.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoalesce.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoalesce.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoerceBase.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoerceBase.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoerceToDomain.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoerceToDomain.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoerceViaIO.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarCoerceViaIO.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarComp.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarComp.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarConstValue.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarConstValue.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarDMLAction.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarDMLAction.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarDistinctComp.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarDistinctComp.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarFieldSelect.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarFieldSelect.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarFilter.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarFilter.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarFuncExpr.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarFuncExpr.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarHashCondList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarHashCondList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarHashExpr.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarHashExpr.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarHashExprList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarHashExprList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarIdent.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarIdent.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarIfStmt.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarIfStmt.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarIndexCondList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarIndexCondList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarJoinFilter.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarJoinFilter.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarLimitCount.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarLimitCount.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarLimitOffset.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarLimitOffset.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarMergeCondList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarMergeCondList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarMinMax.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarMinMax.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarNullIf.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarNullIf.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarNullTest.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarNullTest.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarOneTimeFilter.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarOneTimeFilter.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarOpExpr.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarOpExpr.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarOpList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarOpList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarParam.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarParam.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarProjElem.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarProjElem.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarProjList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarProjList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarRecheckCondFilter.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarRecheckCondFilter.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSortCol.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSortCol.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSortColList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSortColList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSortGroupClause.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSortGroupClause.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubPlan.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubPlan.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubquery.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubquery.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryAll.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryAll.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryAny.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryAny.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryExists.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryExists.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryNotExists.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryNotExists.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryQuantified.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSubqueryQuantified.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSwitch.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSwitch.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSwitchCase.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarSwitchCase.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarValuesList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarValuesList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarWindowFrameEdge.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarWindowFrameEdge.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarWindowRef.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLScalarWindowRef.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLSpoolInfo.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLSpoolInfo.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLTableDescr.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLTableDescr.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLWindowFrame.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLWindowFrame.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLWindowKey.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLWindowKey.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLWindowSpec.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/operators/CDXLWindowSpec.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerAgg.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerAgg.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerAppend.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerAppend.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerArray.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerArray.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerAssert.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerAssert.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerBase.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerBase.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerBroadcastMotion.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerBroadcastMotion.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCTEConfig.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCTEConfig.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCTEList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCTEList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerColDescr.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerColDescr.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerColStats.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerColStats.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerColStatsBucket.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerColStatsBucket.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCondList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCondList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCost.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCost.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCostModel.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCostModel.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCostParam.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCostParam.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCostParams.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCostParams.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCtasStorageOptions.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerCtasStorageOptions.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDXL.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDXL.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDirectDispatchInfo.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDirectDispatchInfo.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDistinctComp.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDistinctComp.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDummy.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDummy.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicForeignScan.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicForeignScan.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicIndexOnlyScan.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicIndexOnlyScan.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicIndexScan.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicIndexScan.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicTableScan.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerDynamicTableScan.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerEnumeratorConfig.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerEnumeratorConfig.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStats.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStats.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsDependencies.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsDependencies.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsDependency.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsDependency.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsInfo.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsInfo.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsNDistinct.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsNDistinct.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsNDistinctList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerExtStatsNDistinctList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerFactory.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerFactory.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerFilter.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerFilter.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerForeignScan.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerForeignScan.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerGatherMotion.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerGatherMotion.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerGroupingColList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerGroupingColList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHashExpr.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHashExpr.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHashExprList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHashExprList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHashJoin.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHashJoin.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHint.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerHint.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexCondList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexCondList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexDescr.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexDescr.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexOnlyScan.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexOnlyScan.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexScan.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerIndexScan.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLimit.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLimit.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTAS.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTAS.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTEAnchor.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTEAnchor.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTEConsumer.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTEConsumer.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTEProducer.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalCTEProducer.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalConstTable.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalConstTable.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalDelete.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalDelete.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalForeignGet.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalForeignGet.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalGet.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalGet.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalGroupBy.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalGroupBy.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalInsert.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalInsert.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalJoin.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalJoin.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalLimit.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalLimit.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalOp.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalOp.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalProject.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalProject.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalSelect.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalSelect.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalSetOp.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalSetOp.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalTVF.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalTVF.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalUpdate.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalUpdate.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalWindow.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerLogicalWindow.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDArrayCoerceCast.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDArrayCoerceCast.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDCast.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDCast.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBAgg.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBAgg.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBCheckConstraint.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBCheckConstraint.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBFunc.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBFunc.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBScalarOp.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDGPDBScalarOp.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDIndex.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDIndex.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDIndexInfoList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDIndexInfoList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDRelation.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDRelation.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDRelationCtas.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDRelationCtas.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDRequest.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDRequest.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDScCmp.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDScCmp.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDType.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMDType.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerManager.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerManager.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMaterialize.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMaterialize.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMergeJoin.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMergeJoin.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadata.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadata.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataColumn.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataColumn.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataColumns.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataColumns.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataIdList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataIdList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataObject.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerMetadataObject.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerNLJIndexParam.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerNLJIndexParam.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerNLJIndexParamList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerNLJIndexParamList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerNLJoin.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerNLJoin.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerOp.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerOp.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerOptimizerConfig.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerOptimizerConfig.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPartitionSelector.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPartitionSelector.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalAbstractBitmapScan.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalAbstractBitmapScan.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalBitmapTableScan.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalBitmapTableScan.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalCTAS.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalCTAS.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalCTEConsumer.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalCTEConsumer.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalCTEProducer.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalCTEProducer.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalDML.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalDML.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalDynamicBitmapTableScan.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalDynamicBitmapTableScan.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalOp.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalOp.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalSplit.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalSplit.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalTVF.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalTVF.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalWindow.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPhysicalWindow.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPlan.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPlan.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPlanHint.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerPlanHint.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerProjElem.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerProjElem.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerProjList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerProjList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerProperties.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerProperties.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerQuery.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerQuery.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerQueryOutput.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerQueryOutput.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRandomMotion.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRandomMotion.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRedistributeMotion.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRedistributeMotion.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRelStats.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRelStats.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRelationExtendedStats.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRelationExtendedStats.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerResult.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerResult.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRoutedMotion.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerRoutedMotion.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarAggref.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarAggref.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayCoerceExpr.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayCoerceExpr.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayComp.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayComp.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayRef.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayRef.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayRefIndexList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarArrayRefIndexList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarAssertConstraintList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarAssertConstraintList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBitmapBoolOp.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBitmapBoolOp.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBitmapIndexProbe.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBitmapIndexProbe.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBoolExpr.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBoolExpr.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBooleanTest.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarBooleanTest.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCaseTest.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCaseTest.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCast.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCast.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCoalesce.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCoalesce.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCoerceToDomain.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCoerceToDomain.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCoerceViaIO.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarCoerceViaIO.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarComp.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarComp.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarConstValue.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarConstValue.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarDMLAction.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarDMLAction.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarExpr.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarExpr.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarFieldSelect.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarFieldSelect.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarFuncExpr.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarFuncExpr.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarIdent.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarIdent.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarIfStmt.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarIfStmt.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarLimitCount.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarLimitCount.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarLimitOffset.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarLimitOffset.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarMinMax.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarMinMax.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarNullIf.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarNullIf.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarNullTest.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarNullTest.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarOp.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarOp.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarOpExpr.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarOpExpr.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarOpList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarOpList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarParam.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarParam.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarPartListNullTest.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarPartListNullTest.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarPartListValues.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarPartListValues.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSortGroupClause.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSortGroupClause.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlan.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlan.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlanParam.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlanParam.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlanParamList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlanParamList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlanTestExpr.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubPlanTestExpr.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubquery.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubquery.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubqueryExists.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubqueryExists.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubqueryQuantified.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSubqueryQuantified.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSwitch.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSwitch.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSwitchCase.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarSwitchCase.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarValuesList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarValuesList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarWindowFrameEdge.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarWindowFrameEdge.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarWindowRef.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerScalarWindowRef.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSearchStage.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSearchStage.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSearchStrategy.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSearchStrategy.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSequence.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSequence.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSort.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSort.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSortCol.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSortCol.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSortColList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerSortColList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStacktrace.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStacktrace.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatistics.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatistics.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatisticsConfig.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatisticsConfig.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatsBound.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatsBound.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatsDerivedColumn.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatsDerivedColumn.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatsDerivedRelation.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerStatsDerivedRelation.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerTableDescr.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerTableDescr.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerTableScan.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerTableScan.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerTraceFlags.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerTraceFlags.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerUtils.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerUtils.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerValuesScan.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerValuesScan.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowFrame.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowFrame.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowKey.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowKey.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowKeyList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowKeyList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowOids.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowOids.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowSpec.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowSpec.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowSpecList.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerWindowSpecList.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerXform.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/CParseHandlerXform.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/parser/parsehandlers.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/parser/parsehandlers.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/xml/CDXLMemoryManager.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/xml/CDXLMemoryManager.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/xml/CDXLSections.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/xml/CDXLSections.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/xml/CXMLSerializer.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/xml/CXMLSerializer.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/dxl/xml/dxltokens.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/dxl/xml/dxltokens.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/exception.h b/gpcontrib/orca/gporca/libnaucrates/include/naucrates/exception.h
similarity index 100%
rename from src/backend/gporca/libnaucrates/include/naucrates/exception.h
rename to gpcontrib/orca/gporca/libnaucrates/include/naucrates/exception.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/init.h b/gpcontrib/orca/gporca/libnaucrates/include/naucrates/init.h
similarity index 100%
rename from src/backend/gporca/libnaucrates/include/naucrates/init.h
rename to gpcontrib/orca/gporca/libnaucrates/include/naucrates/init.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CDXLBucket.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CDXLBucket.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CDXLColStats.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CDXLColStats.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CDXLExtStats.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CDXLExtStats.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CDXLExtStatsInfo.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CDXLExtStatsInfo.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CDXLRelStats.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CDXLRelStats.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CDXLStatsDerivedColumn.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CDXLStatsDerivedColumn.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CDXLStatsDerivedRelation.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CDXLStatsDerivedRelation.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CGPDBTypeHelper.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CGPDBTypeHelper.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDAggregateGPDB.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDAggregateGPDB.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDArrayCoerceCastGPDB.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDArrayCoerceCastGPDB.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDCastGPDB.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDCastGPDB.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDCheckConstraintGPDB.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDCheckConstraintGPDB.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDColumn.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDColumn.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDDependency.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDDependency.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDExtStatsInfo.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDExtStatsInfo.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDFunctionGPDB.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDFunctionGPDB.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDIdCast.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDIdCast.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDIdColStats.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDIdColStats.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDIdGPDB.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDIdGPDB.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDIdGPDBCtas.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDIdGPDBCtas.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDIdRelStats.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDIdRelStats.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDIdScCmp.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDIdScCmp.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDIndexGPDB.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDIndexGPDB.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDIndexInfo.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDIndexInfo.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDNDistinct.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDNDistinct.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDName.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDName.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDProviderGeneric.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDProviderGeneric.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDProviderMemory.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDProviderMemory.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDRelationCtasGPDB.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDRelationCtasGPDB.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDRelationGPDB.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDRelationGPDB.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDRequest.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDRequest.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDScCmpGPDB.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDScCmpGPDB.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDScalarOpGPDB.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDScalarOpGPDB.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDTypeBoolGPDB.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDTypeBoolGPDB.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDTypeGenericGPDB.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDTypeGenericGPDB.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDTypeInt2GPDB.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDTypeInt2GPDB.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDTypeInt4GPDB.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDTypeInt4GPDB.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDTypeInt8GPDB.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDTypeInt8GPDB.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CMDTypeOidGPDB.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CMDTypeOidGPDB.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/CSystemId.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/CSystemId.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDAggregate.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/IMDAggregate.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDCacheObject.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/IMDCacheObject.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDCast.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/IMDCast.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDCheckConstraint.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/IMDCheckConstraint.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDColStats.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/IMDColStats.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDColumn.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/IMDColumn.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDExtStats.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/IMDExtStats.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDExtStatsInfo.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/IMDExtStatsInfo.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDFunction.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/IMDFunction.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDId.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/IMDId.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDIndex.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/IMDIndex.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDInterface.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/IMDInterface.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDPartConstraint.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/IMDPartConstraint.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDProvider.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/IMDProvider.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDRelStats.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/IMDRelStats.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDRelation.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/IMDRelation.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDRelationCtas.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/IMDRelationCtas.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDScCmp.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/IMDScCmp.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDScalarOp.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/IMDScalarOp.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDType.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/IMDType.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDTypeBool.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/IMDTypeBool.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDTypeGeneric.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/IMDTypeGeneric.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDTypeInt2.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/IMDTypeInt2.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDTypeInt4.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/IMDTypeInt4.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDTypeInt8.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/IMDTypeInt8.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/md/IMDTypeOid.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/md/IMDTypeOid.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CBucket.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/CBucket.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CExtendedStatsProcessor.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/CExtendedStatsProcessor.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CFilterStatsProcessor.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/CFilterStatsProcessor.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CGroupByStatsProcessor.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/CGroupByStatsProcessor.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CHistogram.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/CHistogram.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CInnerJoinStatsProcessor.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/CInnerJoinStatsProcessor.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CJoinStatsProcessor.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/CJoinStatsProcessor.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CLeftAntiSemiJoinStatsProcessor.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/CLeftAntiSemiJoinStatsProcessor.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CLeftOuterJoinStatsProcessor.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/CLeftOuterJoinStatsProcessor.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CLeftSemiJoinStatsProcessor.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/CLeftSemiJoinStatsProcessor.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CLimitStatsProcessor.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/CLimitStatsProcessor.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CPoint.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/CPoint.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CProjectStatsProcessor.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/CProjectStatsProcessor.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CScaleFactorUtils.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/CScaleFactorUtils.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatistics.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/CStatistics.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatisticsUtils.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/CStatisticsUtils.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatsPred.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/CStatsPred.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatsPredArrayCmp.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/CStatsPredArrayCmp.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatsPredConj.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/CStatsPredConj.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatsPredDisj.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/CStatsPredDisj.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatsPredJoin.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/CStatsPredJoin.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatsPredLike.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/CStatsPredLike.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatsPredPoint.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/CStatsPredPoint.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatsPredUnsupported.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/CStatsPredUnsupported.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CStatsPredUtils.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/CStatsPredUtils.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CUnionAllStatsProcessor.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/CUnionAllStatsProcessor.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/CUpperBoundNDVs.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/CUpperBoundNDVs.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/IBucket.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/IBucket.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/statistics/IStatistics.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/statistics/IStatistics.h
diff --git a/src/backend/gporca/libnaucrates/include/naucrates/traceflags/traceflags.h b/gpcontrib/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/orca/gporca/libnaucrates/include/naucrates/traceflags/traceflags.h
diff --git a/src/backend/gporca/libnaucrates/src/CCostModelConfigSerializer.cpp b/gpcontrib/orca/gporca/libnaucrates/src/CCostModelConfigSerializer.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/CCostModelConfigSerializer.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/CCostModelConfigSerializer.cpp
diff --git a/src/backend/gporca/libnaucrates/src/CDXLUtils.cpp b/gpcontrib/orca/gporca/libnaucrates/src/CDXLUtils.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/CDXLUtils.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/CDXLUtils.cpp
diff --git a/src/backend/gporca/libnaucrates/src/CIdGenerator.cpp b/gpcontrib/orca/gporca/libnaucrates/src/CIdGenerator.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/CIdGenerator.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/CIdGenerator.cpp
diff --git a/src/backend/gporca/libnaucrates/src/base/CDatumBoolGPDB.cpp b/gpcontrib/orca/gporca/libnaucrates/src/base/CDatumBoolGPDB.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/base/CDatumBoolGPDB.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/base/CDatumBoolGPDB.cpp
diff --git a/src/backend/gporca/libnaucrates/src/base/CDatumGenericGPDB.cpp b/gpcontrib/orca/gporca/libnaucrates/src/base/CDatumGenericGPDB.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/base/CDatumGenericGPDB.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/base/CDatumGenericGPDB.cpp
diff --git a/src/backend/gporca/libnaucrates/src/base/CDatumInt2GPDB.cpp b/gpcontrib/orca/gporca/libnaucrates/src/base/CDatumInt2GPDB.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/base/CDatumInt2GPDB.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/base/CDatumInt2GPDB.cpp
diff --git a/src/backend/gporca/libnaucrates/src/base/CDatumInt4GPDB.cpp b/gpcontrib/orca/gporca/libnaucrates/src/base/CDatumInt4GPDB.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/base/CDatumInt4GPDB.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/base/CDatumInt4GPDB.cpp
diff --git a/src/backend/gporca/libnaucrates/src/base/CDatumInt8GPDB.cpp b/gpcontrib/orca/gporca/libnaucrates/src/base/CDatumInt8GPDB.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/base/CDatumInt8GPDB.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/base/CDatumInt8GPDB.cpp
diff --git a/src/backend/gporca/libnaucrates/src/base/CDatumOidGPDB.cpp b/gpcontrib/orca/gporca/libnaucrates/src/base/CDatumOidGPDB.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/base/CDatumOidGPDB.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/base/CDatumOidGPDB.cpp
diff --git a/src/backend/gporca/libnaucrates/src/base/CQueryToDXLResult.cpp b/gpcontrib/orca/gporca/libnaucrates/src/base/CQueryToDXLResult.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/base/CQueryToDXLResult.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/base/CQueryToDXLResult.cpp
diff --git a/src/backend/gporca/libnaucrates/src/base/IDatum.cpp b/gpcontrib/orca/gporca/libnaucrates/src/base/IDatum.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/base/IDatum.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/base/IDatum.cpp
diff --git a/src/backend/gporca/libnaucrates/src/exception.cpp b/gpcontrib/orca/gporca/libnaucrates/src/exception.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/exception.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/exception.cpp
diff --git a/src/backend/gporca/libnaucrates/src/init.cpp b/gpcontrib/orca/gporca/libnaucrates/src/init.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/init.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/init.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CDXLBucket.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CDXLBucket.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CDXLBucket.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CDXLBucket.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CDXLColStats.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CDXLColStats.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CDXLColStats.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CDXLColStats.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CDXLExtStats.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CDXLExtStats.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CDXLExtStats.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CDXLExtStats.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CDXLExtStatsInfo.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CDXLExtStatsInfo.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CDXLExtStatsInfo.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CDXLExtStatsInfo.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CDXLRelStats.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CDXLRelStats.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CDXLRelStats.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CDXLRelStats.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CDXLStatsDerivedColumn.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CDXLStatsDerivedColumn.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CDXLStatsDerivedColumn.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CDXLStatsDerivedColumn.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CDXLStatsDerivedRelation.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CDXLStatsDerivedRelation.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CDXLStatsDerivedRelation.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CDXLStatsDerivedRelation.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDAggregateGPDB.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDAggregateGPDB.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDAggregateGPDB.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDAggregateGPDB.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDArrayCoerceCastGPDB.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDArrayCoerceCastGPDB.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDArrayCoerceCastGPDB.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDArrayCoerceCastGPDB.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDCastGPDB.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDCastGPDB.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDCastGPDB.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDCastGPDB.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDCheckConstraintGPDB.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDCheckConstraintGPDB.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDCheckConstraintGPDB.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDCheckConstraintGPDB.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDColumn.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDColumn.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDColumn.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDColumn.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDExtStatsInfo.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDExtStatsInfo.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDExtStatsInfo.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDExtStatsInfo.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDFunctionGPDB.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDFunctionGPDB.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDFunctionGPDB.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDFunctionGPDB.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDIdCast.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDIdCast.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDIdCast.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDIdCast.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDIdColStats.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDIdColStats.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDIdColStats.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDIdColStats.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDIdGPDB.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDIdGPDB.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDIdGPDB.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDIdGPDB.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDIdGPDBCtas.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDIdGPDBCtas.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDIdGPDBCtas.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDIdGPDBCtas.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDIdRelStats.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDIdRelStats.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDIdRelStats.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDIdRelStats.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDIdScCmp.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDIdScCmp.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDIdScCmp.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDIdScCmp.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDIndexGPDB.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDIndexGPDB.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDIndexGPDB.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDIndexGPDB.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDIndexInfo.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDIndexInfo.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDIndexInfo.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDIndexInfo.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDName.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDName.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDName.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDName.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDProviderGeneric.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDProviderGeneric.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDProviderGeneric.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDProviderGeneric.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDProviderMemory.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDProviderMemory.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDProviderMemory.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDProviderMemory.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDRelationCtasGPDB.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDRelationCtasGPDB.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDRelationCtasGPDB.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDRelationCtasGPDB.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDRelationGPDB.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDRelationGPDB.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDRelationGPDB.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDRelationGPDB.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDRequest.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDRequest.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDRequest.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDRequest.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDScCmpGPDB.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDScCmpGPDB.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDScCmpGPDB.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDScCmpGPDB.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDScalarOpGPDB.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDScalarOpGPDB.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDScalarOpGPDB.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDScalarOpGPDB.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDTypeBoolGPDB.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDTypeBoolGPDB.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDTypeBoolGPDB.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDTypeBoolGPDB.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDTypeGenericGPDB.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDTypeGenericGPDB.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDTypeGenericGPDB.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDTypeGenericGPDB.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDTypeInt2GPDB.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDTypeInt2GPDB.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDTypeInt2GPDB.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDTypeInt2GPDB.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDTypeInt4GPDB.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDTypeInt4GPDB.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDTypeInt4GPDB.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDTypeInt4GPDB.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDTypeInt8GPDB.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDTypeInt8GPDB.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDTypeInt8GPDB.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDTypeInt8GPDB.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CMDTypeOidGPDB.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CMDTypeOidGPDB.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CMDTypeOidGPDB.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CMDTypeOidGPDB.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/CSystemId.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/CSystemId.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/CSystemId.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/CSystemId.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/IMDCacheObject.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/IMDCacheObject.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/IMDCacheObject.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/IMDCacheObject.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/IMDIndex.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/IMDIndex.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/IMDIndex.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/IMDIndex.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/IMDProvider.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/IMDProvider.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/IMDProvider.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/IMDProvider.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/IMDRelation.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/IMDRelation.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/IMDRelation.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/IMDRelation.cpp
diff --git a/src/backend/gporca/libnaucrates/src/md/IMDType.cpp b/gpcontrib/orca/gporca/libnaucrates/src/md/IMDType.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/md/IMDType.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/md/IMDType.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLColDescr.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLColDescr.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLColDescr.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLColDescr.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLColRef.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLColRef.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLColRef.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLColRef.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLCtasStorageOptions.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLCtasStorageOptions.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLCtasStorageOptions.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLCtasStorageOptions.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLDatum.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLDatum.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLDatum.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLDatum.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLDatumBool.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLDatumBool.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLDatumBool.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLDatumBool.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLDatumGeneric.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLDatumGeneric.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLDatumGeneric.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLDatumGeneric.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLDatumInt2.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLDatumInt2.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLDatumInt2.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLDatumInt2.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLDatumInt4.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLDatumInt4.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLDatumInt4.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLDatumInt4.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLDatumInt8.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLDatumInt8.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLDatumInt8.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLDatumInt8.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLDatumOid.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLDatumOid.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLDatumOid.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLDatumOid.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLDatumStatsDoubleMappable.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLDatumStatsDoubleMappable.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLDatumStatsDoubleMappable.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLDatumStatsDoubleMappable.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLDatumStatsLintMappable.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLDatumStatsLintMappable.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLDatumStatsLintMappable.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLDatumStatsLintMappable.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLDirectDispatchInfo.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLDirectDispatchInfo.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLDirectDispatchInfo.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLDirectDispatchInfo.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLIndexDescr.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLIndexDescr.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLIndexDescr.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLIndexDescr.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogical.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogical.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogical.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogical.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalCTAS.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalCTAS.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalCTAS.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalCTAS.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalCTEAnchor.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalCTEAnchor.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalCTEAnchor.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalCTEAnchor.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalCTEConsumer.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalCTEConsumer.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalCTEConsumer.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalCTEConsumer.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalCTEProducer.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalCTEProducer.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalCTEProducer.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalCTEProducer.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalConstTable.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalConstTable.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalConstTable.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalConstTable.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalDelete.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalDelete.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalDelete.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalDelete.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalForeignGet.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalForeignGet.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalForeignGet.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalForeignGet.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalGet.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalGet.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalGet.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalGet.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalGroupBy.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalGroupBy.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalGroupBy.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalGroupBy.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalInsert.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalInsert.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalInsert.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalInsert.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalJoin.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalJoin.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalJoin.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalJoin.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalLimit.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalLimit.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalLimit.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalLimit.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalProject.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalProject.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalProject.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalProject.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalSelect.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalSelect.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalSelect.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalSelect.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalSetOp.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalSetOp.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalSetOp.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalSetOp.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalTVF.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalTVF.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalTVF.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalTVF.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalUpdate.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalUpdate.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalUpdate.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalUpdate.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLLogicalWindow.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalWindow.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLLogicalWindow.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLLogicalWindow.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLNode.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLNode.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLNode.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLNode.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLOperator.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLOperator.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLOperator.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLOperator.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLOperatorCost.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLOperatorCost.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLOperatorCost.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLOperatorCost.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLOperatorFactory.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLOperatorFactory.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLOperatorFactory.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLOperatorFactory.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysical.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysical.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysical.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysical.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalAbstractBitmapScan.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalAbstractBitmapScan.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalAbstractBitmapScan.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalAbstractBitmapScan.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalAgg.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalAgg.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalAgg.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalAgg.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalAppend.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalAppend.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalAppend.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalAppend.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalAssert.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalAssert.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalAssert.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalAssert.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalBitmapTableScan.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalBitmapTableScan.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalBitmapTableScan.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalBitmapTableScan.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalBroadcastMotion.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalBroadcastMotion.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalBroadcastMotion.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalBroadcastMotion.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalCTAS.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalCTAS.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalCTAS.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalCTAS.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalCTEConsumer.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalCTEConsumer.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalCTEConsumer.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalCTEConsumer.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalCTEProducer.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalCTEProducer.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalCTEProducer.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalCTEProducer.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalDML.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalDML.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalDML.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalDML.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicBitmapTableScan.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicBitmapTableScan.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicBitmapTableScan.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicBitmapTableScan.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicForeignScan.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicForeignScan.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicForeignScan.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicForeignScan.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicIndexOnlyScan.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicIndexOnlyScan.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicIndexOnlyScan.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicIndexOnlyScan.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicIndexScan.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicIndexScan.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicIndexScan.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicIndexScan.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicTableScan.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicTableScan.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicTableScan.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalDynamicTableScan.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalForeignScan.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalForeignScan.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalForeignScan.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalForeignScan.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalGatherMotion.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalGatherMotion.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalGatherMotion.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalGatherMotion.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalHashJoin.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalHashJoin.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalHashJoin.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalHashJoin.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalIndexOnlyScan.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalIndexOnlyScan.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalIndexOnlyScan.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalIndexOnlyScan.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalIndexScan.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalIndexScan.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalIndexScan.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalIndexScan.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalJoin.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalJoin.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalJoin.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalJoin.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalLimit.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalLimit.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalLimit.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalLimit.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalMaterialize.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalMaterialize.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalMaterialize.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalMaterialize.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalMergeJoin.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalMergeJoin.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalMergeJoin.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalMergeJoin.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalMotion.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalMotion.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalMotion.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalMotion.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalNLJoin.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalNLJoin.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalNLJoin.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalNLJoin.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalPartitionSelector.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalPartitionSelector.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalPartitionSelector.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalPartitionSelector.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalProperties.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalProperties.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalProperties.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalProperties.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalRandomMotion.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalRandomMotion.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalRandomMotion.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalRandomMotion.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalRedistributeMotion.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalRedistributeMotion.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalRedistributeMotion.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalRedistributeMotion.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalResult.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalResult.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalResult.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalResult.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalRoutedDistributeMotion.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalRoutedDistributeMotion.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalRoutedDistributeMotion.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalRoutedDistributeMotion.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalSequence.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalSequence.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalSequence.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalSequence.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalSort.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalSort.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalSort.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalSort.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalSplit.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalSplit.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalSplit.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalSplit.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalTVF.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalTVF.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalTVF.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalTVF.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalTableScan.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalTableScan.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalTableScan.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalTableScan.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalValuesScan.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalValuesScan.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalValuesScan.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalValuesScan.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalWindow.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalWindow.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLPhysicalWindow.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLPhysicalWindow.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLProperties.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLProperties.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLProperties.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLProperties.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalar.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalar.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalar.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalar.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarAggref.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarAggref.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarAggref.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarAggref.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarArray.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarArray.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarArray.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarArray.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarArrayCoerceExpr.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarArrayCoerceExpr.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarArrayCoerceExpr.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarArrayCoerceExpr.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarArrayComp.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarArrayComp.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarArrayComp.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarArrayComp.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarArrayRef.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarArrayRef.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarArrayRef.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarArrayRef.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarArrayRefIndexList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarArrayRefIndexList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarArrayRefIndexList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarArrayRefIndexList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarAssertConstraint.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarAssertConstraint.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarAssertConstraint.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarAssertConstraint.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarAssertConstraintList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarAssertConstraintList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarAssertConstraintList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarAssertConstraintList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarBitmapBoolOp.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarBitmapBoolOp.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarBitmapBoolOp.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarBitmapBoolOp.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarBitmapIndexProbe.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarBitmapIndexProbe.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarBitmapIndexProbe.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarBitmapIndexProbe.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarBoolExpr.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarBoolExpr.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarBoolExpr.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarBoolExpr.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarBooleanTest.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarBooleanTest.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarBooleanTest.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarBooleanTest.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarCaseTest.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarCaseTest.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarCaseTest.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarCaseTest.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarCast.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarCast.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarCast.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarCast.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarCoalesce.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarCoalesce.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarCoalesce.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarCoalesce.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarCoerceBase.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarCoerceBase.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarCoerceBase.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarCoerceBase.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarCoerceToDomain.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarCoerceToDomain.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarCoerceToDomain.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarCoerceToDomain.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarCoerceViaIO.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarCoerceViaIO.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarCoerceViaIO.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarCoerceViaIO.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarComp.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarComp.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarComp.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarComp.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarConstValue.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarConstValue.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarConstValue.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarConstValue.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarDMLAction.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarDMLAction.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarDMLAction.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarDMLAction.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarDistinctComp.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarDistinctComp.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarDistinctComp.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarDistinctComp.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarFieldSelect.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarFieldSelect.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarFieldSelect.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarFieldSelect.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarFilter.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarFilter.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarFilter.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarFilter.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarFuncExpr.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarFuncExpr.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarFuncExpr.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarFuncExpr.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarHashCondList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarHashCondList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarHashCondList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarHashCondList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarHashExpr.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarHashExpr.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarHashExpr.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarHashExpr.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarHashExprList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarHashExprList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarHashExprList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarHashExprList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarIdent.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarIdent.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarIdent.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarIdent.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarIfStmt.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarIfStmt.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarIfStmt.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarIfStmt.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarIndexCondList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarIndexCondList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarIndexCondList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarIndexCondList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarJoinFilter.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarJoinFilter.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarJoinFilter.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarJoinFilter.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarLimitCount.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarLimitCount.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarLimitCount.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarLimitCount.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarLimitOffset.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarLimitOffset.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarLimitOffset.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarLimitOffset.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarMergeCondList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarMergeCondList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarMergeCondList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarMergeCondList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarMinMax.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarMinMax.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarMinMax.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarMinMax.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarNullIf.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarNullIf.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarNullIf.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarNullIf.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarNullTest.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarNullTest.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarNullTest.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarNullTest.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarOneTimeFilter.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarOneTimeFilter.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarOneTimeFilter.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarOneTimeFilter.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarOpExpr.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarOpExpr.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarOpExpr.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarOpExpr.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarOpList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarOpList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarOpList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarOpList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarParam.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarParam.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarParam.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarParam.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarProjElem.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarProjElem.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarProjElem.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarProjElem.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarProjList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarProjList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarProjList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarProjList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarRecheckCondFilter.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarRecheckCondFilter.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarRecheckCondFilter.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarRecheckCondFilter.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarSortCol.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarSortCol.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarSortCol.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarSortCol.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarSortColList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarSortColList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarSortColList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarSortColList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubPlan.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarSubPlan.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubPlan.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarSubPlan.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubquery.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarSubquery.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubquery.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarSubquery.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubqueryAll.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarSubqueryAll.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubqueryAll.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarSubqueryAll.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubqueryAny.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarSubqueryAny.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubqueryAny.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarSubqueryAny.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubqueryExists.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarSubqueryExists.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubqueryExists.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarSubqueryExists.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubqueryNotExists.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarSubqueryNotExists.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubqueryNotExists.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarSubqueryNotExists.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubqueryQuantified.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarSubqueryQuantified.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarSubqueryQuantified.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarSubqueryQuantified.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarSwitch.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarSwitch.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarSwitch.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarSwitch.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarSwitchCase.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarSwitchCase.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarSwitchCase.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarSwitchCase.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarValuesList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarValuesList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarValuesList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarValuesList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarWindowFrameEdge.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarWindowFrameEdge.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarWindowFrameEdge.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarWindowFrameEdge.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLScalarWindowRef.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarWindowRef.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLScalarWindowRef.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLScalarWindowRef.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLSpoolInfo.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLSpoolInfo.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLSpoolInfo.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLSpoolInfo.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLTableDescr.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLTableDescr.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLTableDescr.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLTableDescr.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLWindowFrame.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLWindowFrame.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLWindowFrame.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLWindowFrame.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLWindowKey.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLWindowKey.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLWindowKey.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLWindowKey.cpp
diff --git a/src/backend/gporca/libnaucrates/src/operators/CDXLWindowSpec.cpp b/gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLWindowSpec.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/operators/CDXLWindowSpec.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/operators/CDXLWindowSpec.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerAgg.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerAgg.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerAgg.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerAgg.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerAppend.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerAppend.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerAppend.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerAppend.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerArray.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerArray.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerArray.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerArray.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerAssert.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerAssert.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerAssert.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerAssert.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerBase.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerBase.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerBase.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerBase.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerBroadcastMotion.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerBroadcastMotion.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerBroadcastMotion.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerBroadcastMotion.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerCTEConfig.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerCTEConfig.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerCTEConfig.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerCTEConfig.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerCTEList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerCTEList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerCTEList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerCTEList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerColDescr.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerColDescr.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerColDescr.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerColDescr.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerColStats.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerColStats.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerColStats.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerColStats.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerColStatsBucket.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerColStatsBucket.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerColStatsBucket.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerColStatsBucket.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerCondList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerCondList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerCondList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerCondList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerCost.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerCost.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerCost.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerCost.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerCostModel.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerCostModel.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerCostModel.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerCostModel.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerCostParam.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerCostParam.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerCostParam.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerCostParam.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerCostParams.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerCostParams.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerCostParams.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerCostParams.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerCtasStorageOptions.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerCtasStorageOptions.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerCtasStorageOptions.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerCtasStorageOptions.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerDXL.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerDXL.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerDXL.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerDXL.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerDirectDispatchInfo.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerDirectDispatchInfo.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerDirectDispatchInfo.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerDirectDispatchInfo.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerDistinctComp.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerDistinctComp.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerDistinctComp.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerDistinctComp.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerDummy.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerDummy.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerDummy.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerDummy.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerDynamicForeignScan.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerDynamicForeignScan.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerDynamicForeignScan.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerDynamicForeignScan.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerDynamicIndexOnlyScan.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerDynamicIndexOnlyScan.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerDynamicIndexOnlyScan.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerDynamicIndexOnlyScan.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerDynamicIndexScan.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerDynamicIndexScan.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerDynamicIndexScan.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerDynamicIndexScan.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerDynamicTableScan.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerDynamicTableScan.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerDynamicTableScan.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerDynamicTableScan.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerEnumeratorConfig.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerEnumeratorConfig.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerEnumeratorConfig.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerEnumeratorConfig.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerExtStats.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerExtStats.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerExtStats.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerExtStats.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerExtStatsDependencies.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerExtStatsDependencies.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerExtStatsDependencies.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerExtStatsDependencies.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerExtStatsDependency.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerExtStatsDependency.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerExtStatsDependency.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerExtStatsDependency.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerExtStatsInfo.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerExtStatsInfo.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerExtStatsInfo.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerExtStatsInfo.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerExtStatsNDistinct.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerExtStatsNDistinct.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerExtStatsNDistinct.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerExtStatsNDistinct.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerExtStatsNDistinctList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerExtStatsNDistinctList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerExtStatsNDistinctList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerExtStatsNDistinctList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerFactory.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerFactory.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerFactory.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerFactory.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerFilter.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerFilter.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerFilter.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerFilter.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerForeignScan.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerForeignScan.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerForeignScan.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerForeignScan.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerGatherMotion.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerGatherMotion.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerGatherMotion.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerGatherMotion.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerGroupingColList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerGroupingColList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerGroupingColList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerGroupingColList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerHashExpr.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerHashExpr.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerHashExpr.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerHashExpr.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerHashExprList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerHashExprList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerHashExprList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerHashExprList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerHashJoin.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerHashJoin.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerHashJoin.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerHashJoin.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerHint.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerHint.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerHint.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerHint.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerIndexCondList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerIndexCondList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerIndexCondList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerIndexCondList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerIndexDescr.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerIndexDescr.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerIndexDescr.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerIndexDescr.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerIndexOnlyScan.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerIndexOnlyScan.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerIndexOnlyScan.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerIndexOnlyScan.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerIndexScan.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerIndexScan.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerIndexScan.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerIndexScan.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLimit.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLimit.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLimit.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLimit.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTAS.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTAS.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTAS.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTAS.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEAnchor.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEAnchor.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEAnchor.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEAnchor.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEConsumer.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEConsumer.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEConsumer.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEConsumer.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEProducer.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEProducer.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEProducer.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalCTEProducer.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalConstTable.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalConstTable.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalConstTable.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalConstTable.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalDelete.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalDelete.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalDelete.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalDelete.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalForeignGet.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalForeignGet.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalForeignGet.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalForeignGet.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalGet.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalGet.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalGet.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalGet.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalGroupBy.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalGroupBy.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalGroupBy.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalGroupBy.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalInsert.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalInsert.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalInsert.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalInsert.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalJoin.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalJoin.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalJoin.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalJoin.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalLimit.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalLimit.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalLimit.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalLimit.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalOp.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalOp.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalOp.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalOp.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalProject.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalProject.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalProject.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalProject.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalSelect.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalSelect.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalSelect.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalSelect.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalSetOp.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalSetOp.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalSetOp.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalSetOp.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalTVF.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalTVF.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalTVF.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalTVF.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalUpdate.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalUpdate.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalUpdate.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalUpdate.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalWindow.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalWindow.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerLogicalWindow.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerLogicalWindow.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDArrayCoerceCast.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMDArrayCoerceCast.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDArrayCoerceCast.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMDArrayCoerceCast.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDCast.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMDCast.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDCast.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMDCast.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBAgg.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBAgg.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBAgg.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBAgg.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBCheckConstraint.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBCheckConstraint.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBCheckConstraint.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBCheckConstraint.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBFunc.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBFunc.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBFunc.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBFunc.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBScalarOp.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBScalarOp.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBScalarOp.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMDGPDBScalarOp.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDIndex.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMDIndex.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDIndex.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMDIndex.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDIndexInfoList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMDIndexInfoList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDIndexInfoList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMDIndexInfoList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDRelation.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMDRelation.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDRelation.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMDRelation.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDRelationCtas.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMDRelationCtas.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDRelationCtas.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMDRelationCtas.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDRequest.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMDRequest.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDRequest.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMDRequest.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDScCmp.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMDScCmp.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDScCmp.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMDScCmp.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDType.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMDType.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMDType.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMDType.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerManager.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerManager.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerManager.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerManager.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMaterialize.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMaterialize.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMaterialize.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMaterialize.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMergeJoin.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMergeJoin.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMergeJoin.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMergeJoin.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMetadata.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMetadata.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMetadata.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMetadata.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMetadataColumn.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMetadataColumn.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMetadataColumn.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMetadataColumn.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMetadataColumns.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMetadataColumns.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMetadataColumns.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMetadataColumns.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMetadataIdList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMetadataIdList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMetadataIdList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMetadataIdList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerMetadataObject.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMetadataObject.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerMetadataObject.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerMetadataObject.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerNLJIndexParam.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerNLJIndexParam.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerNLJIndexParam.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerNLJIndexParam.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerNLJIndexParamList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerNLJIndexParamList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerNLJIndexParamList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerNLJIndexParamList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerNLJoin.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerNLJoin.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerNLJoin.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerNLJoin.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerOp.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerOp.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerOp.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerOp.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerOptimizerConfig.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerOptimizerConfig.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerOptimizerConfig.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerOptimizerConfig.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPartitionSelector.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPartitionSelector.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPartitionSelector.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPartitionSelector.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalAbstractBitmapScan.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalAbstractBitmapScan.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalAbstractBitmapScan.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalAbstractBitmapScan.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalBitmapTableScan.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalBitmapTableScan.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalBitmapTableScan.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalBitmapTableScan.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTAS.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTAS.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTAS.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTAS.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEConsumer.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEConsumer.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEConsumer.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEConsumer.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEProducer.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEProducer.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEProducer.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalCTEProducer.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalDML.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalDML.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalDML.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalDML.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalDynamicBitmapTableScan.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalDynamicBitmapTableScan.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalDynamicBitmapTableScan.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalDynamicBitmapTableScan.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalOp.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalOp.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalOp.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalOp.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalSplit.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalSplit.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalSplit.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalSplit.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalTVF.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalTVF.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalTVF.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalTVF.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalWindow.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalWindow.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPhysicalWindow.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPhysicalWindow.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPlan.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPlan.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPlan.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPlan.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerPlanHint.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPlanHint.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerPlanHint.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerPlanHint.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerProjElem.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerProjElem.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerProjElem.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerProjElem.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerProjList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerProjList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerProjList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerProjList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerProperties.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerProperties.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerProperties.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerProperties.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerQuery.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerQuery.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerQuery.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerQuery.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerQueryOutput.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerQueryOutput.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerQueryOutput.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerQueryOutput.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerRandomMotion.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerRandomMotion.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerRandomMotion.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerRandomMotion.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerRedistributeMotion.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerRedistributeMotion.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerRedistributeMotion.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerRedistributeMotion.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerRelStats.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerRelStats.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerRelStats.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerRelStats.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerRelationExtendedStats.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerRelationExtendedStats.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerRelationExtendedStats.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerRelationExtendedStats.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerResult.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerResult.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerResult.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerResult.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerRoutedMotion.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerRoutedMotion.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerRoutedMotion.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerRoutedMotion.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarAggref.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarAggref.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarAggref.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarAggref.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayCoerceExpr.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayCoerceExpr.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayCoerceExpr.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayCoerceExpr.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayComp.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayComp.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayComp.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayComp.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayRef.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayRef.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayRef.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayRef.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayRefIndexList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayRefIndexList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayRefIndexList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarArrayRefIndexList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarAssertConstraintList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarAssertConstraintList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarAssertConstraintList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarAssertConstraintList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarBitmapBoolOp.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarBitmapBoolOp.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarBitmapBoolOp.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarBitmapBoolOp.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarBitmapIndexProbe.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarBitmapIndexProbe.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarBitmapIndexProbe.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarBitmapIndexProbe.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarBoolExpr.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarBoolExpr.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarBoolExpr.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarBoolExpr.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarBooleanTest.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarBooleanTest.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarBooleanTest.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarBooleanTest.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarCaseTest.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarCaseTest.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarCaseTest.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarCaseTest.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarCast.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarCast.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarCast.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarCast.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarCoalesce.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarCoalesce.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarCoalesce.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarCoalesce.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarCoerceToDomain.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarCoerceToDomain.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarCoerceToDomain.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarCoerceToDomain.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarCoerceViaIO.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarCoerceViaIO.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarCoerceViaIO.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarCoerceViaIO.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarComp.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarComp.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarComp.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarComp.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarConstValue.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarConstValue.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarConstValue.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarConstValue.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarDMLAction.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarDMLAction.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarDMLAction.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarDMLAction.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarExpr.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarExpr.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarExpr.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarExpr.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarFieldSelect.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarFieldSelect.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarFieldSelect.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarFieldSelect.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarFuncExpr.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarFuncExpr.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarFuncExpr.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarFuncExpr.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarIdent.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarIdent.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarIdent.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarIdent.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarIfStmt.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarIfStmt.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarIfStmt.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarIfStmt.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarLimitCount.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarLimitCount.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarLimitCount.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarLimitCount.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarLimitOffset.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarLimitOffset.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarLimitOffset.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarLimitOffset.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarMinMax.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarMinMax.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarMinMax.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarMinMax.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarNullIf.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarNullIf.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarNullIf.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarNullIf.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarNullTest.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarNullTest.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarNullTest.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarNullTest.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarOp.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarOp.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarOp.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarOp.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarOpExpr.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarOpExpr.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarOpExpr.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarOpExpr.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarOpList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarOpList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarOpList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarOpList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarParam.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarParam.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarParam.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarParam.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSortGroupClause.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSortGroupClause.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSortGroupClause.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSortGroupClause.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlan.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlan.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlan.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlan.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanParam.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanParam.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanParam.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanParam.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanParamList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanParamList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanParamList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanParamList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanTestExpr.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanTestExpr.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanTestExpr.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubPlanTestExpr.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubquery.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubquery.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubquery.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubquery.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubqueryExists.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubqueryExists.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubqueryExists.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubqueryExists.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubqueryQuantified.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubqueryQuantified.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSubqueryQuantified.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSubqueryQuantified.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSwitch.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSwitch.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSwitch.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSwitch.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSwitchCase.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSwitchCase.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarSwitchCase.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarSwitchCase.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarValuesList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarValuesList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarValuesList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarValuesList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarWindowFrameEdge.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarWindowFrameEdge.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarWindowFrameEdge.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarWindowFrameEdge.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarWindowRef.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarWindowRef.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerScalarWindowRef.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerScalarWindowRef.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerSearchStage.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerSearchStage.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerSearchStage.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerSearchStage.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerSearchStrategy.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerSearchStrategy.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerSearchStrategy.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerSearchStrategy.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerSequence.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerSequence.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerSequence.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerSequence.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerSort.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerSort.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerSort.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerSort.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerSortCol.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerSortCol.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerSortCol.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerSortCol.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerSortColList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerSortColList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerSortColList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerSortColList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerStackTrace.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerStackTrace.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerStackTrace.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerStackTrace.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatistics.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerStatistics.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatistics.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerStatistics.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatisticsConfig.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerStatisticsConfig.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatisticsConfig.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerStatisticsConfig.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatsBound.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerStatsBound.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatsBound.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerStatsBound.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedColumn.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedColumn.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedColumn.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedColumn.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedRelation.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedRelation.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedRelation.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerStatsDerivedRelation.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerTableDescr.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerTableDescr.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerTableDescr.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerTableDescr.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerTableScan.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerTableScan.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerTableScan.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerTableScan.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerTraceFlags.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerTraceFlags.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerTraceFlags.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerTraceFlags.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerUtils.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerUtils.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerUtils.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerUtils.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerValuesScan.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerValuesScan.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerValuesScan.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerValuesScan.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerWindowFrame.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerWindowFrame.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerWindowFrame.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerWindowFrame.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerWindowKey.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerWindowKey.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerWindowKey.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerWindowKey.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerWindowKeyList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerWindowKeyList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerWindowKeyList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerWindowKeyList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerWindowOids.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerWindowOids.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerWindowOids.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerWindowOids.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerWindowSpec.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerWindowSpec.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerWindowSpec.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerWindowSpec.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerWindowSpecList.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerWindowSpecList.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerWindowSpecList.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerWindowSpecList.cpp
diff --git a/src/backend/gporca/libnaucrates/src/parser/CParseHandlerXform.cpp b/gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerXform.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/parser/CParseHandlerXform.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/parser/CParseHandlerXform.cpp
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CBucket.cpp b/gpcontrib/orca/gporca/libnaucrates/src/statistics/CBucket.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/statistics/CBucket.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/statistics/CBucket.cpp
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CExtendedStatsProcessor.cpp b/gpcontrib/orca/gporca/libnaucrates/src/statistics/CExtendedStatsProcessor.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/statistics/CExtendedStatsProcessor.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/statistics/CExtendedStatsProcessor.cpp
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CFilterStatsProcessor.cpp b/gpcontrib/orca/gporca/libnaucrates/src/statistics/CFilterStatsProcessor.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/statistics/CFilterStatsProcessor.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/statistics/CFilterStatsProcessor.cpp
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CGroupByStatsProcessor.cpp b/gpcontrib/orca/gporca/libnaucrates/src/statistics/CGroupByStatsProcessor.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/statistics/CGroupByStatsProcessor.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/statistics/CGroupByStatsProcessor.cpp
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CHistogram.cpp b/gpcontrib/orca/gporca/libnaucrates/src/statistics/CHistogram.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/statistics/CHistogram.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/statistics/CHistogram.cpp
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CInnerJoinStatsProcessor.cpp b/gpcontrib/orca/gporca/libnaucrates/src/statistics/CInnerJoinStatsProcessor.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/statistics/CInnerJoinStatsProcessor.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/statistics/CInnerJoinStatsProcessor.cpp
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CJoinStatsProcessor.cpp b/gpcontrib/orca/gporca/libnaucrates/src/statistics/CJoinStatsProcessor.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/statistics/CJoinStatsProcessor.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/statistics/CJoinStatsProcessor.cpp
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CLeftAntiSemiJoinStatsProcessor.cpp b/gpcontrib/orca/gporca/libnaucrates/src/statistics/CLeftAntiSemiJoinStatsProcessor.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/statistics/CLeftAntiSemiJoinStatsProcessor.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/statistics/CLeftAntiSemiJoinStatsProcessor.cpp
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CLeftOuterJoinStatsProcessor.cpp b/gpcontrib/orca/gporca/libnaucrates/src/statistics/CLeftOuterJoinStatsProcessor.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/statistics/CLeftOuterJoinStatsProcessor.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/statistics/CLeftOuterJoinStatsProcessor.cpp
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CLeftSemiJoinStatsProcessor.cpp b/gpcontrib/orca/gporca/libnaucrates/src/statistics/CLeftSemiJoinStatsProcessor.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/statistics/CLeftSemiJoinStatsProcessor.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/statistics/CLeftSemiJoinStatsProcessor.cpp
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CLimitStatsProcessor.cpp b/gpcontrib/orca/gporca/libnaucrates/src/statistics/CLimitStatsProcessor.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/statistics/CLimitStatsProcessor.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/statistics/CLimitStatsProcessor.cpp
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CPoint.cpp b/gpcontrib/orca/gporca/libnaucrates/src/statistics/CPoint.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/statistics/CPoint.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/statistics/CPoint.cpp
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CProjectStatsProcessor.cpp b/gpcontrib/orca/gporca/libnaucrates/src/statistics/CProjectStatsProcessor.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/statistics/CProjectStatsProcessor.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/statistics/CProjectStatsProcessor.cpp
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CScaleFactorUtils.cpp b/gpcontrib/orca/gporca/libnaucrates/src/statistics/CScaleFactorUtils.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/statistics/CScaleFactorUtils.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/statistics/CScaleFactorUtils.cpp
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CStatistics.cpp b/gpcontrib/orca/gporca/libnaucrates/src/statistics/CStatistics.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/statistics/CStatistics.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/statistics/CStatistics.cpp
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CStatisticsUtils.cpp b/gpcontrib/orca/gporca/libnaucrates/src/statistics/CStatisticsUtils.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/statistics/CStatisticsUtils.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/statistics/CStatisticsUtils.cpp
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CStatsPredArrayCmp.cpp b/gpcontrib/orca/gporca/libnaucrates/src/statistics/CStatsPredArrayCmp.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/statistics/CStatsPredArrayCmp.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/statistics/CStatsPredArrayCmp.cpp
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CStatsPredConj.cpp b/gpcontrib/orca/gporca/libnaucrates/src/statistics/CStatsPredConj.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/statistics/CStatsPredConj.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/statistics/CStatsPredConj.cpp
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CStatsPredDisj.cpp b/gpcontrib/orca/gporca/libnaucrates/src/statistics/CStatsPredDisj.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/statistics/CStatsPredDisj.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/statistics/CStatsPredDisj.cpp
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CStatsPredLike.cpp b/gpcontrib/orca/gporca/libnaucrates/src/statistics/CStatsPredLike.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/statistics/CStatsPredLike.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/statistics/CStatsPredLike.cpp
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CStatsPredPoint.cpp b/gpcontrib/orca/gporca/libnaucrates/src/statistics/CStatsPredPoint.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/statistics/CStatsPredPoint.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/statistics/CStatsPredPoint.cpp
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CStatsPredUnsupported.cpp b/gpcontrib/orca/gporca/libnaucrates/src/statistics/CStatsPredUnsupported.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/statistics/CStatsPredUnsupported.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/statistics/CStatsPredUnsupported.cpp
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CStatsPredUtils.cpp b/gpcontrib/orca/gporca/libnaucrates/src/statistics/CStatsPredUtils.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/statistics/CStatsPredUtils.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/statistics/CStatsPredUtils.cpp
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CUnionAllStatsProcessor.cpp b/gpcontrib/orca/gporca/libnaucrates/src/statistics/CUnionAllStatsProcessor.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/statistics/CUnionAllStatsProcessor.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/statistics/CUnionAllStatsProcessor.cpp
diff --git a/src/backend/gporca/libnaucrates/src/statistics/CUpperBoundNDVs.cpp b/gpcontrib/orca/gporca/libnaucrates/src/statistics/CUpperBoundNDVs.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/statistics/CUpperBoundNDVs.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/statistics/CUpperBoundNDVs.cpp
diff --git a/src/backend/gporca/libnaucrates/src/traceflags.cpp b/gpcontrib/orca/gporca/libnaucrates/src/traceflags.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/traceflags.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/traceflags.cpp
diff --git a/src/backend/gporca/libnaucrates/src/xml/CDXLMemoryManager.cpp b/gpcontrib/orca/gporca/libnaucrates/src/xml/CDXLMemoryManager.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/xml/CDXLMemoryManager.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/xml/CDXLMemoryManager.cpp
diff --git a/src/backend/gporca/libnaucrates/src/xml/CDXLSections.cpp b/gpcontrib/orca/gporca/libnaucrates/src/xml/CDXLSections.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/xml/CDXLSections.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/xml/CDXLSections.cpp
diff --git a/src/backend/gporca/libnaucrates/src/xml/CXMLSerializer.cpp b/gpcontrib/orca/gporca/libnaucrates/src/xml/CXMLSerializer.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/xml/CXMLSerializer.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/xml/CXMLSerializer.cpp
diff --git a/src/backend/gporca/libnaucrates/src/xml/dxltokens.cpp b/gpcontrib/orca/gporca/libnaucrates/src/xml/dxltokens.cpp
similarity index 100%
rename from src/backend/gporca/libnaucrates/src/xml/dxltokens.cpp
rename to gpcontrib/orca/gporca/libnaucrates/src/xml/dxltokens.cpp
diff --git a/src/backend/gporca/scripts/cal_bitmap_test.py b/gpcontrib/orca/gporca/scripts/cal_bitmap_test.py
similarity index 100%
rename from src/backend/gporca/scripts/cal_bitmap_test.py
rename to gpcontrib/orca/gporca/scripts/cal_bitmap_test.py
diff --git a/src/backend/gporca/scripts/convert_minirepro_5_to_6.py b/gpcontrib/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/orca/gporca/scripts/convert_minirepro_5_to_6.py
diff --git a/src/backend/gporca/scripts/convert_minirepro_6_to_7.py b/gpcontrib/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/orca/gporca/scripts/convert_minirepro_6_to_7.py
diff --git a/src/backend/gporca/scripts/dxl_modify_partitioned_index.py b/gpcontrib/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/orca/gporca/scripts/dxl_modify_partitioned_index.py
diff --git a/src/backend/gporca/scripts/fix_lookup_failure.py b/gpcontrib/orca/gporca/scripts/fix_lookup_failure.py
similarity index 100%
rename from src/backend/gporca/scripts/fix_lookup_failure.py
rename to gpcontrib/orca/gporca/scripts/fix_lookup_failure.py
diff --git a/src/backend/gporca/scripts/fix_mdps.py b/gpcontrib/orca/gporca/scripts/fix_mdps.py
similarity index 100%
rename from src/backend/gporca/scripts/fix_mdps.py
rename to gpcontrib/orca/gporca/scripts/fix_mdps.py
diff --git a/src/backend/gporca/scripts/get_debug_event_counters.py b/gpcontrib/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/orca/gporca/scripts/get_debug_event_counters.py
diff --git a/src/backend/gporca/scripts/tests/test_cal_bitmap_test.py b/gpcontrib/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/orca/gporca/scripts/tests/test_cal_bitmap_test.py
diff --git a/src/backend/gporca/server/CMakeLists.txt b/gpcontrib/orca/gporca/server/CMakeLists.txt
similarity index 100%
rename from src/backend/gporca/server/CMakeLists.txt
rename to gpcontrib/orca/gporca/server/CMakeLists.txt
diff --git a/src/backend/gporca/server/dxl.xsd b/gpcontrib/orca/gporca/server/dxl.xsd
similarity index 100%
rename from src/backend/gporca/server/dxl.xsd
rename to gpcontrib/orca/gporca/server/dxl.xsd
diff --git a/src/backend/gporca/server/fixdxl.sh b/gpcontrib/orca/gporca/server/fixdxl.sh
similarity index 100%
rename from src/backend/gporca/server/fixdxl.sh
rename to gpcontrib/orca/gporca/server/fixdxl.sh
diff --git a/src/backend/gporca/server/include/unittest/base.h b/gpcontrib/orca/gporca/server/include/unittest/base.h
similarity index 100%
rename from src/backend/gporca/server/include/unittest/base.h
rename to gpcontrib/orca/gporca/server/include/unittest/base.h
diff --git a/src/backend/gporca/server/include/unittest/dxl/CDXLMemoryManagerTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/dxl/CDXLMemoryManagerTest.h
diff --git a/src/backend/gporca/server/include/unittest/dxl/CDXLUtilsTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/dxl/CDXLUtilsTest.h
diff --git a/src/backend/gporca/server/include/unittest/dxl/CParseHandlerCostModelTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/dxl/CParseHandlerCostModelTest.h
diff --git a/src/backend/gporca/server/include/unittest/dxl/CParseHandlerManagerTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/dxl/CParseHandlerManagerTest.h
diff --git a/src/backend/gporca/server/include/unittest/dxl/CParseHandlerOptimizerConfigSerializeTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/dxl/CParseHandlerOptimizerConfigSerializeTest.h
diff --git a/src/backend/gporca/server/include/unittest/dxl/CParseHandlerTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/dxl/CParseHandlerTest.h
diff --git a/src/backend/gporca/server/include/unittest/dxl/CXMLSerializerTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/dxl/CXMLSerializerTest.h
diff --git a/src/backend/gporca/server/include/unittest/dxl/base/CDatumTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/dxl/base/CDatumTest.h
diff --git a/src/backend/gporca/server/include/unittest/dxl/statistics/CBucketTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/dxl/statistics/CBucketTest.h
diff --git a/src/backend/gporca/server/include/unittest/dxl/statistics/CCardinalityTestUtils.h b/gpcontrib/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/orca/gporca/server/include/unittest/dxl/statistics/CCardinalityTestUtils.h
diff --git a/src/backend/gporca/server/include/unittest/dxl/statistics/CFilterCardinalityTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/dxl/statistics/CFilterCardinalityTest.h
diff --git a/src/backend/gporca/server/include/unittest/dxl/statistics/CHistogramTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/dxl/statistics/CHistogramTest.h
diff --git a/src/backend/gporca/server/include/unittest/dxl/statistics/CJoinCardinalityTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/dxl/statistics/CJoinCardinalityTest.h
diff --git a/src/backend/gporca/server/include/unittest/dxl/statistics/CMCVTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/dxl/statistics/CMCVTest.h
diff --git a/src/backend/gporca/server/include/unittest/dxl/statistics/CPointTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/dxl/statistics/CPointTest.h
diff --git a/src/backend/gporca/server/include/unittest/dxl/statistics/CStatisticsTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/dxl/statistics/CStatisticsTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/CConstExprEvaluatorForDates.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/CConstExprEvaluatorForDates.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/CSubqueryTestUtils.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/CSubqueryTestUtils.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/CTestUtils.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/CTestUtils.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/base/CColRefSetIterTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/base/CColRefSetIterTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/base/CColRefSetTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/base/CColRefSetTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/base/CColumnFactoryTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/base/CColumnFactoryTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/base/CConstraintTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/base/CConstraintTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/base/CDistributionSpecTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/base/CDistributionSpecTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/base/CEquivalenceClassesTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/base/CEquivalenceClassesTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/base/CFunctionalDependencyTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/base/CFunctionalDependencyTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/base/CGroupTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/base/CGroupTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/base/CKeyCollectionTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/base/CKeyCollectionTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/base/CMaxCardTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/base/CMaxCardTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/base/COrderSpecTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/base/COrderSpecTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/base/CRangeTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/base/CRangeTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/base/CStateMachineTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/base/CStateMachineTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/cost/CCostTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/cost/CCostTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/csq/CCorrelatedExecutionTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/csq/CCorrelatedExecutionTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/engine/CBindingTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/engine/CBindingTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/engine/CEngineTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/engine/CEngineTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/engine/CEnumeratorTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/engine/CEnumeratorTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/eval/CConstExprEvaluatorDXLTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/eval/CConstExprEvaluatorDXLTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/eval/CConstExprEvaluatorDefaultTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/eval/CConstExprEvaluatorDefaultTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/mdcache/CMDAccessorTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/mdcache/CMDAccessorTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/mdcache/CMDProviderTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/mdcache/CMDProviderTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/metadata/CColumnDescriptorTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/metadata/CColumnDescriptorTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/metadata/CIndexDescriptorTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/metadata/CIndexDescriptorTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/metadata/CNameTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/metadata/CNameTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/metadata/CTableDescriptorTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/metadata/CTableDescriptorTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CAggTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/minidump/CAggTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CArrayExpansionTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/minidump/CArrayExpansionTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CBitmapTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/minidump/CBitmapTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CCTETest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/minidump/CCTETest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CCastTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/minidump/CCastTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CCollapseProjectTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/minidump/CCollapseProjectTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CConstTblGetTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/minidump/CConstTblGetTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CDMLTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/minidump/CDMLTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CDirectDispatchTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/minidump/CDirectDispatchTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CEscapeMechanismTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/minidump/CEscapeMechanismTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CExternalTableTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/minidump/CExternalTableTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CICGTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/minidump/CICGTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CJoinOrderDPTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/minidump/CJoinOrderDPTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CMiniDumperDXLTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/minidump/CMiniDumperDXLTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CMinidumpWithConstExprEvaluatorTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/minidump/CMinidumpWithConstExprEvaluatorTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CMissingStatsTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/minidump/CMissingStatsTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CMultilevelPartitionTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/minidump/CMultilevelPartitionTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CPhysicalParallelUnionAllTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/minidump/CPhysicalParallelUnionAllTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CPruneColumnsTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/minidump/CPruneColumnsTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CPullUpProjectElementTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/minidump/CPullUpProjectElementTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CSubqueryTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/minidump/CSubqueryTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CTVFTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/minidump/CTVFTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/minidump/CWindowTest.h b/gpcontrib/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/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/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/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/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/orca/gporca/server/include/unittest/gpopt/operators/CContradictionTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/operators/CExpressionPreprocessorTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/operators/CExpressionPreprocessorTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/operators/CExpressionTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/operators/CExpressionTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/operators/CLogicalGbAggTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/operators/CLogicalGbAggTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/operators/CPredicateUtilsTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/operators/CPredicateUtilsTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/operators/CScalarIsDistinctFromTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/operators/CScalarIsDistinctFromTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/search/COptimizationJobsTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/search/COptimizationJobsTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/search/CSearchStrategyTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/search/CSearchStrategyTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/search/CTreeMapTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/search/CTreeMapTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/translate/CTranslatorDXLToExprTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/translate/CTranslatorDXLToExprTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/translate/CTranslatorExprToDXLTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/translate/CTranslatorExprToDXLTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/xforms/CDecorrelatorTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/xforms/CDecorrelatorTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/xforms/CJoinOrderTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/xforms/CJoinOrderTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/xforms/CSubqueryHandlerTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/xforms/CSubqueryHandlerTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/xforms/CXformFactoryTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/xforms/CXformFactoryTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/xforms/CXformRightOuterJoin2HashJoinTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/xforms/CXformRightOuterJoin2HashJoinTest.h
diff --git a/src/backend/gporca/server/include/unittest/gpopt/xforms/CXformTest.h b/gpcontrib/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/orca/gporca/server/include/unittest/gpopt/xforms/CXformTest.h
diff --git a/src/backend/gporca/server/src/startup/main.cpp b/gpcontrib/orca/gporca/server/src/startup/main.cpp
similarity index 100%
rename from src/backend/gporca/server/src/startup/main.cpp
rename to gpcontrib/orca/gporca/server/src/startup/main.cpp
diff --git a/src/backend/gporca/server/src/unittest/CConstExprEvaluatorForDates.cpp b/gpcontrib/orca/gporca/server/src/unittest/CConstExprEvaluatorForDates.cpp
similarity index 100%
rename from src/backend/gporca/server/src/unittest/CConstExprEvaluatorForDates.cpp
rename to gpcontrib/orca/gporca/server/src/unittest/CConstExprEvaluatorForDates.cpp
diff --git a/src/backend/gporca/server/src/unittest/CSubqueryTestUtils.cpp b/gpcontrib/orca/gporca/server/src/unittest/CSubqueryTestUtils.cpp
similarity index 100%
rename from src/backend/gporca/server/src/unittest/CSubqueryTestUtils.cpp
rename to gpcontrib/orca/gporca/server/src/unittest/CSubqueryTestUtils.cpp
diff --git a/src/backend/gporca/server/src/unittest/CTestUtils.cpp b/gpcontrib/orca/gporca/server/src/unittest/CTestUtils.cpp
similarity index 100%
rename from src/backend/gporca/server/src/unittest/CTestUtils.cpp
rename to gpcontrib/orca/gporca/server/src/unittest/CTestUtils.cpp
diff --git a/src/backend/gporca/server/src/unittest/dxl/CDXLMemoryManagerTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/dxl/CDXLMemoryManagerTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/dxl/CDXLUtilsTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/dxl/CDXLUtilsTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/dxl/CMDProviderTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/dxl/CMDProviderTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/dxl/CParseHandlerCostModelTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/dxl/CParseHandlerCostModelTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/dxl/CParseHandlerManagerTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/dxl/CParseHandlerManagerTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/dxl/CParseHandlerOptimizerConfigSerializeTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/dxl/CParseHandlerOptimizerConfigSerializeTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/dxl/CParseHandlerTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/dxl/CParseHandlerTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/dxl/CXMLSerializerTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/dxl/CXMLSerializerTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/dxl/base/CDatumTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/dxl/base/CDatumTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/dxl/statistics/CBucketTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/dxl/statistics/CBucketTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/dxl/statistics/CCardinalityTestUtils.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/dxl/statistics/CCardinalityTestUtils.cpp
diff --git a/src/backend/gporca/server/src/unittest/dxl/statistics/CFilterCardinalityTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/dxl/statistics/CFilterCardinalityTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/dxl/statistics/CHistogramTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/dxl/statistics/CHistogramTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/dxl/statistics/CJoinCardinalityTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/dxl/statistics/CJoinCardinalityTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/dxl/statistics/CMCVTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/dxl/statistics/CMCVTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/dxl/statistics/CPointTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/dxl/statistics/CPointTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/dxl/statistics/CStatisticsTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/dxl/statistics/CStatisticsTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CColRefSetIterTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/base/CColRefSetIterTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CColRefSetTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/base/CColRefSetTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CColumnFactoryTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/base/CColumnFactoryTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CConstraintTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/base/CConstraintTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CDistributionSpecTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/base/CDistributionSpecTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CEquivalenceClassesTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/base/CEquivalenceClassesTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CFunctionalDependencyTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/base/CFunctionalDependencyTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CGroupTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/base/CGroupTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CKeyCollectionTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/base/CKeyCollectionTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CMaxCardTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/base/CMaxCardTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/COrderSpecTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/base/COrderSpecTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CRangeTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/base/CRangeTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/base/CStateMachineTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/base/CStateMachineTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/cost/CCostTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/cost/CCostTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/csq/CCorrelatedExecutionTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/csq/CCorrelatedExecutionTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/engine/CBindingTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/engine/CBindingTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/engine/CEngineTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/engine/CEngineTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/engine/CEnumeratorTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/engine/CEnumeratorTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/eval/CConstExprEvaluatorDXLTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/eval/CConstExprEvaluatorDXLTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/eval/CConstExprEvaluatorDefaultTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/eval/CConstExprEvaluatorDefaultTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/mdcache/CMDAccessorTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/mdcache/CMDAccessorTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/metadata/CColumnDescriptorTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/metadata/CColumnDescriptorTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/metadata/CIndexDescriptorTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/metadata/CIndexDescriptorTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/metadata/CNameTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/metadata/CNameTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/metadata/CTableDescriptorTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/metadata/CTableDescriptorTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CAggTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/minidump/CAggTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CArrayExpansionTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/minidump/CArrayExpansionTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CBitmapTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/minidump/CBitmapTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CCTETest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/minidump/CCTETest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CCastTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/minidump/CCastTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CCollapseProjectTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/minidump/CCollapseProjectTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CConstTblGetTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/minidump/CConstTblGetTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CDMLTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/minidump/CDMLTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CDirectDispatchTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/minidump/CDirectDispatchTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CEscapeMechanismTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/minidump/CEscapeMechanismTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CExternalTableTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/minidump/CExternalTableTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CICGTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/minidump/CICGTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CJoinOrderDPTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/minidump/CJoinOrderDPTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CMiniDumperDXLTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/minidump/CMiniDumperDXLTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CMinidumpWithConstExprEvaluatorTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/minidump/CMinidumpWithConstExprEvaluatorTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CMissingStatsTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/minidump/CMissingStatsTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CMultilevelPartitionTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/minidump/CMultilevelPartitionTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CPhysicalParallelUnionAllTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/minidump/CPhysicalParallelUnionAllTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CPruneColumnsTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/minidump/CPruneColumnsTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CPullUpProjectElementTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/minidump/CPullUpProjectElementTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CSubqueryTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/minidump/CSubqueryTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CTVFTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/minidump/CTVFTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/minidump/CWindowTest.cpp b/gpcontrib/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/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/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/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/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/orca/gporca/server/src/unittest/gpopt/operators/CContradictionTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/operators/CExpressionPreprocessorTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/operators/CExpressionPreprocessorTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/operators/CExpressionTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/operators/CExpressionTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/operators/CLogicalGbAggTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/operators/CLogicalGbAggTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/operators/CPredicateUtilsTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/operators/CPredicateUtilsTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/operators/CScalarIsDistinctFromTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/operators/CScalarIsDistinctFromTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/search/COptimizationJobsTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/search/COptimizationJobsTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/search/CSearchStrategyTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/search/CSearchStrategyTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/search/CTreeMapTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/search/CTreeMapTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/translate/CTranslatorDXLToExprTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/translate/CTranslatorDXLToExprTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/translate/CTranslatorExprToDXLTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/translate/CTranslatorExprToDXLTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/xforms/CDecorrelatorTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/xforms/CDecorrelatorTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/xforms/CJoinOrderTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/xforms/CJoinOrderTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/xforms/CSubqueryHandlerTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/xforms/CSubqueryHandlerTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/xforms/CXformFactoryTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/xforms/CXformFactoryTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/xforms/CXformRightOuterJoin2HashJoinTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/xforms/CXformRightOuterJoin2HashJoinTest.cpp
diff --git a/src/backend/gporca/server/src/unittest/gpopt/xforms/CXformTest.cpp b/gpcontrib/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/orca/gporca/server/src/unittest/gpopt/xforms/CXformTest.cpp
diff --git a/src/include/gpopt/.clang-format b/gpcontrib/orca/include/gpopt/.clang-format
similarity index 100%
rename from src/include/gpopt/.clang-format
rename to gpcontrib/orca/include/gpopt/.clang-format
diff --git a/src/include/gpopt/CGPOptimizer.h b/gpcontrib/orca/include/gpopt/CGPOptimizer.h
similarity index 100%
rename from src/include/gpopt/CGPOptimizer.h
rename to gpcontrib/orca/include/gpopt/CGPOptimizer.h
diff --git a/src/include/gpopt/config/CConfigParamMapping.h b/gpcontrib/orca/include/gpopt/config/CConfigParamMapping.h
similarity index 100%
rename from src/include/gpopt/config/CConfigParamMapping.h
rename to gpcontrib/orca/include/gpopt/config/CConfigParamMapping.h
diff --git a/src/include/gpopt/gpdbwrappers.h b/gpcontrib/orca/include/gpopt/gpdbwrappers.h
similarity index 100%
rename from src/include/gpopt/gpdbwrappers.h
rename to gpcontrib/orca/include/gpopt/gpdbwrappers.h
diff --git a/src/include/gpopt/relcache/CMDProviderRelcache.h b/gpcontrib/orca/include/gpopt/relcache/CMDProviderRelcache.h
similarity index 100%
rename from src/include/gpopt/relcache/CMDProviderRelcache.h
rename to gpcontrib/orca/include/gpopt/relcache/CMDProviderRelcache.h
diff --git a/src/include/gpopt/translate/CCTEListEntry.h b/gpcontrib/orca/include/gpopt/translate/CCTEListEntry.h
similarity index 100%
rename from src/include/gpopt/translate/CCTEListEntry.h
rename to gpcontrib/orca/include/gpopt/translate/CCTEListEntry.h
diff --git a/src/include/gpopt/translate/CContextDXLToPlStmt.h b/gpcontrib/orca/include/gpopt/translate/CContextDXLToPlStmt.h
similarity index 100%
rename from src/include/gpopt/translate/CContextDXLToPlStmt.h
rename to gpcontrib/orca/include/gpopt/translate/CContextDXLToPlStmt.h
diff --git a/src/include/gpopt/translate/CContextQueryToDXL.h b/gpcontrib/orca/include/gpopt/translate/CContextQueryToDXL.h
similarity index 100%
rename from src/include/gpopt/translate/CContextQueryToDXL.h
rename to gpcontrib/orca/include/gpopt/translate/CContextQueryToDXL.h
diff --git a/src/include/gpopt/translate/CDXLTranslateContext.h b/gpcontrib/orca/include/gpopt/translate/CDXLTranslateContext.h
similarity index 100%
rename from src/include/gpopt/translate/CDXLTranslateContext.h
rename to gpcontrib/orca/include/gpopt/translate/CDXLTranslateContext.h
diff --git a/src/include/gpopt/translate/CDXLTranslateContextBaseTable.h b/gpcontrib/orca/include/gpopt/translate/CDXLTranslateContextBaseTable.h
similarity index 100%
rename from src/include/gpopt/translate/CDXLTranslateContextBaseTable.h
rename to gpcontrib/orca/include/gpopt/translate/CDXLTranslateContextBaseTable.h
diff --git a/src/include/gpopt/translate/CGPDBAttInfo.h b/gpcontrib/orca/include/gpopt/translate/CGPDBAttInfo.h
similarity index 100%
rename from src/include/gpopt/translate/CGPDBAttInfo.h
rename to gpcontrib/orca/include/gpopt/translate/CGPDBAttInfo.h
diff --git a/src/include/gpopt/translate/CGPDBAttOptCol.h b/gpcontrib/orca/include/gpopt/translate/CGPDBAttOptCol.h
similarity index 100%
rename from src/include/gpopt/translate/CGPDBAttOptCol.h
rename to gpcontrib/orca/include/gpopt/translate/CGPDBAttOptCol.h
diff --git a/src/include/gpopt/translate/CIndexQualInfo.h b/gpcontrib/orca/include/gpopt/translate/CIndexQualInfo.h
similarity index 100%
rename from src/include/gpopt/translate/CIndexQualInfo.h
rename to gpcontrib/orca/include/gpopt/translate/CIndexQualInfo.h
diff --git a/src/include/gpopt/translate/CMappingColIdVar.h b/gpcontrib/orca/include/gpopt/translate/CMappingColIdVar.h
similarity index 100%
rename from src/include/gpopt/translate/CMappingColIdVar.h
rename to gpcontrib/orca/include/gpopt/translate/CMappingColIdVar.h
diff --git a/src/include/gpopt/translate/CMappingColIdVarPlStmt.h b/gpcontrib/orca/include/gpopt/translate/CMappingColIdVarPlStmt.h
similarity index 100%
rename from src/include/gpopt/translate/CMappingColIdVarPlStmt.h
rename to gpcontrib/orca/include/gpopt/translate/CMappingColIdVarPlStmt.h
diff --git a/src/include/gpopt/translate/CMappingElementColIdParamId.h b/gpcontrib/orca/include/gpopt/translate/CMappingElementColIdParamId.h
similarity index 100%
rename from src/include/gpopt/translate/CMappingElementColIdParamId.h
rename to gpcontrib/orca/include/gpopt/translate/CMappingElementColIdParamId.h
diff --git a/src/include/gpopt/translate/CMappingVarColId.h b/gpcontrib/orca/include/gpopt/translate/CMappingVarColId.h
similarity index 100%
rename from src/include/gpopt/translate/CMappingVarColId.h
rename to gpcontrib/orca/include/gpopt/translate/CMappingVarColId.h
diff --git a/src/include/gpopt/translate/COptColInfo.h b/gpcontrib/orca/include/gpopt/translate/COptColInfo.h
similarity index 100%
rename from src/include/gpopt/translate/COptColInfo.h
rename to gpcontrib/orca/include/gpopt/translate/COptColInfo.h
diff --git a/src/include/gpopt/translate/CPartPruneStepsBuilder.h b/gpcontrib/orca/include/gpopt/translate/CPartPruneStepsBuilder.h
similarity index 100%
rename from src/include/gpopt/translate/CPartPruneStepsBuilder.h
rename to gpcontrib/orca/include/gpopt/translate/CPartPruneStepsBuilder.h
diff --git a/src/include/gpopt/translate/CQueryMutators.h b/gpcontrib/orca/include/gpopt/translate/CQueryMutators.h
similarity index 100%
rename from src/include/gpopt/translate/CQueryMutators.h
rename to gpcontrib/orca/include/gpopt/translate/CQueryMutators.h
diff --git a/src/include/gpopt/translate/CTranslatorDXLToPlStmt.h b/gpcontrib/orca/include/gpopt/translate/CTranslatorDXLToPlStmt.h
similarity index 100%
rename from src/include/gpopt/translate/CTranslatorDXLToPlStmt.h
rename to gpcontrib/orca/include/gpopt/translate/CTranslatorDXLToPlStmt.h
diff --git a/src/include/gpopt/translate/CTranslatorDXLToScalar.h b/gpcontrib/orca/include/gpopt/translate/CTranslatorDXLToScalar.h
similarity index 100%
rename from src/include/gpopt/translate/CTranslatorDXLToScalar.h
rename to gpcontrib/orca/include/gpopt/translate/CTranslatorDXLToScalar.h
diff --git a/src/include/gpopt/translate/CTranslatorQueryToDXL.h b/gpcontrib/orca/include/gpopt/translate/CTranslatorQueryToDXL.h
similarity index 100%
rename from src/include/gpopt/translate/CTranslatorQueryToDXL.h
rename to gpcontrib/orca/include/gpopt/translate/CTranslatorQueryToDXL.h
diff --git a/src/include/gpopt/translate/CTranslatorRelcacheToDXL.h b/gpcontrib/orca/include/gpopt/translate/CTranslatorRelcacheToDXL.h
similarity index 100%
rename from src/include/gpopt/translate/CTranslatorRelcacheToDXL.h
rename to gpcontrib/orca/include/gpopt/translate/CTranslatorRelcacheToDXL.h
diff --git a/src/include/gpopt/translate/CTranslatorScalarToDXL.h b/gpcontrib/orca/include/gpopt/translate/CTranslatorScalarToDXL.h
similarity index 100%
rename from src/include/gpopt/translate/CTranslatorScalarToDXL.h
rename to gpcontrib/orca/include/gpopt/translate/CTranslatorScalarToDXL.h
diff --git a/src/include/gpopt/translate/CTranslatorUtils.h b/gpcontrib/orca/include/gpopt/translate/CTranslatorUtils.h
similarity index 100%
rename from src/include/gpopt/translate/CTranslatorUtils.h
rename to gpcontrib/orca/include/gpopt/translate/CTranslatorUtils.h
diff --git a/src/include/gpopt/utils/CConstExprEvaluatorProxy.h b/gpcontrib/orca/include/gpopt/utils/CConstExprEvaluatorProxy.h
similarity index 100%
rename from src/include/gpopt/utils/CConstExprEvaluatorProxy.h
rename to gpcontrib/orca/include/gpopt/utils/CConstExprEvaluatorProxy.h
diff --git a/src/include/gpopt/utils/CMemoryPoolPalloc.h b/gpcontrib/orca/include/gpopt/utils/CMemoryPoolPalloc.h
similarity index 100%
rename from src/include/gpopt/utils/CMemoryPoolPalloc.h
rename to gpcontrib/orca/include/gpopt/utils/CMemoryPoolPalloc.h
diff --git a/src/include/gpopt/utils/CMemoryPoolPallocManager.h b/gpcontrib/orca/include/gpopt/utils/CMemoryPoolPallocManager.h
similarity index 100%
rename from src/include/gpopt/utils/CMemoryPoolPallocManager.h
rename to gpcontrib/orca/include/gpopt/utils/CMemoryPoolPallocManager.h
diff --git a/src/include/gpopt/utils/COptTasks.h b/gpcontrib/orca/include/gpopt/utils/COptTasks.h
similarity index 100%
rename from src/include/gpopt/utils/COptTasks.h
rename to gpcontrib/orca/include/gpopt/utils/COptTasks.h
diff --git a/src/include/gpopt/utils/RelationWrapper.h b/gpcontrib/orca/include/gpopt/utils/RelationWrapper.h
similarity index 100%
rename from src/include/gpopt/utils/RelationWrapper.h
rename to gpcontrib/orca/include/gpopt/utils/RelationWrapper.h
diff --git a/src/include/gpopt/utils/funcs.h b/gpcontrib/orca/include/gpopt/utils/funcs.h
similarity index 100%
rename from src/include/gpopt/utils/funcs.h
rename to gpcontrib/orca/include/gpopt/utils/funcs.h
diff --git a/src/include/gpopt/utils/gpdbdefs.h b/gpcontrib/orca/include/gpopt/utils/gpdbdefs.h
similarity index 100%
rename from src/include/gpopt/utils/gpdbdefs.h
rename to gpcontrib/orca/include/gpopt/utils/gpdbdefs.h
diff --git a/src/include/optimizer/orca.h b/gpcontrib/orca/include/optimizer/orca.h
similarity index 93%
rename from src/include/optimizer/orca.h
rename to gpcontrib/orca/include/optimizer/orca.h
index e6507977bcac..cef5e379766c 100644
--- a/src/include/optimizer/orca.h
+++ b/gpcontrib/orca/include/optimizer/orca.h
@@ -19,7 +19,7 @@
 
 #include "pg_config.h"
 
-#ifdef USE_ORCA
+extern PGDLLIMPORT MemoryContext OptimizerMemoryContext;
 
 extern PlannedStmt * optimize_query(Query *parse, int cursorOptions, ParamListInfo boundParams);
 extern Node *transformGroupedWindows(Node *node, void *context);
@@ -29,6 +29,4 @@ extern void TerminateGPOPT();
 
 extern char *SerializeDXLPlan(Query *parse);
 
-#endif
-
 #endif /* ORCA_H */
diff --git a/gpcontrib/orca/orca.c b/gpcontrib/orca/orca.c
index 786d0a585f23..94953c557b35 100644
--- a/gpcontrib/orca/orca.c
+++ b/gpcontrib/orca/orca.c
@@ -15,6 +15,8 @@
 
 PG_MODULE_MAGIC;
 
+MemoryContext OptimizerMemoryContext = NULL;
+
 void _PG_init(void);
 void _PG_fini(void);
 
diff --git a/src/backend/optimizer/plan/orca.c b/gpcontrib/orca/orca_entry.c
similarity index 99%
rename from src/backend/optimizer/plan/orca.c
rename to gpcontrib/orca/orca_entry.c
index b2994ba39f1f..cd8a031bc4be 100644
--- a/src/backend/optimizer/plan/orca.c
+++ b/gpcontrib/orca/orca_entry.c
@@ -14,7 +14,7 @@
  *
  *
  * IDENTIFICATION
- *	  src/backend/optimizer/plan/orca.c
+ *	  gpcontrib/orca/orca_entry.c
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/tools/fmt b/gpcontrib/orca/tools/fmt
similarity index 85%
rename from src/tools/fmt
rename to gpcontrib/orca/tools/fmt
index 86bd0a6e7805..2282e57876f0 100755
--- a/src/tools/fmt
+++ b/gpcontrib/orca/tools/fmt
@@ -1,15 +1,15 @@
 #!/usr/bin/env bash
 
-# src/tools/fmt
+# gpcontrib/orca/tools/fmt
 
 set -e -u -o pipefail
 
 # This script formats (or checks) C++ code with clang-format in the following
 # locations:
 #
-# src/backend/gpopt
-# src/include/gpopt
-# src/backend/gporca
+# gpcontrib/orca/gpopt
+# gpcontrib/orca/include/gpopt
+# gpcontrib/orca/gporca
 #
 # To generate the expanded configuration file for a change in intent:
 # $ fmt gen
@@ -23,7 +23,7 @@ set -e -u -o pipefail
 # If the name of your clang-format executable isn't "clang-format", you can
 # override it in the CLANG_FORMAT environment variable.
 #
-# For more about ORCA's format, see src/backend/gporca/README.format.md
+# For more about ORCA's format, see gpcontrib/orca/gporca/README.format.md
 
 
 # we use mapfile from Bash 4.0, but it's sufficiently likely that *someone* on
@@ -31,7 +31,7 @@ set -e -u -o pipefail
 # against it.
 if ((BASH_VERSINFO[0] < 4)); then false; fi
 
-readonly INTENT=src/backend/gporca/clang-format.intent.yaml
+readonly INTENT=gpcontrib/orca/gporca/clang-format.intent.yaml
 : "${CLANG_FORMAT:=clang-format}"
 
 gen() {
@@ -43,7 +43,7 @@ gen() {
 	# do not squish the assignment into the declaration, as that will swallow
 	# errors in the subshell
 	local _find_result
-	_find_result=$(find src/backend/gporca -name .clang-format)
+	_find_result=$(find gpcontrib/orca/gporca -name .clang-format)
 	mapfile -t CLANG_FORMAT_CONFIG_FILES <<<$_find_result
 
 	(
@@ -64,7 +64,7 @@ files_to_format() {
 	# do not squish the assignment into the declaration, as that will swallow
 	# errors in the subshell
 	local _find_result
-	_find_result=$(find src/backend/gporca src/backend/gpopt src/include/gpopt -name .clang-format)
+	_find_result=$(find gpcontrib/orca/gporca gpcontrib/orca/gpopt gpcontrib/orca/include/gpopt -name .clang-format)
 	mapfile -t CLANG_FORMAT_CONFIG_FILES <<<$_find_result
 
 	local -a CF_DIRS PATTERNS
diff --git a/src/tools/tidy b/gpcontrib/orca/tools/tidy
similarity index 76%
rename from src/tools/tidy
rename to gpcontrib/orca/tools/tidy
index 66c2abb28e1d..a2186956fa39 100755
--- a/src/tools/tidy
+++ b/gpcontrib/orca/tools/tidy
@@ -1,25 +1,25 @@
 #!/usr/bin/env bash
 
-# src/tools/tidy
+# gpcontrib/orca/tools/tidy
 
 # This script checks C++ code with clang-tidy in the following location:
 #
-# src/backend/gporca
+# gpcontrib/orca/gporca
 #
 # To genarate a CMake build directory with compilation database:
 #
 # for debug build:
 #
-# $ CXX=clang++ cmake -GNinja -Hsrc/backend/gporca -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug -Bbuild.debug
+# $ CXX=clang++ cmake -GNinja -Hgpcontrib/orca/gporca -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=Debug -Bbuild.debug
 #
 # and release:
 #
-# $ CXX=clang++ cmake -GNinja -Hsrc/backend/gporca -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -Bbuild.release
+# $ CXX=clang++ cmake -GNinja -Hgpcontrib/orca/gporca -DCMAKE_EXPORT_COMPILE_COMMANDS=ON -DCMAKE_BUILD_TYPE=RelWithDebInfo -Bbuild.release
 #
 # To check (it's unsurprising if we pass the check in one configuration but not another)
-# $ src/tools/tidy chk-orca build.debug
+# $ gpcontrib/orca/tools/tidy chk-orca build.debug
 # and
-# $ src/tools/tidy chk-orca build.release
+# $ gpcontrib/orca/tools/tidy chk-orca build.release
 #
 # If clang-tidy is under a different name, or it's not in your PATH, specify it
 # in the CLANG_TIDY environment variable.
@@ -29,7 +29,7 @@
 #   Debian derivatives: apt install clang-tidy
 #   Or consult your operating system's package manager
 #
-# For more details about running clang-tidy against ORCA, see src/backend/gporca/README.tidy.md
+# For more details about running clang-tidy against ORCA, see gpcontrib/orca/gporca/README.tidy.md
 
 set -e -u -o pipefail
 
@@ -79,11 +79,11 @@ die() {
 
 # NUL-delimited list of files to tidy
 orca_files_to_tidy() {
-	git ls-files -z 'src/backend/gporca/*.cpp'
+	git ls-files -z 'gpcontrib/orca/gporca/*.cpp'
 }
 
 gpopt_files_to_tidy() {
-	git ls-files -z 'src/backend/gpopt/*.cpp'
+	git ls-files -z 'gpcontrib/orca/gpopt/*.cpp'
 }
 
 _main() {
diff --git a/src/backend/Makefile b/src/backend/Makefile
index 0b6e485ebbc4..bf427371ece3 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -24,9 +24,6 @@ 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 +245,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
@@ -259,8 +252,7 @@ install-bin: install-postgres-bitcode
 # GPDB: Bitcode generation in certain subdir can be avoid when `with_llvm = no`
 # set there. But the install step is not aware of the setting and would fail if
 # we don't tell it the absence of *.bc files under those directory manually.
-# As we set ORCA to generate no bitcodes, ORCA directories is excluded here.
-bitcode_ignored_subdirs = $(top_builddir)/src/timezone gporca gpopt
+bitcode_ignored_subdirs = $(top_builddir)/src/timezone
 
 install-postgres-bitcode: $(OBJS) all
 	$(call install_llvm_module,postgres,$(call expand_subsys, $(filter-out $(bitcode_ignored_subdirs:%=%/objfiles.txt), $(SUBDIROBJS))))
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 d80a77d98d8c..000000000000
--- a/src/backend/gpopt/gpopt.mk
+++ /dev/null
@@ -1,11 +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)
-
-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/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 9701ee563d53..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 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/mock.mk b/src/backend/mock.mk
index 0dc24b354350..775f01ae15a1 100644
--- a/src/backend/mock.mk
+++ b/src/backend/mock.mk
@@ -25,12 +25,6 @@ EXCL_OBJS=\
 	src/backend/main/main.o \
 	src/backend/access/transam/rmgr.o \
 	src/backend/utils/fmgrtab.o \
-	src/backend/gpopt/%.o \
-	src/backend/gpopt/config/%.o \
-	src/backend/gpopt/relcache/%.o \
-	src/backend/gpopt/translate/%.o \
-	src/backend/gpopt/utils/%.o \
-	src/backend/gporca/%.o \
 
 # More files that are not linked into test programs. There's no particular
 # reason these couldn't be linked into, if necessary, but currently none of
@@ -91,11 +85,6 @@ MOCK_OBJS=\
 	$(top_srcdir)/src/test/unit/mock/fmgrtab_mock.o \
 	$(top_srcdir)/src/test/unit/mock/rmgr_mock.o \
 	$(top_srcdir)/src/test/unit/mock/main_mock.o
-# No test programs currently exercise the ORCA translator library, so
-# mock that instead of linking with the real library.
-ifeq ($(enable_orca),yes)
-MOCK_OBJS+=$(top_srcdir)/src/test/unit/mock/gpopt_mock.o
-endif
 
 # $(OBJFILES) contains %/objfiles.txt, because src/backend/Makefile will
 # create it with rule=objfiles.txt, which is not expected in postgres rule.
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/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c
index be19a72e9b17..c0b3799499c0 100644
--- a/src/backend/utils/mmgr/mcxt.c
+++ b/src/backend/utils/mmgr/mcxt.c
@@ -68,7 +68,6 @@ MemoryContext TopTransactionContext = NULL;
 MemoryContext CurTransactionContext = NULL;
 MemoryContext DispatcherContext = NULL;
 MemoryContext InterconnectContext = NULL;
-MemoryContext OptimizerMemoryContext = NULL;
 
 /* This is a transient link to the active portal's memory context: */
 MemoryContext PortalContext = NULL;
diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
index 40be202ec1a5..251ae005f94a 100644
--- a/src/include/utils/memutils.h
+++ b/src/include/utils/memutils.h
@@ -91,7 +91,6 @@ extern PGDLLIMPORT MemoryContext TopTransactionContext;
 extern PGDLLIMPORT MemoryContext CurTransactionContext;
 extern PGDLLIMPORT MemoryContext DispatcherContext;
 extern PGDLLIMPORT MemoryContext InterconnectContext;
-extern PGDLLIMPORT MemoryContext OptimizerMemoryContext;
 
 /* This is a transient link to the active portal's memory context: */
 extern PGDLLIMPORT MemoryContext PortalContext;
diff --git a/src/test/unit/mock/gpopt_mock.c b/src/test/unit/mock/gpopt_mock.c
deleted file mode 100644
index ed525e818664..000000000000
--- a/src/test/unit/mock/gpopt_mock.c
+++ /dev/null
@@ -1,53 +0,0 @@
-#include "postgres.h"
-
-#include "fmgr.h"
-#include "lib/stringinfo.h"
-#include "nodes/parsenodes.h"
-#include "nodes/plannodes.h"
-
-char *
-SerializeDXLPlan(Query *pquery)
-{
-	elog(ERROR, "mock implementation of SerializeDXLPlan called");
-	return NULL;
-}
-
-PlannedStmt *
-GPOPTOptimizedPlan(Query *pquery, bool pfUnexpectedFailure)
-{
-	elog(ERROR, "mock implementation of GPOPTOptimizedPlan called");
-	return NULL;
-}
-
-Datum
-LibraryVersion(void)
-{
-	elog(ERROR, "mock implementation of LibraryVersion called");
-	return (Datum) 0;
-}
-
-Datum
-EnableXform(PG_FUNCTION_ARGS)
-{
-	elog(ERROR, "mock implementation of EnableXform called");
-	return (Datum) 0;
-}
-
-Datum
-DisableXform(PG_FUNCTION_ARGS)
-{
-	elog(ERROR, "mock implementation of EnableXform called");
-	return (Datum) 0;
-}
-
-void
-InitGPOPT ()
-{
-	elog(ERROR, "mock implementation of InitGPOPT called");
-}
-
-void
-TerminateGPOPT ()
-{
-	elog(ERROR, "mock implementation of TerminateGPOPT called");
-}

From 5c94ce76b7f28eb17664d4d0d2a728a9549919b9 Mon Sep 17 00:00:00 2001
From: Roman Eskin <r.eskin@arenadata.io>
Date: Tue, 17 Dec 2024 14:25:20 +1000
Subject: [PATCH 13/17] Fix 'gpconfig' behave test (#1158)

Problem:
After recent changes related to moving Orca into a shared lib, 'gpconfig'
behave test started to fail.

Cause:
Fail could be reproduced with the following commands:
"gpconfig -c optimizer -v on"
"gpstop -ar"

'gpconfig' alters 'postgresql.conf' by adding 'optimizer = on' there. So, the
issue appeared when we tried to set 'optimizer' GUC from the 'postgresql.conf'
file. At this moment shared preload libraries are yet not processed, so the
planner hook is yet not registered. It led to an error in 'check_optimizer()'
validation function when setting 'optimizer'.

Fix:
In case planner hook is not registered, issue an error in 'check_optimizer()'
only if source is more than PGC_S_ARGV. So, for cases when 'optimizer' is set
from the config file, env variable or postmaster's cmd argument, we allow
setting 'optimizer' to 'on' even if planner hook is yet not registered, as it
can't be registered at this stage, only later.
---
 src/backend/utils/misc/guc_gp.c | 23 ++++++++++++++++++-----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/backend/utils/misc/guc_gp.c b/src/backend/utils/misc/guc_gp.c
index 1850364c89e0..80b583d0785d 100644
--- a/src/backend/utils/misc/guc_gp.c
+++ b/src/backend/utils/misc/guc_gp.c
@@ -5169,13 +5169,26 @@ check_optimizer(bool *newval, void **extra, GucSource source)
 			*newval = false;
 		else if (NULL == planner_hook)
 		{
+			if (source > PGC_S_ARGV)
+			{
+				/*
+				 * Assume that, if no planner_hook is registered for the
+				 * coordinator, we can use only standard Postgres planner.
+				 * Thus, forbid setting the GUC.
+				 */
+				GUC_check_errmsg("External planner is not registered");
+				return false;
+			}
+
 			/*
-			 * Assume that, if no planner_hook is registered for the
-			 * coordinator, we can use only standard Postgres planner.
-			 * Thus, forbid setting the GUC.
+			 * But in case GUC source <= PGC_S_ARGV, this function may be called
+			 * before external planner is loaded from a shared lib. For ex.,
+			 * user may set the GUC in 'postgresql.conf', so system will try to
+			 * apply the GUC before the init of shared libs. We need to allow
+			 * such cases, assuming that the user knows what he is doing.
 			 */
-			GUC_check_errmsg("External planner is not registered");
-			return false;
+			elog(LOG, "'optimizer' is explicitly set to 'on'. "
+					  "Please ensure that an external planner is added to 'shared_preload_libraries'");
 		}
 	}
 

From d7c3ceac2f1a3bca322c47cb42649dff1b5afe8e Mon Sep 17 00:00:00 2001
From: Roman Eskin <r.eskin@arenadata.io>
Date: Tue, 24 Dec 2024 22:24:26 +1000
Subject: [PATCH 14/17] Remove generation of USE_ORCA define (#1169)

USE_ORCA define is no longer used. This patch removes generation of this define.
File 'configure.in' is modified manually. Other files are re-generated by
'autoconf' and 'autoheader' tools.
---
 configure                  | 6 +-----
 configure.in               | 4 +---
 src/include/pg_config.h.in | 3 ---
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/configure b/configure
index ccfdcbd78cf0..684c4b634e44 100755
--- a/configure
+++ b/configure
@@ -7905,9 +7905,7 @@ if test "${enable_orca+set}" = set; then :
   enableval=$enable_orca;
   case $enableval in
     yes)
-
-$as_echo "#define USE_ORCA 1" >>confdefs.h
-
+      :
       ;;
     no)
       :
@@ -7920,8 +7918,6 @@ $as_echo "#define USE_ORCA 1" >>confdefs.h
 else
   enable_orca=yes
 
-$as_echo "#define USE_ORCA 1" >>confdefs.h
-
 fi
 
 
diff --git a/configure.in b/configure.in
index 8b65a463e85f..020836803934 100644
--- a/configure.in
+++ b/configure.in
@@ -787,9 +787,7 @@ PGAC_ARG_BOOL(enable, cassert, no, [enable assertion checks (for debugging)],
 #
 # Enable GPORCA optimizer
 #
-PGAC_ARG_BOOL(enable, orca, yes, [disable ORCA optimizer],
-              [AC_DEFINE([USE_ORCA], 1,
-                         [Define to 1 to build with Greenplum ORCA optimizer. (--enable-orca)])])
+PGAC_ARG_BOOL(enable, orca, yes, [disable ORCA optimizer])
 AC_MSG_RESULT([checking whether to build with ORCA... $enable_orca])
 AC_SUBST(enable_orca)
 
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
index 42ac57063911..cb8de7e5b8df 100644
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -1017,9 +1017,6 @@
 /* Define to use OpenSSL for random number generation */
 #undef USE_OPENSSL_RANDOM
 
-/* Define to 1 to build with Greenplum ORCA optimizer. (--enable-orca) */
-#undef USE_ORCA
-
 /* Define to 1 to build with PAM support. (--with-pam) */
 #undef USE_PAM
 

From 341d342a1daedb928a5b3ca081ba00c90aba94ce Mon Sep 17 00:00:00 2001
From: Roman Eskin <r.eskin@arenadata.io>
Date: Wed, 25 Dec 2024 21:28:53 +1000
Subject: [PATCH 15/17] Move Orca's GUCs into the extension (#1167)

Move Orca's GUCs into the extension

This patch:
1. Moves all GUCs, that are related to Orca and used inside it, into Orca
extension.
2. Updates minirepro utility tool. This tool generates a detailed information
related to the monitored SQL commands being executed, including non-default
GUCs. The patch updates the query used to retrieve non-default GUCs. The update
is needed, as, after moving the "optimizer_*" GUCs, their 'category' in
'pg_settings' table had been changed to 'Customized Options' value. Without this
change the respective regression test 'minirepro' fails.
3. Adds all the touched GUC names into the file with ignored symbols for ABI
check, as they no longer exist in the main executable.
4. Removes GUC 'optimizer_partition_selection_log' completely, as it is not used
anywhere.

Note. Following GUCs were not moved, as they are used inside the core:
 - 'optimizer_enable_query_parameter'
 - 'optimizer_analyze_root_partition'
 - 'optimizer_analyze_midlevel_partition'
 - 'optimizer_replicated_table_insert'
 - 'optimizer'
 - 'optimizer_control'
---
 .../7.2.0_arenadata7/postgres.symbols.ignore  |  121 ++
 gpMgmt/bin/minirepro                          |    2 +-
 gpcontrib/orca/Makefile                       |    1 +
 gpcontrib/orca/include/gpopt/utils/gpdbdefs.h |    1 +
 gpcontrib/orca/include/optimizer/orca_guc.h   |  156 ++
 gpcontrib/orca/orca.c                         |   10 +
 gpcontrib/orca/orca_entry.c                   |    1 +
 gpcontrib/orca/orca_guc.c                     | 1432 ++++++++++++++++
 src/backend/utils/misc/guc_gp.c               | 1453 +----------------
 src/include/jit/jit.h                         |    5 -
 src/include/utils/guc.h                       |  161 +-
 src/include/utils/sync_guc_name.h             |    3 -
 src/include/utils/unsync_guc_name.h           |  112 --
 13 files changed, 1750 insertions(+), 1708 deletions(-)
 create mode 100644 gpcontrib/orca/include/optimizer/orca_guc.h
 create mode 100644 gpcontrib/orca/orca_guc.c

diff --git a/.abi-check/7.2.0_arenadata7/postgres.symbols.ignore b/.abi-check/7.2.0_arenadata7/postgres.symbols.ignore
index e2b55ff6c813..0cfd275b1e4e 100644
--- a/.abi-check/7.2.0_arenadata7/postgres.symbols.ignore
+++ b/.abi-check/7.2.0_arenadata7/postgres.symbols.ignore
@@ -3,3 +3,124 @@ optimize_query
 transformGroupedWindows
 optopt@@GLIBC_2.2.5
 optopt
+optimizer_log
+optimizer_log_failure
+optimizer_trace_fallback
+optimizer_minidump
+optimizer_cost_model
+optimizer_metadata_caching
+optimizer_mdcache_size
+optimizer_print_query
+optimizer_print_plan
+optimizer_print_xform
+optimizer_print_memo_after_exploration
+optimizer_print_memo_after_implementation
+optimizer_print_memo_after_optimization
+optimizer_print_job_scheduler
+optimizer_print_expression_properties
+optimizer_print_group_properties
+optimizer_print_optimization_context
+optimizer_print_optimization_stats
+optimizer_print_xform_results
+optimizer_xforms
+optimizer_search_strategy_path
+optimizer_enable_nljoin
+optimizer_enable_indexjoin
+optimizer_enable_motions_coordinatoronly_queries
+optimizer_enable_motions
+optimizer_enable_motion_broadcast
+optimizer_enable_motion_gather
+optimizer_enable_motion_redistribute
+optimizer_enable_sort
+optimizer_enable_materialize
+optimizer_enable_partition_propagation
+optimizer_enable_partition_selection
+optimizer_enable_outerjoin_rewrite
+optimizer_enable_multiple_distinct_aggs
+optimizer_enable_hashjoin_redistribute_broadcast_children
+optimizer_enable_broadcast_nestloop_outer_child
+optimizer_discard_redistribute_hashjoin
+optimizer_enable_streaming_material
+optimizer_enable_gather_on_segment_for_dml
+optimizer_enable_assert_maxonerow
+optimizer_enable_constant_expression_evaluation
+optimizer_enable_bitmapscan
+optimizer_enable_outerjoin_to_unionall_rewrite
+optimizer_enable_ctas
+optimizer_enable_dml
+optimizer_enable_dml_constraints
+optimizer_enable_direct_dispatch
+optimizer_enable_coordinator_only_queries
+optimizer_enable_hashjoin
+optimizer_enable_dynamictablescan
+optimizer_enable_dynamicindexscan
+optimizer_enable_dynamicindexonlyscan
+optimizer_enable_dynamicbitmapscan
+optimizer_enable_indexscan
+optimizer_enable_indexonlyscan
+optimizer_enable_tablescan
+optimizer_enable_eageragg
+optimizer_enable_orderedagg
+optimizer_expand_fulljoin
+optimizer_enable_hashagg
+optimizer_enable_groupagg
+optimizer_enable_mergejoin
+optimizer_enable_redistribute_nestloop_loj_inner_child
+optimizer_force_comprehensive_join_implementation
+optimizer_enable_replicated_table
+optimizer_enable_foreign_table
+optimizer_enable_right_outer_join
+optimizer_enumerate_plans
+optimizer_sample_plans
+optimizer_plan_id
+optimizer_samples_number
+optimizer_jit_above_cost
+optimizer_jit_inline_above_cost
+optimizer_jit_optimize_above_cost
+optimizer_extract_dxl_stats
+optimizer_extract_dxl_stats_all_nodes
+optimizer_print_missing_stats
+optimizer_damping_factor_filter
+optimizer_damping_factor_join
+optimizer_damping_factor_groupby
+optimizer_dpe_stats
+optimizer_enable_derive_stats_all_groups
+optimizer_segments
+optimizer_penalize_broadcast_threshold
+optimizer_cost_threshold
+optimizer_nestloop_factor
+optimizer_sort_factor
+optimizer_array_expansion_threshold
+optimizer_join_order_threshold
+optimizer_join_order
+optimizer_join_arity_for_associativity_commutativity
+optimizer_cte_inlining_bound
+optimizer_push_group_by_below_setop_threshold
+optimizer_xform_bind_threshold
+optimizer_skew_factor
+optimizer_force_multistage_agg
+optimizer_force_three_stage_scalar_dqa
+optimizer_force_expanded_distinct_aggs
+optimizer_force_agg_skew_avoidance
+optimizer_penalize_skew
+optimizer_prune_computed_columns
+optimizer_push_requirements_from_consumer_to_producer
+optimizer_enforce_subplans
+optimizer_apply_left_outer_to_union_all_disregarding_stats
+optimizer_use_external_constant_expression_evaluation_for_ints
+optimizer_remove_order_below_dml
+optimizer_multilevel_partitioning
+optimizer_parallel_union
+optimizer_array_constraints
+optimizer_cte_inlining
+optimizer_enable_space_pruning
+optimizer_enable_associativity
+optimizer_enable_range_predicate_dpe
+optimizer_enable_push_join_below_union_all
+optimizer_use_gpdb_allocators
+optimizer_partition_selection_log
+ConfigureNamesBool_gp
+ConfigureNamesEnum_gp
+ConfigureNamesInt_gp
+ConfigureNamesReal_gp
+ConfigureNamesString_gp
diff --git a/gpMgmt/bin/minirepro b/gpMgmt/bin/minirepro
index c0389f585143..a778168ebe3e 100755
--- a/gpMgmt/bin/minirepro
+++ b/gpMgmt/bin/minirepro
@@ -297,7 +297,7 @@ def dump_extstats(cur, oid_str, f_out):
 
 def get_non_default_optimization_gucs(cursor):
     # Ignore 'optimizer' guc as it is turned off by minirepro while creating connection object
-    query = "select name, setting from pg_settings where category like 'Query Tuning%' and setting!=boot_val and name!='optimizer';"
+    query = "select name, setting from pg_settings where (category like 'Query Tuning%' or category='Customized Options') and setting!=boot_val and name!='optimizer';"
     try:
         cursor.execute(query)
     except psycopg2.DatabaseError as e:
diff --git a/gpcontrib/orca/Makefile b/gpcontrib/orca/Makefile
index 55c04f2ca309..43a0de41b192 100644
--- a/gpcontrib/orca/Makefile
+++ b/gpcontrib/orca/Makefile
@@ -39,6 +39,7 @@ OBJS = $(GPOPT_OBJS) $(GPORCA_OBJS) \
 	orca.o \
 	funcs.o \
 	orca_entry.o \
+	orca_guc.o \
 
 PG_CPPFLAGS = \
 	-I$(top_srcdir)/gpcontrib/orca/gporca/libgpos/include \
diff --git a/gpcontrib/orca/include/gpopt/utils/gpdbdefs.h b/gpcontrib/orca/include/gpopt/utils/gpdbdefs.h
index 8d2a8c73f12e..99a914872080 100644
--- a/gpcontrib/orca/include/gpopt/utils/gpdbdefs.h
+++ b/gpcontrib/orca/include/gpopt/utils/gpdbdefs.h
@@ -34,6 +34,7 @@ extern "C" {
 #include "nodes/plannodes.h"
 #include "optimizer/hints.h"
 #include "optimizer/orca.h"
+#include "optimizer/orca_guc.h"
 #include "optimizer/plancat.h"
 #include "optimizer/walkers.h"
 #include "parser/parse_clause.h"
diff --git a/gpcontrib/orca/include/optimizer/orca_guc.h b/gpcontrib/orca/include/optimizer/orca_guc.h
new file mode 100644
index 000000000000..958a02450725
--- /dev/null
+++ b/gpcontrib/orca/include/optimizer/orca_guc.h
@@ -0,0 +1,156 @@
+#ifndef ORCA_GUC_H
+#define ORCA_GUC_H
+
+/* ORCA related definitions */
+#define OPTIMIZER_XFORMS_COUNT 400 /* number of transformation rules */
+
+/* types of optimizer failures */
+#define OPTIMIZER_ALL_FAIL 0		/* all failures */
+#define OPTIMIZER_UNEXPECTED_FAIL 1 /* unexpected failures */
+#define OPTIMIZER_EXPECTED_FAIL 2	/* expected failures */
+
+/* optimizer minidump mode */
+#define OPTIMIZER_MINIDUMP_FAIL 0	/* create optimizer minidump on failure */
+#define OPTIMIZER_MINIDUMP_ALWAYS 1 /* always create optimizer minidump */
+
+/* optimizer cost model */
+#define OPTIMIZER_GPDB_LEGACY 0		  /* GPDB's legacy cost model */
+#define OPTIMIZER_GPDB_CALIBRATED 1	  /* GPDB's calibrated cost model */
+#define OPTIMIZER_GPDB_EXPERIMENTAL 2 /* GPDB's experimental cost model */
+
+extern bool optimizer_log;
+extern int optimizer_log_failure;
+extern bool optimizer_trace_fallback;
+extern int optimizer_minidump;
+extern int optimizer_cost_model;
+extern bool optimizer_metadata_caching;
+extern int optimizer_mdcache_size;
+
+/* Optimizer debugging GUCs */
+extern bool optimizer_print_query;
+extern bool optimizer_print_plan;
+extern bool optimizer_print_xform;
+extern bool optimizer_print_memo_after_exploration;
+extern bool optimizer_print_memo_after_implementation;
+extern bool optimizer_print_memo_after_optimization;
+extern bool optimizer_print_job_scheduler;
+extern bool optimizer_print_expression_properties;
+extern bool optimizer_print_group_properties;
+extern bool optimizer_print_optimization_context;
+extern bool optimizer_print_optimization_stats;
+extern bool optimizer_print_xform_results;
+
+/* array of xforms disable flags */
+extern bool optimizer_xforms[OPTIMIZER_XFORMS_COUNT];
+extern char *optimizer_search_strategy_path;
+
+/* GUCs to tell Optimizer to enable a physical operator */
+extern bool optimizer_enable_nljoin;
+extern bool optimizer_enable_indexjoin;
+extern bool optimizer_enable_motions_coordinatoronly_queries;
+extern bool optimizer_enable_motions;
+extern bool optimizer_enable_motion_broadcast;
+extern bool optimizer_enable_motion_gather;
+extern bool optimizer_enable_motion_redistribute;
+extern bool optimizer_enable_sort;
+extern bool optimizer_enable_materialize;
+extern bool optimizer_enable_partition_propagation;
+extern bool optimizer_enable_partition_selection;
+extern bool optimizer_enable_outerjoin_rewrite;
+extern bool optimizer_enable_multiple_distinct_aggs;
+extern bool optimizer_enable_hashjoin_redistribute_broadcast_children;
+extern bool optimizer_enable_broadcast_nestloop_outer_child;
+extern bool optimizer_discard_redistribute_hashjoin;
+extern bool optimizer_enable_streaming_material;
+extern bool optimizer_enable_gather_on_segment_for_dml;
+extern bool optimizer_enable_assert_maxonerow;
+extern bool optimizer_enable_constant_expression_evaluation;
+extern bool optimizer_enable_bitmapscan;
+extern bool optimizer_enable_outerjoin_to_unionall_rewrite;
+extern bool optimizer_enable_ctas;
+extern bool optimizer_enable_dml;
+extern bool optimizer_enable_dml_constraints;
+extern bool optimizer_enable_direct_dispatch;
+extern bool optimizer_enable_coordinator_only_queries;
+extern bool optimizer_enable_hashjoin;
+extern bool optimizer_enable_dynamictablescan;
+extern bool optimizer_enable_dynamicindexscan;
+extern bool optimizer_enable_dynamicindexonlyscan;
+extern bool optimizer_enable_dynamicbitmapscan;
+extern bool optimizer_enable_indexscan;
+extern bool optimizer_enable_indexonlyscan;
+extern bool optimizer_enable_tablescan;
+extern bool optimizer_enable_eageragg;
+extern bool optimizer_enable_orderedagg;
+extern bool optimizer_expand_fulljoin;
+extern bool optimizer_enable_hashagg;
+extern bool optimizer_enable_groupagg;
+extern bool optimizer_enable_mergejoin;
+extern bool optimizer_enable_redistribute_nestloop_loj_inner_child;
+extern bool optimizer_force_comprehensive_join_implementation;
+extern bool optimizer_enable_replicated_table;
+extern bool optimizer_enable_foreign_table;
+extern bool optimizer_enable_right_outer_join;
+
+/* Optimizer plan enumeration related GUCs */
+extern bool optimizer_enumerate_plans;
+extern bool optimizer_sample_plans;
+extern int optimizer_plan_id;
+extern int optimizer_samples_number;
+
+/* Optimizer Just In Time (JIT) compilation related GUCs*/
+extern double optimizer_jit_above_cost;
+extern double optimizer_jit_inline_above_cost;
+extern double optimizer_jit_optimize_above_cost;
+
+/* Cardinality estimation related GUCs used by the Optimizer */
+extern bool optimizer_extract_dxl_stats;
+extern bool optimizer_extract_dxl_stats_all_nodes;
+extern bool optimizer_print_missing_stats;
+extern double optimizer_damping_factor_filter;
+extern double optimizer_damping_factor_join;
+extern double optimizer_damping_factor_groupby;
+extern bool optimizer_dpe_stats;
+extern bool optimizer_enable_derive_stats_all_groups;
+
+/* Costing or tuning related GUCs used by the Optimizer */
+extern int optimizer_segments;
+extern int optimizer_penalize_broadcast_threshold;
+extern double optimizer_cost_threshold;
+extern double optimizer_nestloop_factor;
+extern double optimizer_sort_factor;
+
+/* Optimizer hints */
+extern int optimizer_array_expansion_threshold;
+extern int optimizer_join_order_threshold;
+extern int optimizer_join_order;
+extern int optimizer_join_arity_for_associativity_commutativity;
+extern int optimizer_cte_inlining_bound;
+extern int optimizer_push_group_by_below_setop_threshold;
+extern int optimizer_xform_bind_threshold;
+extern int optimizer_skew_factor;
+extern bool optimizer_force_multistage_agg;
+extern bool optimizer_force_three_stage_scalar_dqa;
+extern bool optimizer_force_expanded_distinct_aggs;
+extern bool optimizer_force_agg_skew_avoidance;
+extern bool optimizer_penalize_skew;
+extern bool optimizer_prune_computed_columns;
+extern bool optimizer_push_requirements_from_consumer_to_producer;
+extern bool optimizer_enforce_subplans;
+extern bool optimizer_apply_left_outer_to_union_all_disregarding_stats;
+extern bool optimizer_use_external_constant_expression_evaluation_for_ints;
+extern bool optimizer_remove_order_below_dml;
+extern bool optimizer_multilevel_partitioning;
+extern bool optimizer_parallel_union;
+extern bool optimizer_array_constraints;
+extern bool optimizer_cte_inlining;
+extern bool optimizer_enable_space_pruning;
+extern bool optimizer_enable_associativity;
+extern bool optimizer_enable_range_predicate_dpe;
+extern bool optimizer_enable_push_join_below_union_all;
+
+extern bool optimizer_use_gpdb_allocators;
+
+void orca_guc_define(void);
+
+#endif /* ORCA_GUC_H */
diff --git a/gpcontrib/orca/orca.c b/gpcontrib/orca/orca.c
index 94953c557b35..ee17b975595e 100644
--- a/gpcontrib/orca/orca.c
+++ b/gpcontrib/orca/orca.c
@@ -6,6 +6,7 @@
 #include "miscadmin.h"
 #include "optimizer/clauses.h"
 #include "optimizer/orca.h"
+#include "optimizer/orca_guc.h"
 #include "optimizer/planner.h"
 #include "storage/ipc.h"
 #include "utils/builtins.h"
@@ -255,6 +256,15 @@ _PG_init(void)
 			 errmsg(
 				 "This module can only be loaded via shared_preload_libraries")));
 
+	/*
+	 * We need to define GUCs everywhere, including segments. Though
+	 * optimizer_* GUCs are used only on Coordinator, current GUC system will
+	 * dispatch setting of GUCs to the segments as well, when we try to SET any
+	 * GUC. And, if there is no defined GUC on a segment, we'll get an
+	 * error.
+	 */
+	orca_guc_define();
+
 	if (!(IS_QUERY_DISPATCHER() && (GP_ROLE_DISPATCH == Gp_role)))
 		return;
 
diff --git a/gpcontrib/orca/orca_entry.c b/gpcontrib/orca/orca_entry.c
index cd8a031bc4be..abb8303201b7 100644
--- a/gpcontrib/orca/orca_entry.c
+++ b/gpcontrib/orca/orca_entry.c
@@ -28,6 +28,7 @@
 #include "optimizer/clauses.h"
 #include "optimizer/optimizer.h"
 #include "optimizer/orca.h"
+#include "optimizer/orca_guc.h"
 #include "optimizer/paths.h"
 #include "optimizer/planmain.h"
 #include "optimizer/planner.h"
diff --git a/gpcontrib/orca/orca_guc.c b/gpcontrib/orca/orca_guc.c
new file mode 100644
index 000000000000..7c7f02cbea7b
--- /dev/null
+++ b/gpcontrib/orca/orca_guc.c
@@ -0,0 +1,1432 @@
+#include "postgres.h"
+
+#include "optimizer/orca_guc.h"
+
+#include <float.h>
+#include <limits.h>
+
+#include "utils/guc.h"
+#include "utils/guc_tables.h"
+
+#define ORCA_GUC_PROCESS_NO_SYNC_FLAG(flags) \
+	((flags & GUC_GPDB_NEED_SYNC) ? flags : (flags | GUC_GPDB_NO_SYNC))
+
+bool optimizer_log;
+int optimizer_log_failure;
+bool optimizer_trace_fallback;
+int optimizer_minidump;
+int optimizer_cost_model;
+bool optimizer_metadata_caching;
+int optimizer_mdcache_size;
+bool optimizer_use_gpdb_allocators;
+
+/* Optimizer debugging GUCs */
+bool optimizer_print_query;
+bool optimizer_print_plan;
+bool optimizer_print_xform;
+bool optimizer_print_memo_after_exploration;
+bool optimizer_print_memo_after_implementation;
+bool optimizer_print_memo_after_optimization;
+bool optimizer_print_job_scheduler;
+bool optimizer_print_expression_properties;
+bool optimizer_print_group_properties;
+bool optimizer_print_optimization_context;
+bool optimizer_print_optimization_stats;
+bool optimizer_print_xform_results;
+
+/* array of xforms disable flags */
+bool optimizer_xforms[OPTIMIZER_XFORMS_COUNT] = {
+	[0 ... OPTIMIZER_XFORMS_COUNT - 1] = false};
+
+char *optimizer_search_strategy_path = NULL;
+
+/* GUCs to tell Optimizer to enable a physical operator */
+bool optimizer_enable_nljoin;
+bool optimizer_enable_indexjoin;
+bool optimizer_enable_motions_coordinatoronly_queries;
+bool optimizer_enable_motions;
+bool optimizer_enable_motion_broadcast;
+bool optimizer_enable_motion_gather;
+bool optimizer_enable_motion_redistribute;
+bool optimizer_enable_sort;
+bool optimizer_enable_materialize;
+bool optimizer_enable_partition_propagation;
+bool optimizer_enable_partition_selection;
+bool optimizer_enable_outerjoin_rewrite;
+bool optimizer_enable_multiple_distinct_aggs;
+bool optimizer_enable_direct_dispatch;
+bool optimizer_enable_hashjoin_redistribute_broadcast_children;
+bool optimizer_enable_broadcast_nestloop_outer_child;
+bool optimizer_discard_redistribute_hashjoin;
+bool optimizer_enable_streaming_material;
+bool optimizer_enable_gather_on_segment_for_dml;
+bool optimizer_enable_assert_maxonerow;
+bool optimizer_enable_constant_expression_evaluation;
+bool optimizer_enable_bitmapscan;
+bool optimizer_enable_outerjoin_to_unionall_rewrite;
+bool optimizer_enable_ctas;
+bool optimizer_enable_dml;
+bool optimizer_enable_dml_constraints;
+bool optimizer_enable_coordinator_only_queries;
+bool optimizer_enable_hashjoin;
+bool optimizer_enable_dynamictablescan;
+bool optimizer_enable_dynamicindexscan;
+bool optimizer_enable_dynamicindexonlyscan;
+bool optimizer_enable_dynamicbitmapscan;
+bool optimizer_enable_indexscan;
+bool optimizer_enable_indexonlyscan;
+bool optimizer_enable_tablescan;
+bool optimizer_enable_hashagg;
+bool optimizer_enable_groupagg;
+bool optimizer_expand_fulljoin;
+bool optimizer_enable_mergejoin;
+bool optimizer_enable_redistribute_nestloop_loj_inner_child;
+bool optimizer_force_comprehensive_join_implementation;
+bool optimizer_enable_replicated_table;
+bool optimizer_enable_foreign_table;
+bool optimizer_enable_right_outer_join;
+
+/* Optimizer plan enumeration related GUCs */
+bool optimizer_enumerate_plans;
+bool optimizer_sample_plans;
+int optimizer_plan_id;
+int optimizer_samples_number;
+
+/* Cardinality estimation related GUCs used by the Optimizer */
+bool optimizer_extract_dxl_stats;
+bool optimizer_extract_dxl_stats_all_nodes;
+bool optimizer_print_missing_stats;
+double optimizer_damping_factor_filter;
+double optimizer_damping_factor_join;
+double optimizer_damping_factor_groupby;
+bool optimizer_dpe_stats;
+bool optimizer_enable_derive_stats_all_groups;
+
+/* Costing related GUCs used by the Optimizer */
+int optimizer_segments;
+int optimizer_penalize_broadcast_threshold;
+double optimizer_cost_threshold;
+double optimizer_nestloop_factor;
+double optimizer_sort_factor;
+
+/* Optimizer hints */
+int optimizer_join_arity_for_associativity_commutativity;
+int optimizer_array_expansion_threshold;
+int optimizer_join_order_threshold;
+int optimizer_join_order;
+int optimizer_cte_inlining_bound;
+int optimizer_push_group_by_below_setop_threshold;
+int optimizer_xform_bind_threshold;
+int optimizer_skew_factor;
+bool optimizer_force_multistage_agg;
+bool optimizer_force_three_stage_scalar_dqa;
+bool optimizer_force_expanded_distinct_aggs;
+bool optimizer_force_agg_skew_avoidance;
+bool optimizer_penalize_skew;
+bool optimizer_prune_computed_columns;
+bool optimizer_push_requirements_from_consumer_to_producer;
+bool optimizer_enforce_subplans;
+bool optimizer_use_external_constant_expression_evaluation_for_ints;
+bool optimizer_apply_left_outer_to_union_all_disregarding_stats;
+bool optimizer_remove_order_below_dml;
+bool optimizer_multilevel_partitioning;
+bool optimizer_parallel_union;
+bool optimizer_array_constraints;
+bool optimizer_cte_inlining;
+bool optimizer_enable_space_pruning;
+bool optimizer_enable_associativity;
+bool optimizer_enable_eageragg;
+bool optimizer_enable_range_predicate_dpe;
+bool optimizer_enable_push_join_below_union_all;
+bool optimizer_enable_orderedagg;
+
+/* GUCs for Just In Time (JIT) compilation */
+double optimizer_jit_above_cost;
+double optimizer_jit_inline_above_cost;
+double optimizer_jit_optimize_above_cost;
+
+static const struct config_enum_entry optimizer_log_failure_options[] = {
+	{"all", OPTIMIZER_ALL_FAIL},
+	{"unexpected", OPTIMIZER_UNEXPECTED_FAIL},
+	{"expected", OPTIMIZER_EXPECTED_FAIL},
+	{NULL, 0}};
+
+static const struct config_enum_entry optimizer_minidump_options[] = {
+	{"onerror", OPTIMIZER_MINIDUMP_FAIL},
+	{"always", OPTIMIZER_MINIDUMP_ALWAYS},
+	{NULL, 0}};
+
+static const struct config_enum_entry optimizer_cost_model_options[] = {
+	{"legacy", OPTIMIZER_GPDB_LEGACY},
+	{"calibrated", OPTIMIZER_GPDB_CALIBRATED},
+	{"experimental", OPTIMIZER_GPDB_EXPERIMENTAL},
+	{NULL, 0}};
+
+static const struct config_enum_entry optimizer_join_order_options[] = {
+	{"query", JOIN_ORDER_IN_QUERY},
+	{"greedy", JOIN_ORDER_GREEDY_SEARCH},
+	{"exhaustive", JOIN_ORDER_EXHAUSTIVE_SEARCH},
+	{"exhaustive2", JOIN_ORDER_EXHAUSTIVE2_SEARCH},
+	{NULL, 0}};
+
+struct config_bool configure_names_bool_orca[] = {
+	{{"optimizer_log", PGC_USERSET, LOGGING_WHAT,
+	  gettext_noop("Log optimizer messages."), NULL,
+	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
+	 &optimizer_log,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_trace_fallback", PGC_USERSET, LOGGING_WHAT,
+	  gettext_noop(
+		  "Print a message at INFO level, whenever GPORCA falls back."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_trace_fallback,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_print_query", PGC_USERSET, LOGGING_WHAT,
+	  gettext_noop("Prints the optimizer's input query expression tree."), NULL,
+	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
+	 &optimizer_print_query,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_print_plan", PGC_USERSET, LOGGING_WHAT,
+	  gettext_noop(
+		  "Prints the plan expression tree produced by the optimizer."),
+	  NULL, GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
+	 &optimizer_print_plan,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_print_xform", PGC_USERSET, LOGGING_WHAT,
+	  gettext_noop("Prints optimizer transformation information."), NULL,
+	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
+	 &optimizer_print_xform,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_metadata_caching", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "This guc enables the optimizer to cache and reuse metadata."),
+	  NULL},
+	 &optimizer_metadata_caching,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_print_missing_stats", PGC_USERSET, LOGGING_WHAT,
+	  gettext_noop("Print columns with missing statistics."), NULL,
+	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
+	 &optimizer_print_missing_stats,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_print_xform_results", PGC_USERSET, LOGGING_WHAT,
+	  gettext_noop("Print the input and output of optimizer transformations."),
+	  NULL, GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
+	 &optimizer_print_xform_results,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_print_memo_after_exploration", PGC_USERSET, LOGGING_WHAT,
+	  gettext_noop(
+		  "Print optimizer memo structure after the exploration phase."),
+	  NULL, GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
+	 &optimizer_print_memo_after_exploration,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_print_memo_after_implementation", PGC_USERSET, LOGGING_WHAT,
+	  gettext_noop(
+		  "Print optimizer memo structure after the implementation phase."),
+	  NULL, GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
+	 &optimizer_print_memo_after_implementation,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_print_memo_after_optimization", PGC_USERSET, LOGGING_WHAT,
+	  gettext_noop("Print optimizer memo structure after optimization."), NULL,
+	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
+	 &optimizer_print_memo_after_optimization,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_print_job_scheduler", PGC_USERSET, LOGGING_WHAT,
+	  gettext_noop("Print the jobs in the scheduler on each job completion."),
+	  NULL, GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
+	 &optimizer_print_job_scheduler,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_print_expression_properties", PGC_USERSET, LOGGING_WHAT,
+	  gettext_noop("Print expression properties."), NULL,
+	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
+	 &optimizer_print_expression_properties,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_print_group_properties", PGC_USERSET, LOGGING_WHAT,
+	  gettext_noop("Print group properties."), NULL,
+	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
+	 &optimizer_print_group_properties,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_print_optimization_context", PGC_USERSET, LOGGING_WHAT,
+	  gettext_noop("Print the optimization context."), NULL,
+	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
+	 &optimizer_print_optimization_context,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_print_optimization_stats", PGC_USERSET, LOGGING_WHAT,
+	  gettext_noop("Print optimization stats."), NULL,
+	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
+	 &optimizer_print_optimization_stats,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_extract_dxl_stats", PGC_USERSET, LOGGING_WHAT,
+	  gettext_noop("Extract plan stats in dxl."), NULL,
+	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
+	 &optimizer_extract_dxl_stats,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_extract_dxl_stats_all_nodes", PGC_USERSET, LOGGING_WHAT,
+	  gettext_noop("Extract plan stats for all physical dxl nodes."), NULL,
+	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
+	 &optimizer_extract_dxl_stats_all_nodes,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_dpe_stats", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Enable statistics derivation for partitioned tables with dynamic partition elimination."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_dpe_stats,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_nljoin", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop("Enable nested loops join plans in the optimizer."), NULL,
+	  GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_nljoin,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_indexjoin", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop("Enable index nested loops join plans in the optimizer."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_indexjoin,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_motions_masteronly_queries", PGC_USERSET,
+	  QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Enable plans with Motion operators in the optimizer for queries with no distributed tables."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_motions_coordinatoronly_queries,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_motions", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop("Enable plans with Motion operators in the optimizer."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_motions,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_motion_broadcast", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Enable plans with Motion Broadcast operators in the optimizer."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_motion_broadcast,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_motion_gather", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Enable plans with Motion Gather operators in the optimizer."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_motion_gather,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_motion_redistribute", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Enable plans with Motion Redistribute operators in the optimizer."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_motion_redistribute,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_sort", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop("Enable plans with Sort operators in the optimizer."), NULL,
+	  GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_sort,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_materialize", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop("Enable plans with Materialize operators in the optimizer."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_materialize,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_partition_propagation", PGC_USERSET,
+	  QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Enable plans with Partition Propagation operators in the optimizer."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_partition_propagation,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_partition_selection", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Enable plans with Partition Selection operators in the optimizer."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_partition_selection,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_outerjoin_rewrite", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop("Enable outer join to inner join rewrite in the optimizer."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_outerjoin_rewrite,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_direct_dispatch", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop("Enable direct dispatch in the optimizer."), NULL,
+	  GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_direct_dispatch,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_space_pruning", PGC_USERSET, DEVELOPER_OPTIONS,
+	  gettext_noop("Enable space pruning in the optimizer."), NULL,
+	  GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_space_pruning,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_master_only_queries", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop("Process coordinator only queries via the optimizer."), NULL,
+	  GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_coordinator_only_queries,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_hashjoin", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop("Enables the optimizer's use of hash join plans."), NULL,
+	  GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_hashjoin,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_dynamictablescan", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Enables the optimizer's use of plans with dynamic table scan."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_dynamictablescan,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_dynamicindexscan", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Enables the optimizer's use of plans with dynamic index scan."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_dynamicindexscan,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_dynamicindexonlyscan", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Enables the optimizer's use of plans with dynamic index only scan."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_dynamicindexonlyscan,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_dynamicbitmapscan", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Enables the optimizer's use of plans with dynamic bitmap scan."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_dynamicbitmapscan,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_indexscan", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop("Enables the optimizer's use of plans with index scan."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_indexscan,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_indexonlyscan", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Enables the optimizer's use of plans with index only scan."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_indexonlyscan,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_tablescan", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop("Enables the optimizer's use of plans with table scan."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_tablescan,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_hashagg", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop("Enables GPORCA to use hash aggregates."), NULL,
+	  GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_hashagg,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_groupagg", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop("Enables GPORCA to use group aggregates."), NULL,
+	  GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_groupagg,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_force_agg_skew_avoidance", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Always pick a plan for aggregate distinct that minimizes skew."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_force_agg_skew_avoidance,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_penalize_skew", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Penalize operators with skewed hash redistribute below it."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_penalize_skew,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_multilevel_partitioning", PGC_USERSET, DEVELOPER_OPTIONS,
+	  gettext_noop(
+		  "Enable optimization of queries on multilevel partitioned tables."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_multilevel_partitioning,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_derive_stats_all_groups", PGC_USERSET,
+	  DEVELOPER_OPTIONS,
+	  gettext_noop("Enable stats derivation for all groups after exploration."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_derive_stats_all_groups,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_force_multistage_agg", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Force optimizer to always pick multistage aggregates when such a plan alternative is generated."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_force_multistage_agg,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_multiple_distinct_aggs", PGC_USERSET,
+	  QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Enable plans with multiple distinct aggregates in the optimizer."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_multiple_distinct_aggs,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_hashjoin_redistribute_broadcast_children", PGC_USERSET,
+	  QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Enable hash join plans with, Redistribute outer child and Broadcast inner child, in the optimizer."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_hashjoin_redistribute_broadcast_children,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_broadcast_nestloop_outer_child", PGC_USERSET,
+	  QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Enable nested loops join plans with replicated outer child in the optimizer."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_broadcast_nestloop_outer_child,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_discard_redistribute_hashjoin", PGC_USERSET,
+	  QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Discard hash join with redistribute motion in the optimizer."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_discard_redistribute_hashjoin,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_expand_fulljoin", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Enables the optimizer's support of expanding full outer joins using union all."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_expand_fulljoin,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_mergejoin", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop("Enables the optimizer's support of merge joins."), NULL,
+	  GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_mergejoin,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_streaming_material", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Enable plans with a streaming material node in the optimizer."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_streaming_material,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_gather_on_segment_for_dml", PGC_USERSET,
+	  QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Enable DML optimization by enforcing a non-coordinator gather in the optimizer."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_gather_on_segment_for_dml,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_assert_maxonerow", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Enable Assert MaxOneRow plans to check number of rows at runtime."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_assert_maxonerow,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enumerate_plans", PGC_USERSET, LOGGING_WHAT,
+	  gettext_noop("Enable plan enumeration"), NULL,
+	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
+	 &optimizer_enumerate_plans,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_sample_plans", PGC_USERSET, DEVELOPER_OPTIONS,
+	  gettext_noop("Enable plan sampling"), NULL,
+	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
+	 &optimizer_sample_plans,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_constant_expression_evaluation", PGC_USERSET,
+	  QUERY_TUNING_METHOD,
+	  gettext_noop("Enable constant expression evaluation in the optimizer"),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_constant_expression_evaluation,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_bitmapscan", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop("Enable bitmap plans in the optimizer"), NULL,
+	  GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_bitmapscan,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_outerjoin_to_unionall_rewrite", PGC_USERSET,
+	  QUERY_TUNING_METHOD,
+	  gettext_noop("Enable rewriting Left Outer Join to UnionAll"), NULL,
+	  GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_outerjoin_to_unionall_rewrite,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_ctas", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop("Enable CTAS plans in the optimizer"), NULL,
+	  GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_ctas,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_dml", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop("Enable DML plans in GPORCA."), NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_dml,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_dml_constraints", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Support DML with CHECK constraints and NOT NULL constraints."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_dml_constraints,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_use_gpdb_allocators", PGC_POSTMASTER, RESOURCES_MEM,
+	  gettext_noop("Enable ORCA to use GPDB Memory Contexts"), NULL,
+	  GUC_NOT_IN_SAMPLE},
+	 &optimizer_use_gpdb_allocators,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_orderedagg", PGC_USERSET, DEVELOPER_OPTIONS,
+	  gettext_noop("Enable ordered aggregate plans."), NULL},
+	 &optimizer_enable_orderedagg,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+	{{"optimizer_enable_eageragg", PGC_USERSET, DEVELOPER_OPTIONS,
+	  gettext_noop(
+		  "Enable Eager Agg transform for pushing aggregate below an innerjoin."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_eageragg,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_redistribute_nestloop_loj_inner_child", PGC_USERSET,
+	  DEVELOPER_OPTIONS,
+	  gettext_noop(
+		  "Enable nested loops left join plans with redistributed inner child in the optimizer."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_redistribute_nestloop_loj_inner_child,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_force_comprehensive_join_implementation", PGC_USERSET,
+	  QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Explore a nested loop join even if a hash join is possible"),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_force_comprehensive_join_implementation,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_replicated_table", PGC_USERSET, DEVELOPER_OPTIONS,
+	  gettext_noop("Enable replicated tables."), NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_replicated_table,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_foreign_table", PGC_USERSET, DEVELOPER_OPTIONS,
+	  gettext_noop("Enable foreign tables in Orca."), NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_foreign_table,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_right_outer_join", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Enable Orca to generate plans containing right outer joins."),
+	  gettext_noop(
+		  "Right outer join can be re-written from left outer join. "
+		  "However, there are scenarios due to cardinality and cost "
+		  "misestimation, right outer join plan may be sub-optimal and "
+		  "can either be slower than the left outer join plan alternative "
+		  "or hit out-of-memory (OOM). The root cause can be identified "
+		  "by viewing the explain analyze plan and observing that the "
+		  "right outer join plan node is consuming all resources "
+		  "(CPU/memory) or the explain analyze itself hits OOM. By "
+		  "setting this GUC value to \"false\" users can force GPORCA to "
+		  "generate an equivalent left outer join plan. We recommend that "
+		  "the GUC be set at the query level as there can be several use "
+		  "cases where right outer join is the best plan alternative to "
+		  "choose."),
+	  GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_right_outer_join,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_coordinator_only_queries", PGC_USERSET,
+	  QUERY_TUNING_METHOD,
+	  gettext_noop("Process coordinator only queries via the optimizer."), NULL,
+	  GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_coordinator_only_queries,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_motions_coordinatoronly_queries", PGC_USERSET,
+	  QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Enable plans with Motion operators in the optimizer for queries with no distributed tables."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_motions_coordinatoronly_queries,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_force_three_stage_scalar_dqa", PGC_USERSET,
+	  QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Force optimizer to always pick 3 stage aggregate plan for scalar distinct qualified aggregate."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_force_three_stage_scalar_dqa,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_parallel_union", PGC_USERSET, DEVELOPER_OPTIONS,
+	  gettext_noop("Enable parallel execution for UNION/UNION ALL queries."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_parallel_union,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_array_constraints", PGC_USERSET, DEVELOPER_OPTIONS,
+	  gettext_noop(
+		  "Allows the optimizer's constraint framework to derive array constraints."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_array_constraints,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_force_expanded_distinct_aggs", PGC_USERSET, DEVELOPER_OPTIONS,
+	  gettext_noop(
+		  "Always pick plans that expand multiple distinct aggregates into join of single distinct aggregate in the optimizer."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_force_expanded_distinct_aggs,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_prune_computed_columns", PGC_USERSET, DEVELOPER_OPTIONS,
+	  gettext_noop("Prune unused computed columns when pre-processing query"),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_prune_computed_columns,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_push_requirements_from_consumer_to_producer", PGC_USERSET,
+	  DEVELOPER_OPTIONS,
+	  gettext_noop(
+		  "Optimize CTE producer plan on requirements enforced on top of CTE consumer in the optimizer."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_push_requirements_from_consumer_to_producer,
+	 true,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enforce_subplans", PGC_USERSET, DEVELOPER_OPTIONS,
+	  gettext_noop("Enforce correlated execution in the optimizer"), NULL,
+	  GUC_NOT_IN_SAMPLE},
+	 &optimizer_enforce_subplans,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_cte_inlining", PGC_USERSET, DEVELOPER_OPTIONS,
+	  gettext_noop("Enable CTE inlining"), NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_cte_inlining,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_use_external_constant_expression_evaluation_for_ints",
+	  PGC_USERSET, DEVELOPER_OPTIONS,
+	  gettext_noop(
+		  "Use external constant expression evaluation in the optimizer for all integer types"),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_use_external_constant_expression_evaluation_for_ints,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_apply_left_outer_to_union_all_disregarding_stats", PGC_USERSET,
+	  DEVELOPER_OPTIONS,
+	  gettext_noop(
+		  "Always apply Left Outer Join to Inner Join UnionAll Left Anti Semi Join without looking at stats."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_apply_left_outer_to_union_all_disregarding_stats,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_remove_order_below_dml", PGC_USERSET, DEVELOPER_OPTIONS,
+	  gettext_noop("Remove OrderBy below a DML operation"), NULL,
+	  GUC_NOT_IN_SAMPLE},
+	 &optimizer_remove_order_below_dml,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_associativity", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop("Enables Join Associativity in optimizer"), NULL},
+	 &optimizer_enable_associativity,
+	 false,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_range_predicate_dpe", PGC_USERSET, DEVELOPER_OPTIONS,
+	  gettext_noop(
+		  "Enable range predicates for dynamic partition elimination."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_range_predicate_dpe,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_enable_push_join_below_union_all", PGC_USERSET,
+	  DEVELOPER_OPTIONS,
+	  gettext_noop(
+		  "Enable transform of join of union all to union all of joins. May improve the join performance."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_enable_push_join_below_union_all,
+	 false,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	/* End-of-list marker */
+	{{NULL, 0, 0, NULL, NULL}, NULL, false, NULL, NULL}};
+
+struct config_int configure_names_int_orca[] = {
+	{{"optimizer_plan_id", PGC_USERSET, DEVELOPER_OPTIONS,
+	  gettext_noop("Choose a plan alternative"), NULL,
+	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
+	 &optimizer_plan_id,
+	 0,
+	 0,
+	 INT_MAX,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_samples_number", PGC_USERSET, DEVELOPER_OPTIONS,
+	  gettext_noop("Set the number of plan samples"), NULL,
+	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
+	 &optimizer_samples_number,
+	 1000,
+	 1,
+	 INT_MAX,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_segments", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Number of segments to be considered by the optimizer during costing, or 0 to take the actual number of segments."),
+	  NULL, GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
+	 &optimizer_segments,
+	 0,
+	 0,
+	 INT_MAX,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_penalize_broadcast_threshold", PGC_USERSET,
+	  QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Maximum number of rows of a relation that can be broadcasted without penalty. A value of 0 disables."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_penalize_broadcast_threshold,
+	 100000,
+	 0,
+	 INT_MAX,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_mdcache_size", PGC_USERSET, RESOURCES_MEM,
+	  gettext_noop("Sets the size of MDCache."), NULL, GUC_UNIT_KB},
+	 &optimizer_mdcache_size,
+	 16384,
+	 0,
+	 INT_MAX,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_cte_inlining_bound", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop("Set the CTE inlining cutoff"), NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_cte_inlining_bound,
+	 0,
+	 0,
+	 INT_MAX,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_array_expansion_threshold", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Item limit for expansion of arrays in WHERE clause for constraint derivation."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_array_expansion_threshold,
+	 20,
+	 0,
+	 INT_MAX,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_push_group_by_below_setop_threshold", PGC_USERSET,
+	  QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Maximum number of children setops have to consider pushing group bys below it"),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_push_group_by_below_setop_threshold,
+	 10,
+	 0,
+	 INT_MAX,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_xform_bind_threshold", PGC_USERSET, DEVELOPER_OPTIONS,
+	  gettext_noop(
+		  "Maximum number bindings per xform per group expression. A value of 0 disables."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_xform_bind_threshold,
+	 0,
+	 0,
+	 INT_MAX,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_skew_factor", PGC_USERSET, DEVELOPER_OPTIONS,
+	  gettext_noop(
+		  "Coefficient of skew ratio computed from sample stastics. Default 0: skew computation from sample statistics turned off. [1,100]: skew ratio computed from sample statistics. The skewness used for costing is the product of the optimizer_skew_factor and the skew ratio."),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_skew_factor,
+	 0,
+	 0,
+	 100,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_join_order_threshold", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Maximum number of join children to use dynamic programming based join ordering algorithm."),
+	  NULL},
+	 &optimizer_join_order_threshold,
+	 10,
+	 0,
+	 12,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_join_arity_for_associativity_commutativity", PGC_USERSET,
+	  QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "Maximum number of children n-ary-join have without disabling commutativity and associativity transform"),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_join_arity_for_associativity_commutativity,
+	 18,
+	 0,
+	 INT_MAX,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	/* End-of-list marker */
+	{{NULL, 0, 0, NULL, NULL}, NULL, 0, 0, 0, NULL, NULL}};
+
+struct config_real configure_names_real_orca[] = {
+	{{"optimizer_damping_factor_filter", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "select predicate damping factor in optimizer, 1.0 means no damping"),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_damping_factor_filter,
+	 0.75,
+	 0.0,
+	 1.0,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_damping_factor_join", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "join predicate damping factor in optimizer, 1.0 means no damping, 0.0 means square root method"),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_damping_factor_join,
+	 0.0,
+	 0.0,
+	 1.0,
+	 NULL,
+	 NULL,
+	 NULL},
+	{{"optimizer_damping_factor_groupby", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop(
+		  "groupby operator damping factor in optimizer, 1.0 means no damping"),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_damping_factor_groupby,
+	 0.75,
+	 0.0,
+	 1.0,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_cost_threshold", PGC_USERSET, DEVELOPER_OPTIONS,
+	  gettext_noop(
+		  "Set the threshold for plan sampling relative to the cost of best plan, 0.0 means unbounded"),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_cost_threshold,
+	 0.0,
+	 0.0,
+	 INT_MAX,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_nestloop_factor", PGC_USERSET, QUERY_TUNING_OTHER,
+	  gettext_noop("Set the nestloop join cost factor in the optimizer"), NULL,
+	  GUC_NOT_IN_SAMPLE},
+	 &optimizer_nestloop_factor,
+	 1024.0,
+	 1.0,
+	 DBL_MAX,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_sort_factor", PGC_USERSET, QUERY_TUNING_OTHER,
+	  gettext_noop(
+		  "Set the sort cost factor in the optimizer, 1.0 means same as default, > 1.0 means more costly than default, < 1.0 means means less costly than default"),
+	  NULL, GUC_NOT_IN_SAMPLE},
+	 &optimizer_sort_factor,
+	 1.0,
+	 0.0,
+	 DBL_MAX,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_jit_above_cost", PGC_USERSET, QUERY_TUNING_COST,
+	  gettext_noop("Perform JIT compilation if query is more expensive."),
+	  gettext_noop("-1 disables JIT compilation."),
+	  GUC_EXPLAIN | GUC_GPDB_NEED_SYNC},
+	 &optimizer_jit_above_cost,
+	 7500,
+	 -1,
+	 DBL_MAX,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_jit_optimize_above_cost", PGC_USERSET, QUERY_TUNING_COST,
+	  gettext_noop("Optimize JITed functions if query is more expensive."),
+	  gettext_noop("-1 disables JIT optimization."),
+	  GUC_EXPLAIN | GUC_GPDB_NEED_SYNC},
+	 &optimizer_jit_optimize_above_cost,
+	 37500,
+	 -1,
+	 DBL_MAX,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_jit_inline_above_cost", PGC_USERSET, QUERY_TUNING_COST,
+	  gettext_noop("Perform JIT inlining if query is more expensive."),
+	  gettext_noop("-1 disables inlining."), GUC_EXPLAIN | GUC_GPDB_NEED_SYNC},
+	 &optimizer_jit_inline_above_cost,
+	 37500,
+	 -1,
+	 DBL_MAX,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	/* End-of-list marker */
+	{{NULL, 0, 0, NULL, NULL}, NULL, 0.0, 0.0, 0.0, NULL, NULL}};
+
+struct config_string configure_names_string_orca[] = {
+	{{"optimizer_search_strategy_path", PGC_USERSET, QUERY_TUNING_METHOD,
+	  gettext_noop("Sets the search strategy used by gp optimizer."), NULL,
+	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
+	 &optimizer_search_strategy_path,
+	 "default",
+	 NULL,
+	 NULL,
+	 NULL},
+
+	/* End-of-list marker */
+	{{NULL, 0, 0, NULL, NULL}, NULL, NULL, NULL, NULL}};
+
+struct config_enum configure_names_enum_orca[] = {
+	{{"optimizer_log_failure", PGC_USERSET, LOGGING_WHEN,
+	  gettext_noop("Sets which optimizer failures are logged."),
+	  gettext_noop("Valid values are unexpected, expected, all"),
+	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
+	 &optimizer_log_failure,
+	 OPTIMIZER_UNEXPECTED_FAIL,
+	 optimizer_log_failure_options,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{
+		 "optimizer_minidump",
+		 PGC_USERSET,
+		 LOGGING_WHEN,
+		 gettext_noop("Generate optimizer minidump."),
+		 gettext_noop("Valid values are onerror, always"),
+	 },
+	 &optimizer_minidump,
+	 OPTIMIZER_MINIDUMP_FAIL,
+	 optimizer_minidump_options,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_cost_model", PGC_USERSET, DEVELOPER_OPTIONS,
+	  gettext_noop("Set optimizer cost model."),
+	  gettext_noop("Valid values are legacy, calibrated, experimental"),
+	  GUC_NOT_IN_SAMPLE},
+	 &optimizer_cost_model,
+	 OPTIMIZER_GPDB_CALIBRATED,
+	 optimizer_cost_model_options,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	{{"optimizer_join_order", PGC_USERSET, QUERY_TUNING_OTHER,
+	  gettext_noop("Set optimizer join heuristic model."),
+	  gettext_noop(
+		  "Valid values are query, greedy, exhaustive and exhaustive2"),
+	  GUC_NOT_IN_SAMPLE},
+	 &optimizer_join_order,
+	 JOIN_ORDER_EXHAUSTIVE2_SEARCH,
+	 optimizer_join_order_options,
+	 NULL,
+	 NULL,
+	 NULL},
+
+	/* End-of-list marker */
+	{{NULL, 0, 0, NULL, NULL}, NULL, 0, NULL, NULL, NULL}};
+
+void
+orca_guc_define()
+{
+	int i;
+
+	for (i = 0; configure_names_bool_orca[i].gen.name; i++)
+	{
+		struct config_bool *conf = &configure_names_bool_orca[i];
+
+		DefineCustomBoolVariable(
+			conf->gen.name, conf->gen.short_desc, conf->gen.long_desc,
+			conf->variable, conf->boot_val, conf->gen.context,
+			ORCA_GUC_PROCESS_NO_SYNC_FLAG(conf->gen.flags), conf->check_hook,
+			conf->assign_hook, conf->show_hook);
+	}
+
+	for (i = 0; configure_names_int_orca[i].gen.name; i++)
+	{
+		struct config_int *conf = &configure_names_int_orca[i];
+
+		DefineCustomIntVariable(
+			conf->gen.name, conf->gen.short_desc, conf->gen.long_desc,
+			conf->variable, conf->boot_val, conf->min, conf->max,
+			conf->gen.context, ORCA_GUC_PROCESS_NO_SYNC_FLAG(conf->gen.flags),
+			conf->check_hook, conf->assign_hook, conf->show_hook);
+	}
+
+	for (i = 0; configure_names_real_orca[i].gen.name; i++)
+	{
+		struct config_real *conf = &configure_names_real_orca[i];
+
+		DefineCustomRealVariable(
+			conf->gen.name, conf->gen.short_desc, conf->gen.long_desc,
+			conf->variable, conf->boot_val, conf->min, conf->max,
+			conf->gen.context, ORCA_GUC_PROCESS_NO_SYNC_FLAG(conf->gen.flags),
+			conf->check_hook, conf->assign_hook, conf->show_hook);
+	}
+
+	for (i = 0; configure_names_string_orca[i].gen.name; i++)
+	{
+		struct config_string *conf = &configure_names_string_orca[i];
+
+		DefineCustomStringVariable(
+			conf->gen.name, conf->gen.short_desc, conf->gen.long_desc,
+			conf->variable, conf->boot_val, conf->gen.context,
+			ORCA_GUC_PROCESS_NO_SYNC_FLAG(conf->gen.flags), conf->check_hook,
+			conf->assign_hook, conf->show_hook);
+	}
+
+	for (i = 0; configure_names_enum_orca[i].gen.name; i++)
+	{
+		struct config_enum *conf = &configure_names_enum_orca[i];
+
+		DefineCustomEnumVariable(
+			conf->gen.name, conf->gen.short_desc, conf->gen.long_desc,
+			conf->variable, conf->boot_val, conf->options, conf->gen.context,
+			ORCA_GUC_PROCESS_NO_SYNC_FLAG(conf->gen.flags), conf->check_hook,
+			conf->assign_hook, conf->show_hook);
+	}
+}
diff --git a/src/backend/utils/misc/guc_gp.c b/src/backend/utils/misc/guc_gp.c
index 80b583d0785d..d9b9816b72bb 100644
--- a/src/backend/utils/misc/guc_gp.c
+++ b/src/backend/utils/misc/guc_gp.c
@@ -272,139 +272,13 @@ bool		gp_recursive_cte = true;
 bool		gp_eager_two_phase_agg = false;
 bool		gp_force_random_redistribution = false;
 
-/* Optimizer related gucs */
+/* External planner related gucs */
 bool		optimizer;
-bool		optimizer_log;
-int			optimizer_log_failure;
 bool		optimizer_control = true;
-bool		optimizer_trace_fallback;
-bool		optimizer_partition_selection_log;
-int			optimizer_minidump;
-int			optimizer_cost_model;
-bool		optimizer_metadata_caching;
-int			optimizer_mdcache_size;
-bool		optimizer_use_gpdb_allocators;
-
-/* Optimizer debugging GUCs */
-bool		optimizer_print_query;
-bool		optimizer_print_plan;
-bool		optimizer_print_xform;
-bool		optimizer_print_memo_after_exploration;
-bool		optimizer_print_memo_after_implementation;
-bool		optimizer_print_memo_after_optimization;
-bool		optimizer_print_job_scheduler;
-bool		optimizer_print_expression_properties;
-bool		optimizer_print_group_properties;
-bool		optimizer_print_optimization_context;
-bool		optimizer_print_optimization_stats;
-bool		optimizer_print_xform_results;
-
-/* array of xforms disable flags */
-bool		optimizer_xforms[OPTIMIZER_XFORMS_COUNT] = {[0 ... OPTIMIZER_XFORMS_COUNT - 1] = false};
-char	   *optimizer_search_strategy_path = NULL;
-
-/* GUCs to tell Optimizer to enable a physical operator */
-bool		optimizer_enable_nljoin;
-bool		optimizer_enable_indexjoin;
-bool		optimizer_enable_motions_coordinatoronly_queries;
-bool		optimizer_enable_motions;
-bool		optimizer_enable_motion_broadcast;
-bool		optimizer_enable_motion_gather;
-bool		optimizer_enable_motion_redistribute;
-bool		optimizer_enable_sort;
-bool		optimizer_enable_materialize;
-bool		optimizer_enable_partition_propagation;
-bool		optimizer_enable_partition_selection;
-bool		optimizer_enable_outerjoin_rewrite;
-bool		optimizer_enable_multiple_distinct_aggs;
-bool		optimizer_enable_direct_dispatch;
-bool		optimizer_enable_hashjoin_redistribute_broadcast_children;
-bool		optimizer_enable_broadcast_nestloop_outer_child;
-bool		optimizer_discard_redistribute_hashjoin;
-bool		optimizer_enable_streaming_material;
-bool		optimizer_enable_gather_on_segment_for_dml;
-bool		optimizer_enable_assert_maxonerow;
-bool		optimizer_enable_constant_expression_evaluation;
-bool		optimizer_enable_bitmapscan;
-bool		optimizer_enable_outerjoin_to_unionall_rewrite;
-bool		optimizer_enable_ctas;
-bool		optimizer_enable_dml;
-bool		optimizer_enable_dml_constraints;
-bool		optimizer_enable_coordinator_only_queries;
-bool		optimizer_enable_hashjoin;
-bool		optimizer_enable_dynamictablescan;
-bool		optimizer_enable_dynamicindexscan;
-bool		optimizer_enable_dynamicindexonlyscan;
-bool		optimizer_enable_dynamicbitmapscan;
-bool		optimizer_enable_indexscan;
-bool		optimizer_enable_indexonlyscan;
-bool		optimizer_enable_tablescan;
-bool		optimizer_enable_hashagg;
-bool		optimizer_enable_groupagg;
-bool		optimizer_expand_fulljoin;
-bool		optimizer_enable_mergejoin;
-bool		optimizer_enable_redistribute_nestloop_loj_inner_child;
-bool		optimizer_force_comprehensive_join_implementation;
-bool		optimizer_enable_replicated_table;
-bool		optimizer_enable_foreign_table;
-bool		optimizer_enable_right_outer_join;
+
 bool		optimizer_enable_query_parameter;
 
-/* Optimizer plan enumeration related GUCs */
-bool		optimizer_enumerate_plans;
-bool		optimizer_sample_plans;
-int			optimizer_plan_id;
-int			optimizer_samples_number;
-
-/* Cardinality estimation related GUCs used by the Optimizer */
-bool		optimizer_extract_dxl_stats;
-bool		optimizer_extract_dxl_stats_all_nodes;
-bool		optimizer_print_missing_stats;
-double		optimizer_damping_factor_filter;
-double		optimizer_damping_factor_join;
-double		optimizer_damping_factor_groupby;
-bool		optimizer_dpe_stats;
-bool		optimizer_enable_derive_stats_all_groups;
-
-/* Costing related GUCs used by the Optimizer */
-int			optimizer_segments;
-int			optimizer_penalize_broadcast_threshold;
-double		optimizer_cost_threshold;
-double		optimizer_nestloop_factor;
-double		optimizer_sort_factor;
-
-/* Optimizer hints */
-int			optimizer_join_arity_for_associativity_commutativity;
-int         optimizer_array_expansion_threshold;
-int         optimizer_join_order_threshold;
-int			optimizer_join_order;
-int			optimizer_cte_inlining_bound;
-int			optimizer_push_group_by_below_setop_threshold;
-int			optimizer_xform_bind_threshold;
-int			optimizer_skew_factor;
-bool		optimizer_force_multistage_agg;
-bool		optimizer_force_three_stage_scalar_dqa;
-bool		optimizer_force_expanded_distinct_aggs;
-bool		optimizer_force_agg_skew_avoidance;
-bool		optimizer_penalize_skew;
-bool		optimizer_prune_computed_columns;
-bool		optimizer_push_requirements_from_consumer_to_producer;
-bool		optimizer_enforce_subplans;
-bool		optimizer_use_external_constant_expression_evaluation_for_ints;
-bool		optimizer_apply_left_outer_to_union_all_disregarding_stats;
-bool		optimizer_remove_order_below_dml;
-bool		optimizer_multilevel_partitioning;
-bool 		optimizer_parallel_union;
-bool		optimizer_array_constraints;
-bool		optimizer_cte_inlining;
-bool		optimizer_enable_space_pruning;
-bool		optimizer_enable_associativity;
-bool		optimizer_enable_eageragg;
-bool		optimizer_enable_range_predicate_dpe;
-bool		optimizer_enable_push_join_below_union_all;
-bool		optimizer_enable_orderedagg;
-
-/* Analyze related GUCs for Optimizer */
+/* Analyze related GUCs for external planner */
 bool		optimizer_analyze_root_partition;
 bool		optimizer_analyze_midlevel_partition;
 
@@ -448,10 +322,6 @@ bool		gp_log_endpoints = false;
 /* optional reject to  parse ambigous 5-digits date in YYYMMDD format */
 bool		gp_allow_date_field_width_5digits = false;
 
-/* GUCs for Just In Time (JIT) compilation */
-double		optimizer_jit_above_cost;
-double		optimizer_jit_inline_above_cost;
-double		optimizer_jit_optimize_above_cost;
 
 /* Switch to toggle block-directory based sampling for AO/CO tables */
 bool		gp_enable_blkdir_sampling;
@@ -480,26 +350,6 @@ static const struct config_enum_entry debug_dtm_action_protocol_options[] = {
 	{NULL, 0}
 };
 
-static const struct config_enum_entry optimizer_log_failure_options[] = {
-	{"all", OPTIMIZER_ALL_FAIL},
-	{"unexpected", OPTIMIZER_UNEXPECTED_FAIL},
-	{"expected", OPTIMIZER_EXPECTED_FAIL},
-	{NULL, 0}
-};
-
-static const struct config_enum_entry optimizer_minidump_options[] = {
-	{"onerror", OPTIMIZER_MINIDUMP_FAIL},
-	{"always", OPTIMIZER_MINIDUMP_ALWAYS},
-	{NULL, 0}
-};
-
-static const struct config_enum_entry optimizer_cost_model_options[] = {
-	{"legacy", OPTIMIZER_GPDB_LEGACY},
-	{"calibrated", OPTIMIZER_GPDB_CALIBRATED},
-	{"experimental", OPTIMIZER_GPDB_EXPERIMENTAL},
-	{NULL, 0}
-};
-
 static const struct config_enum_entry explain_memory_verbosity_options[] = {
 	{"suppress", EXPLAIN_MEMORY_VERBOSITY_SUPPRESS},
 	{"summary", EXPLAIN_MEMORY_VERBOSITY_SUMMARY},
@@ -567,14 +417,6 @@ static const struct config_enum_entry gp_resqueue_memory_policies[] = {
 	{NULL, 0}
 };
 
-static const struct config_enum_entry optimizer_join_order_options[] = {
-	{"query", JOIN_ORDER_IN_QUERY},
-	{"greedy", JOIN_ORDER_GREEDY_SEARCH},
-	{"exhaustive", JOIN_ORDER_EXHAUSTIVE_SEARCH},
-	{"exhaustive2", JOIN_ORDER_EXHAUSTIVE2_SEARCH},
-	{NULL, 0}
-};
-
 static const struct config_enum_entry gp_autovacuum_scope_options[] = {
 	{"catalog", AV_SCOPE_CATALOG},
 	{"catalog_ao_aux", AV_SCOPE_CATALOG_AO_AUX},
@@ -1875,897 +1717,59 @@ struct config_bool ConfigureNamesBool_gp[] =
 	},
 
 	{
-		{"optimizer_log", PGC_USERSET, LOGGING_WHAT,
-			gettext_noop("Log optimizer messages."),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		{"optimizer_control", PGC_SUSET, DEVELOPER_OPTIONS,
+			gettext_noop("Allow/disallow turning the optimizer on or off."),
+			NULL
 		},
-		&optimizer_log,
+		&optimizer_control,
 		true,
 		NULL, NULL, NULL
 	},
 
-	{
-		{"optimizer_trace_fallback", PGC_USERSET, LOGGING_WHAT,
-			gettext_noop("Print a message at INFO level, whenever GPORCA falls back."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_trace_fallback,
-		false,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_partition_selection_log", PGC_USERSET, LOGGING_WHAT,
-			gettext_noop("Log optimizer partition selection."),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_partition_selection_log,
-		false,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_print_query", PGC_USERSET, LOGGING_WHAT,
-			gettext_noop("Prints the optimizer's input query expression tree."),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_print_query,
-		false,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_print_plan", PGC_USERSET, LOGGING_WHAT,
-			gettext_noop("Prints the plan expression tree produced by the optimizer."),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_print_plan,
-		false,
-		NULL, NULL, NULL
-	},
 
-	{
-		{"optimizer_print_xform", PGC_USERSET, LOGGING_WHAT,
-			gettext_noop("Prints optimizer transformation information."),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_print_xform,
-		false,
-		NULL, NULL, NULL
-	},
 
 	{
-		{"optimizer_metadata_caching", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("This guc enables the optimizer to cache and reuse metadata."),
+		{"optimizer_analyze_root_partition", PGC_USERSET, STATS_ANALYZE,
+			gettext_noop("Enable statistics collection on root partitions during ANALYZE"),
 			NULL
 		},
-		&optimizer_metadata_caching,
-		true,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_print_missing_stats", PGC_USERSET, LOGGING_WHAT,
-			gettext_noop("Print columns with missing statistics."),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_print_missing_stats,
+		&optimizer_analyze_root_partition,
 		true,
 		NULL, NULL, NULL
 	},
 
 	{
-		{"optimizer_print_xform_results", PGC_USERSET, LOGGING_WHAT,
-			gettext_noop("Print the input and output of optimizer transformations."),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_print_xform_results,
-		false,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_print_memo_after_exploration", PGC_USERSET, LOGGING_WHAT,
-			gettext_noop("Print optimizer memo structure after the exploration phase."),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_print_memo_after_exploration,
-		false,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_print_memo_after_implementation", PGC_USERSET, LOGGING_WHAT,
-			gettext_noop("Print optimizer memo structure after the implementation phase."),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_print_memo_after_implementation,
-		false,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_print_memo_after_optimization", PGC_USERSET, LOGGING_WHAT,
-			gettext_noop("Print optimizer memo structure after optimization."),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_print_memo_after_optimization,
-		false,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_print_job_scheduler", PGC_USERSET, LOGGING_WHAT,
-			gettext_noop("Print the jobs in the scheduler on each job completion."),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_print_job_scheduler,
-		false,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_print_expression_properties", PGC_USERSET, LOGGING_WHAT,
-			gettext_noop("Print expression properties."),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_print_expression_properties,
-		false,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_print_group_properties", PGC_USERSET, LOGGING_WHAT,
-			gettext_noop("Print group properties."),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_print_group_properties,
-		false,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_print_optimization_context", PGC_USERSET, LOGGING_WHAT,
-			gettext_noop("Print the optimization context."),
+		{"optimizer_analyze_midlevel_partition", PGC_USERSET, STATS_ANALYZE,
+			gettext_noop("Enable statistics collection on intermediate partitions during ANALYZE"),
 			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+			GUC_NOT_IN_SAMPLE
 		},
-		&optimizer_print_optimization_context,
+		&optimizer_analyze_midlevel_partition,
 		false,
 		NULL, NULL, NULL
 	},
 
-	{
-		{"optimizer_print_optimization_stats", PGC_USERSET, LOGGING_WHAT,
-			gettext_noop("Print optimization stats."),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_print_optimization_stats,
-		false,
-		NULL, NULL, NULL
-	},
+	
 
 	{
-		{"optimizer_extract_dxl_stats", PGC_USERSET, LOGGING_WHAT,
-			gettext_noop("Extract plan stats in dxl."),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_extract_dxl_stats,
-		false,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_extract_dxl_stats_all_nodes", PGC_USERSET, LOGGING_WHAT,
-			gettext_noop("Extract plan stats for all physical dxl nodes."),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_extract_dxl_stats_all_nodes,
-		false,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_dpe_stats", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enable statistics derivation for partitioned tables with dynamic partition elimination."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_dpe_stats,
-		true,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_enable_nljoin", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enable nested loops join plans in the optimizer."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_nljoin,
-		true,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_enable_indexjoin", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enable index nested loops join plans in the optimizer."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_indexjoin,
-		true,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_enable_motions_masteronly_queries", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enable plans with Motion operators in the optimizer for queries with no distributed tables."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_motions_coordinatoronly_queries,
-		false,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_enable_motions", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enable plans with Motion operators in the optimizer."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_motions,
-		true,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_enable_motion_broadcast", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enable plans with Motion Broadcast operators in the optimizer."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_motion_broadcast,
-		true,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_enable_motion_gather", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enable plans with Motion Gather operators in the optimizer."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_motion_gather,
-		true,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_enable_motion_redistribute", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enable plans with Motion Redistribute operators in the optimizer."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_motion_redistribute,
-		true,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_enable_sort", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enable plans with Sort operators in the optimizer."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_sort,
-		true,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_enable_materialize", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enable plans with Materialize operators in the optimizer."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_materialize,
-		true,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_enable_partition_propagation", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enable plans with Partition Propagation operators in the optimizer."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_partition_propagation,
-		true,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_enable_partition_selection", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enable plans with Partition Selection operators in the optimizer."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_partition_selection,
-		true,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_enable_outerjoin_rewrite", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enable outer join to inner join rewrite in the optimizer."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_outerjoin_rewrite,
-		true,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_enable_direct_dispatch", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enable direct dispatch in the optimizer."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_direct_dispatch,
-		true,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_control", PGC_SUSET, DEVELOPER_OPTIONS,
-			gettext_noop("Allow/disallow turning the optimizer on or off."),
-			NULL
-		},
-		&optimizer_control,
-		true,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_enable_space_pruning", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Enable space pruning in the optimizer."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_space_pruning,
-		true,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_enable_master_only_queries", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Process coordinator only queries via the optimizer."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_coordinator_only_queries,
-		false,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_enable_hashjoin", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enables the optimizer's use of hash join plans."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_hashjoin,
-		true,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_enable_dynamictablescan", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enables the optimizer's use of plans with dynamic table scan."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_dynamictablescan,
-		true,
-		NULL, NULL, NULL
-	},
-
-	{
-			{"optimizer_enable_dynamicindexscan", PGC_USERSET, QUERY_TUNING_METHOD,
-					gettext_noop("Enables the optimizer's use of plans with dynamic index scan."),
-					NULL,
-					GUC_NOT_IN_SAMPLE
-			},
-			&optimizer_enable_dynamicindexscan,
-			true,
-			NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_enable_dynamicindexonlyscan", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enables the optimizer's use of plans with dynamic index only scan."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_dynamicindexonlyscan,
-		true,
-		NULL, NULL, NULL
-	},
-
-	{
-			{"optimizer_enable_dynamicbitmapscan", PGC_USERSET, QUERY_TUNING_METHOD,
-					gettext_noop("Enables the optimizer's use of plans with dynamic bitmap scan."),
-					NULL,
-					GUC_NOT_IN_SAMPLE
-			},
-			&optimizer_enable_dynamicbitmapscan,
-			true,
-			NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_enable_indexscan", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enables the optimizer's use of plans with index scan."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_indexscan,
-		true,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_enable_indexonlyscan", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enables the optimizer's use of plans with index only scan."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_indexonlyscan,
-		true,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_enable_tablescan", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enables the optimizer's use of plans with table scan."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_tablescan,
-		true,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_enable_hashagg", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enables GPORCA to use hash aggregates."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_hashagg,
-		true,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_enable_groupagg", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enables GPORCA to use group aggregates."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_groupagg,
-		true,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_force_agg_skew_avoidance", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Always pick a plan for aggregate distinct that minimizes skew."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_force_agg_skew_avoidance,
-		true,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_penalize_skew", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Penalize operators with skewed hash redistribute below it."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_penalize_skew,
-		true,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_multilevel_partitioning", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Enable optimization of queries on multilevel partitioned tables."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_multilevel_partitioning,
-		true,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_enable_derive_stats_all_groups", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Enable stats derivation for all groups after exploration."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_derive_stats_all_groups,
-		false,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_force_multistage_agg", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Force optimizer to always pick multistage aggregates when such a plan alternative is generated."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_force_multistage_agg,
-		false,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_enable_multiple_distinct_aggs", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enable plans with multiple distinct aggregates in the optimizer."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_multiple_distinct_aggs,
-		false,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_force_expanded_distinct_aggs", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Always pick plans that expand multiple distinct aggregates into join of single distinct aggregate in the optimizer."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_force_expanded_distinct_aggs,
-		true,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_prune_computed_columns", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Prune unused computed columns when pre-processing query"),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_prune_computed_columns,
-		true,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_push_requirements_from_consumer_to_producer", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Optimize CTE producer plan on requirements enforced on top of CTE consumer in the optimizer."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_push_requirements_from_consumer_to_producer,
-		true,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_enable_hashjoin_redistribute_broadcast_children", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enable hash join plans with, Redistribute outer child and Broadcast inner child, in the optimizer."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_hashjoin_redistribute_broadcast_children,
-		false,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_enable_broadcast_nestloop_outer_child", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enable nested loops join plans with replicated outer child in the optimizer."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_broadcast_nestloop_outer_child,
-		true,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_discard_redistribute_hashjoin", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Discard hash join with redistribute motion in the optimizer."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_discard_redistribute_hashjoin,
-		false,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_expand_fulljoin", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enables the optimizer's support of expanding full outer joins using union all."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_expand_fulljoin,
-		false,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_enable_mergejoin", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enables the optimizer's support of merge joins."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_mergejoin,
-		true,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_enable_streaming_material", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enable plans with a streaming material node in the optimizer."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_streaming_material,
-		true,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_enable_gather_on_segment_for_dml", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enable DML optimization by enforcing a non-coordinator gather in the optimizer."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_gather_on_segment_for_dml,
-		true,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_enforce_subplans", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Enforce correlated execution in the optimizer"),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enforce_subplans,
-		false,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_enable_assert_maxonerow", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enable Assert MaxOneRow plans to check number of rows at runtime."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_assert_maxonerow,
-		true,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_enumerate_plans", PGC_USERSET, LOGGING_WHAT,
-			gettext_noop("Enable plan enumeration"),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enumerate_plans,
-		false,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_sample_plans", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Enable plan sampling"),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_sample_plans,
-		false,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_cte_inlining", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Enable CTE inlining"),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_cte_inlining,
-		false,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_analyze_root_partition", PGC_USERSET, STATS_ANALYZE,
-			gettext_noop("Enable statistics collection on root partitions during ANALYZE"),
-			NULL
-		},
-		&optimizer_analyze_root_partition,
-		true,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_analyze_midlevel_partition", PGC_USERSET, STATS_ANALYZE,
-			gettext_noop("Enable statistics collection on intermediate partitions during ANALYZE"),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_analyze_midlevel_partition,
-		false,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_enable_constant_expression_evaluation", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enable constant expression evaluation in the optimizer"),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_constant_expression_evaluation,
-		true,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_use_external_constant_expression_evaluation_for_ints", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Use external constant expression evaluation in the optimizer for all integer types"),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_use_external_constant_expression_evaluation_for_ints,
-		false,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_enable_bitmapscan", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enable bitmap plans in the optimizer"),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_bitmapscan,
-		true,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_enable_outerjoin_to_unionall_rewrite", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enable rewriting Left Outer Join to UnionAll"),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_outerjoin_to_unionall_rewrite,
-		false,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_apply_left_outer_to_union_all_disregarding_stats", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Always apply Left Outer Join to Inner Join UnionAll Left Anti Semi Join without looking at stats."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_apply_left_outer_to_union_all_disregarding_stats,
-		false,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_enable_ctas", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enable CTAS plans in the optimizer"),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_ctas,
-		true,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_remove_order_below_dml", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Remove OrderBy below a DML operation"),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_remove_order_below_dml,
-		false,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_enable_dml", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enable DML plans in GPORCA."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_dml,
-		true,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_enable_dml_constraints", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Support DML with CHECK constraints and NOT NULL constraints."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_dml_constraints,
-		true,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"gp_log_optimization_time", PGC_USERSET, LOGGING_WHAT,
-			gettext_noop("Writes time spent producing a plan to the server log"),
+		{"gp_log_optimization_time", PGC_USERSET, LOGGING_WHAT,
+			gettext_noop("Writes time spent producing a plan to the server log"),
 			NULL,
 			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
 		},
 		&gp_log_optimization_time,
-		false,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"gp_reject_internal_tcp_connection", PGC_POSTMASTER, DEFUNCT_OPTIONS,
-			gettext_noop("Unused. Syntax check only for GPDB compatibility."),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&gp_reject_internal_tcp_conn,
-		false,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_force_three_stage_scalar_dqa", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Force optimizer to always pick 3 stage aggregate plan for scalar distinct qualified aggregate."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_force_three_stage_scalar_dqa,
-		true,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_parallel_union", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Enable parallel execution for UNION/UNION ALL queries."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_parallel_union,
-		false,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_array_constraints", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Allows the optimizer's constraint framework to derive array constraints."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_array_constraints,
-		true,
+		false,
 		NULL, NULL, NULL
 	},
 
 	{
-		{"optimizer_use_gpdb_allocators", PGC_POSTMASTER, RESOURCES_MEM,
-			gettext_noop("Enable ORCA to use GPDB Memory Contexts"),
+		{"gp_reject_internal_tcp_connection", PGC_POSTMASTER, DEFUNCT_OPTIONS,
+			gettext_noop("Unused. Syntax check only for GPDB compatibility."),
 			NULL,
-			GUC_NOT_IN_SAMPLE
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
 		},
-		&optimizer_use_gpdb_allocators,
-		true,
+		&gp_reject_internal_tcp_conn,
+		false,
 		NULL, NULL, NULL
 	},
 
@@ -2824,15 +1828,6 @@ struct config_bool ConfigureNamesBool_gp[] =
 		NULL, NULL, NULL
 	},
 
-	{
-		{"optimizer_enable_associativity", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enables Join Associativity in optimizer"),
-			NULL
-		},
-		&optimizer_enable_associativity,
-		false, NULL, NULL
-	},
-
 	{
 		{"optimizer_replicated_table_insert", PGC_USERSET, STATS_ANALYZE,
 			gettext_noop("Omit broadcast motion when inserting into replicated table"),
@@ -2938,47 +1933,7 @@ struct config_bool ConfigureNamesBool_gp[] =
 		false,
 		NULL, NULL, NULL
 	},
-	{
-		{"optimizer_enable_orderedagg", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Enable ordered aggregate plans."),
-			NULL
-		},
-		&optimizer_enable_orderedagg,
-		true,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_enable_eageragg", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Enable Eager Agg transform for pushing aggregate below an innerjoin."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_eageragg,
-		false,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_enable_range_predicate_dpe", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Enable range predicates for dynamic partition elimination."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_range_predicate_dpe,
-		false,
-		NULL, NULL, NULL
-	},
 
-	{
-		{"optimizer_enable_push_join_below_union_all", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Enable transform of join of union all to union all of joins. May improve the join performance."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_push_join_below_union_all,
-		false,
-		NULL, NULL, NULL
-	},
 	{
 		{"gp_autostats_allow_nonowner", PGC_SUSET, DEVELOPER_OPTIONS,
 			gettext_noop("Allow automatic stats collection on tables even for users who are not the owner of the relation."),
@@ -2988,69 +1943,6 @@ struct config_bool ConfigureNamesBool_gp[] =
 		false,
 		NULL, NULL, NULL
 	},
-
-	{
-		{"optimizer_enable_redistribute_nestloop_loj_inner_child", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Enable nested loops left join plans with redistributed inner child in the optimizer."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_redistribute_nestloop_loj_inner_child,
-		true,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_force_comprehensive_join_implementation", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Explore a nested loop join even if a hash join is possible"),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_force_comprehensive_join_implementation,
-		false,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_enable_replicated_table", PGC_USERSET, DEVELOPER_OPTIONS,
-		 gettext_noop("Enable replicated tables."),
-		 NULL,
-		 GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_replicated_table,
-		true,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_enable_foreign_table", PGC_USERSET, DEVELOPER_OPTIONS,
-		 gettext_noop("Enable foreign tables in Orca."),
-		 NULL,
-		 GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_foreign_table,
-		true,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_enable_right_outer_join", PGC_USERSET, QUERY_TUNING_METHOD,
-		 gettext_noop("Enable Orca to generate plans containing right outer joins."),
-		 gettext_noop("Right outer join can be re-written from left outer join. "
-					  "However, there are scenarios due to cardinality and cost "
-					  "misestimation, right outer join plan may be sub-optimal and "
-					  "can either be slower than the left outer join plan alternative "
-					  "or hit out-of-memory (OOM). The root cause can be identified "
-					  "by viewing the explain analyze plan and observing that the "
-					  "right outer join plan node is consuming all resources "
-					  "(CPU/memory) or the explain analyze itself hits OOM. By "
-					  "setting this GUC value to \"false\" users can force GPORCA to "
-					  "generate an equivalent left outer join plan. We recommend that "
-					  "the GUC be set at the query level as there can be several use "
-					  "cases where right outer join is the best plan alternative to "
-					  "choose."),
-		 GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_right_outer_join,
-		true,
-		NULL, NULL, NULL
-	},
 	{
 		{"optimizer_enable_query_parameter", PGC_USERSET, DEVELOPER_OPTIONS,
 		 gettext_noop("Enable query parameters in Orca."),
@@ -3061,26 +1953,6 @@ struct config_bool ConfigureNamesBool_gp[] =
 		true,
 		NULL, NULL, NULL
 	},
-	{
-		{"optimizer_enable_coordinator_only_queries", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Process coordinator only queries via the optimizer."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_coordinator_only_queries,
-		false,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_enable_motions_coordinatoronly_queries", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Enable plans with Motion operators in the optimizer for queries with no distributed tables."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_motions_coordinatoronly_queries,
-		false,
-		NULL, NULL, NULL
-	},
 	{
 		{"gp_log_suboverflow_statement", PGC_SUSET, LOGGING_WHAT,
 		 gettext_noop("Enable logging of statements that cause subtransaction overflow."),
@@ -4098,136 +2970,6 @@ struct config_int ConfigureNamesInt_gp[] =
 		120, 5, INT_MAX, NULL, NULL
 	},
 
-	{
-		{"optimizer_plan_id", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Choose a plan alternative"),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_plan_id,
-		0, 0, INT_MAX,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_samples_number", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Set the number of plan samples"),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_samples_number,
-		1000, 1, INT_MAX,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_cte_inlining_bound", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Set the CTE inlining cutoff"),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_cte_inlining_bound,
-		0, 0, INT_MAX,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_segments", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Number of segments to be considered by the optimizer during costing, or 0 to take the actual number of segments."),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_segments,
-		0, 0, INT_MAX,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_array_expansion_threshold", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Item limit for expansion of arrays in WHERE clause for constraint derivation."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_array_expansion_threshold,
-		20, 0, INT_MAX,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_push_group_by_below_setop_threshold", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Maximum number of children setops have to consider pushing group bys below it"),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_push_group_by_below_setop_threshold,
-		10, 0, INT_MAX,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_xform_bind_threshold", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Maximum number bindings per xform per group expression. A value of 0 disables."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_xform_bind_threshold,
-		0, 0, INT_MAX,
-		NULL, NULL, NULL
-	},
-
-    {
-            {"optimizer_skew_factor", PGC_USERSET, DEVELOPER_OPTIONS,
-             gettext_noop("Coefficient of skew ratio computed from sample stastics. Default 0: skew computation from sample statistics turned off. [1,100]: skew ratio computed from sample statistics. The skewness used for costing is the product of the optimizer_skew_factor and the skew ratio."),
-             NULL,
-			 GUC_NOT_IN_SAMPLE
-            },
-            &optimizer_skew_factor,
-            0, 0, 100,
-            NULL, NULL, NULL
-    },
-
-	{
-		{"optimizer_join_order_threshold", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Maximum number of join children to use dynamic programming based join ordering algorithm."),
-			NULL
-		},
-		&optimizer_join_order_threshold,
-		10, 0, 12,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_join_arity_for_associativity_commutativity", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Maximum number of children n-ary-join have without disabling commutativity and associativity transform"),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_join_arity_for_associativity_commutativity,
-		18, 0, INT_MAX,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_penalize_broadcast_threshold", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Maximum number of rows of a relation that can be broadcasted without penalty. A value of 0 disables."),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_penalize_broadcast_threshold,
-		100000, 0, INT_MAX,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_mdcache_size", PGC_USERSET, RESOURCES_MEM,
-			gettext_noop("Sets the size of MDCache."),
-			NULL,
-			GUC_UNIT_KB
-		},
-		&optimizer_mdcache_size,
-		16384, 0, INT_MAX,
-		NULL, NULL, NULL
-	},
 
 	{
 		{"memory_profiler_dataset_size", PGC_USERSET, DEVELOPER_OPTIONS,
@@ -4465,101 +3207,6 @@ struct config_real ConfigureNamesReal_gp[] =
 		NULL, NULL, NULL
 	},
 
-	{
-		{"optimizer_damping_factor_filter", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("select predicate damping factor in optimizer, 1.0 means no damping"),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_damping_factor_filter,
-		0.75, 0.0, 1.0,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_damping_factor_join", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("join predicate damping factor in optimizer, 1.0 means no damping, 0.0 means square root method"),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_damping_factor_join,
-		0.0, 0.0, 1.0,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_damping_factor_groupby", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("groupby operator damping factor in optimizer, 1.0 means no damping"),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_damping_factor_groupby,
-		0.75, 0.0, 1.0,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_cost_threshold", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Set the threshold for plan sampling relative to the cost of best plan, 0.0 means unbounded"),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_cost_threshold,
-		0.0, 0.0, INT_MAX,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_nestloop_factor", PGC_USERSET, QUERY_TUNING_OTHER,
-			gettext_noop("Set the nestloop join cost factor in the optimizer"),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_nestloop_factor,
-		1024.0, 1.0, DBL_MAX,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_sort_factor",PGC_USERSET, QUERY_TUNING_OTHER,
-			gettext_noop("Set the sort cost factor in the optimizer, 1.0 means same as default, > 1.0 means more costly than default, < 1.0 means means less costly than default"),
-			NULL,
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_sort_factor,
-		1.0, 0.0, DBL_MAX,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_jit_above_cost",PGC_USERSET, QUERY_TUNING_COST,
-			gettext_noop("Perform JIT compilation if query is more expensive."),
-			gettext_noop("-1 disables JIT compilation."),
-			GUC_EXPLAIN
-		},
-		&optimizer_jit_above_cost,
-		7500, -1, DBL_MAX,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_jit_optimize_above_cost",PGC_USERSET, QUERY_TUNING_COST,
-			gettext_noop("Optimize JITed functions if query is more expensive."),
-			gettext_noop("-1 disables JIT optimization."),
-			GUC_EXPLAIN
-		},
-		&optimizer_jit_optimize_above_cost,
-		37500, -1, DBL_MAX,
-		NULL, NULL, NULL
-	},
-	{
-		{"optimizer_jit_inline_above_cost",PGC_USERSET, QUERY_TUNING_COST,
-			gettext_noop("Perform JIT inlining if query is more expensive."),
-			gettext_noop("-1 disables inlining."),
-			GUC_EXPLAIN
-		},
-		&optimizer_jit_inline_above_cost,
-		37500, -1, DBL_MAX,
-		NULL, NULL, NULL
-	},
-
 	/* End-of-list marker */
 	{
 		{NULL, 0, 0, NULL, NULL}, NULL, 0.0, 0.0, 0.0, NULL, NULL
@@ -4701,17 +3348,6 @@ struct config_string ConfigureNamesString_gp[] =
 		NULL, NULL, NULL
 	},
 
-	{
-		{"optimizer_search_strategy_path", PGC_USERSET, QUERY_TUNING_METHOD,
-			gettext_noop("Sets the search strategy used by gp optimizer."),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_search_strategy_path,
-		"default",
-		NULL, NULL, NULL
-	},
-
 	{
 		{"gp_default_storage_options", PGC_USERSET, APPENDONLY_TABLES,
 			gettext_noop("Sets the default options for appendonly storage."),
@@ -4816,38 +3452,6 @@ struct config_enum ConfigureNamesEnum_gp[] =
 		NULL, NULL, NULL
 	},
 
-	{
-		{"optimizer_log_failure", PGC_USERSET, LOGGING_WHEN,
-			gettext_noop("Sets which optimizer failures are logged."),
-			gettext_noop("Valid values are unexpected, expected, all"),
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_log_failure,
-		OPTIMIZER_UNEXPECTED_FAIL, optimizer_log_failure_options,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_minidump", PGC_USERSET, LOGGING_WHEN,
-			gettext_noop("Generate optimizer minidump."),
-			gettext_noop("Valid values are onerror, always"),
-		},
-		&optimizer_minidump,
-		OPTIMIZER_MINIDUMP_FAIL, optimizer_minidump_options,
-		NULL, NULL, NULL
-	},
-
-	{
-		{"optimizer_cost_model", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Set optimizer cost model."),
-			gettext_noop("Valid values are legacy, calibrated, experimental"),
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_cost_model,
-		OPTIMIZER_GPDB_CALIBRATED, optimizer_cost_model_options,
-		NULL, NULL, NULL
-	},
-
 	{
 		{"explain_memory_verbosity", PGC_USERSET, RESOURCES_MEM,
 			gettext_noop("Experimental feature: show memory account usage in EXPLAIN ANALYZE."),
@@ -4986,17 +3590,6 @@ struct config_enum ConfigureNamesEnum_gp[] =
 		RESMANAGER_MEMORY_POLICY_EAGER_FREE, gp_resqueue_memory_policies, NULL, NULL
 	},
 
-	{
-		{"optimizer_join_order", PGC_USERSET, QUERY_TUNING_OTHER,
-			gettext_noop("Set optimizer join heuristic model."),
-			gettext_noop("Valid values are query, greedy, exhaustive and exhaustive2"),
-			GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_join_order,
-		JOIN_ORDER_EXHAUSTIVE2_SEARCH, optimizer_join_order_options,
-		NULL, NULL, NULL
-	},
-
 	{
 		{"gp_autovacuum_scope", PGC_SIGHUP, AUTOVACUUM,
 		 gettext_noop("Sets which tables are eligible for autovacuum of dead tuples."),
diff --git a/src/include/jit/jit.h b/src/include/jit/jit.h
index c76941ed4b62..5c9d2f1910bf 100644
--- a/src/include/jit/jit.h
+++ b/src/include/jit/jit.h
@@ -90,11 +90,6 @@ extern double jit_above_cost;
 extern double jit_inline_above_cost;
 extern double jit_optimize_above_cost;
 
-/* Optimizer specific JIT GUCs */
-extern double optimizer_jit_above_cost;
-extern double optimizer_jit_inline_above_cost;
-extern double optimizer_jit_optimize_above_cost;
-
 extern void jit_reset_after_error(void);
 extern void jit_release_context(JitContext *context);
 
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index fd5d28f0ae0f..bb5bacfabcf0 100644
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -422,177 +422,24 @@ extern bool create_restartpoint_on_ckpt_record_replay;
 #define EXPLAIN_MEMORY_VERBOSITY_SUMMARY	1 /* Summary of memory usage for each owner in explain analyze */
 #define EXPLAIN_MEMORY_VERBOSITY_DETAIL		2 /* Detail memory accounting tree for each slice in explain analyze */
 
-/* ORCA related definitions */
-#define OPTIMIZER_XFORMS_COUNT 400 /* number of transformation rules */
 
-/* types of optimizer failures */
-#define OPTIMIZER_ALL_FAIL 			0  /* all failures */
-#define OPTIMIZER_UNEXPECTED_FAIL 	1  /* unexpected failures */
-#define OPTIMIZER_EXPECTED_FAIL 	2 /* expected failures */
-
-/* optimizer minidump mode */
-#define OPTIMIZER_MINIDUMP_FAIL  	0  /* create optimizer minidump on failure */
-#define OPTIMIZER_MINIDUMP_ALWAYS 	1  /* always create optimizer minidump */
-
-/* optimizer cost model */
-#define OPTIMIZER_GPDB_LEGACY           0       /* GPDB's legacy cost model */
-#define OPTIMIZER_GPDB_CALIBRATED       1       /* GPDB's calibrated cost model */
-#define OPTIMIZER_GPDB_EXPERIMENTAL     2       /* GPDB's experimental cost model */
-
-
-/* Optimizer related gucs */
+/* External planner related gucs */
 extern bool	optimizer;
 extern bool optimizer_control;	/* controls whether the user can change the setting of the "optimizer" guc */
-extern bool	optimizer_log;
-extern int  optimizer_log_failure;
-extern bool	optimizer_trace_fallback;
-extern int optimizer_minidump;
-extern int  optimizer_cost_model;
-extern bool optimizer_metadata_caching;
-extern int	optimizer_mdcache_size;
-
-/* Optimizer debugging GUCs */
-extern bool optimizer_print_query;
-extern bool optimizer_print_plan;
-extern bool optimizer_print_xform;
-extern bool	optimizer_print_memo_after_exploration;
-extern bool	optimizer_print_memo_after_implementation;
-extern bool	optimizer_print_memo_after_optimization;
-extern bool	optimizer_print_job_scheduler;
-extern bool	optimizer_print_expression_properties;
-extern bool	optimizer_print_group_properties;
-extern bool	optimizer_print_optimization_context;
-extern bool optimizer_print_optimization_stats;
-extern bool optimizer_print_xform_results;
-
-/* array of xforms disable flags */
-extern bool optimizer_xforms[OPTIMIZER_XFORMS_COUNT];
-extern char *optimizer_search_strategy_path;
-
-/* GUCs to tell Optimizer to enable a physical operator */
-extern bool optimizer_enable_nljoin;
-extern bool optimizer_enable_indexjoin;
-extern bool optimizer_enable_motions_coordinatoronly_queries;
-extern bool optimizer_enable_motions;
-extern bool optimizer_enable_motion_broadcast;
-extern bool optimizer_enable_motion_gather;
-extern bool optimizer_enable_motion_redistribute;
-extern bool optimizer_enable_sort;
-extern bool optimizer_enable_materialize;
-extern bool optimizer_enable_partition_propagation;
-extern bool optimizer_enable_partition_selection;
-extern bool optimizer_enable_outerjoin_rewrite;
-extern bool optimizer_enable_multiple_distinct_aggs;
-extern bool optimizer_enable_hashjoin_redistribute_broadcast_children;
-extern bool optimizer_enable_broadcast_nestloop_outer_child;
-extern bool optimizer_discard_redistribute_hashjoin;
-extern bool optimizer_enable_streaming_material;
-extern bool optimizer_enable_gather_on_segment_for_dml;
-extern bool optimizer_enable_assert_maxonerow;
-extern bool optimizer_enable_constant_expression_evaluation;
-extern bool optimizer_enable_bitmapscan;
-extern bool optimizer_enable_outerjoin_to_unionall_rewrite;
-extern bool optimizer_enable_ctas;
-extern bool optimizer_enable_dml;
-extern bool	optimizer_enable_dml_constraints;
-extern bool optimizer_enable_direct_dispatch;
-extern bool optimizer_enable_coordinator_only_queries;
-extern bool optimizer_enable_hashjoin;
-extern bool optimizer_enable_dynamictablescan;
-extern bool optimizer_enable_dynamicindexscan;
-extern bool optimizer_enable_dynamicindexonlyscan;
-extern bool optimizer_enable_dynamicbitmapscan;
-extern bool optimizer_enable_indexscan;
-extern bool optimizer_enable_indexonlyscan;
-extern bool optimizer_enable_tablescan;
-extern bool optimizer_enable_eageragg;
-extern bool optimizer_enable_orderedagg;
-extern bool optimizer_expand_fulljoin;
-extern bool optimizer_enable_hashagg;
-extern bool optimizer_enable_groupagg;
-extern bool optimizer_enable_mergejoin;
-extern bool optimizer_enable_redistribute_nestloop_loj_inner_child;
-extern bool optimizer_force_comprehensive_join_implementation;
-extern bool optimizer_enable_replicated_table;
-extern bool optimizer_enable_foreign_table;
-extern bool optimizer_enable_right_outer_join;
+
 extern bool optimizer_enable_query_parameter;
 
-/* Optimizer plan enumeration related GUCs */
-extern bool optimizer_enumerate_plans;
-extern bool optimizer_sample_plans;
-extern int	optimizer_plan_id;
-extern int	optimizer_samples_number;
-
-/* Optimizer Just In Time (JIT) compilation related GUCs*/
-extern  double  optimizer_jit_above_cost;
-extern  double  optimizer_jit_inline_above_cost;
-extern  double  optimizer_jit_optimize_above_cost;
-
-/* Cardinality estimation related GUCs used by the Optimizer */
-extern bool optimizer_extract_dxl_stats;
-extern bool optimizer_extract_dxl_stats_all_nodes;
-extern bool optimizer_print_missing_stats;
-extern double optimizer_damping_factor_filter;
-extern double optimizer_damping_factor_join;
-extern double optimizer_damping_factor_groupby;
-extern bool optimizer_dpe_stats;
-extern bool optimizer_enable_derive_stats_all_groups;
-
-/* Costing or tuning related GUCs used by the Optimizer */
-extern int optimizer_segments;
-extern int optimizer_penalize_broadcast_threshold;
-extern double optimizer_cost_threshold;
-extern double optimizer_nestloop_factor;
-extern double optimizer_sort_factor;
-
-/* Optimizer hints */
-extern int optimizer_array_expansion_threshold;
-extern int optimizer_join_order_threshold;
-extern int optimizer_join_order;
-extern int optimizer_join_arity_for_associativity_commutativity;
-extern int optimizer_cte_inlining_bound;
-extern int optimizer_push_group_by_below_setop_threshold;
-extern int optimizer_xform_bind_threshold;
-extern int optimizer_skew_factor;
-extern bool optimizer_force_multistage_agg;
-extern bool optimizer_force_three_stage_scalar_dqa;
-extern bool optimizer_force_expanded_distinct_aggs;
-extern bool optimizer_force_agg_skew_avoidance;
-extern bool optimizer_penalize_skew;
-extern bool optimizer_prune_computed_columns;
-extern bool optimizer_push_requirements_from_consumer_to_producer;
-extern bool optimizer_enforce_subplans;
-extern bool optimizer_apply_left_outer_to_union_all_disregarding_stats;
-extern bool optimizer_use_external_constant_expression_evaluation_for_ints;
-extern bool optimizer_remove_order_below_dml;
-extern bool optimizer_multilevel_partitioning;
-extern bool optimizer_parallel_union;
-extern bool optimizer_array_constraints;
-extern bool optimizer_cte_inlining;
-extern bool optimizer_enable_space_pruning;
-extern bool optimizer_enable_associativity;
-extern bool optimizer_enable_range_predicate_dpe;
-extern bool optimizer_enable_push_join_below_union_all;
-
-/* Analyze related GUCs for Optimizer */
+/* Analyze related GUCs for external planner */
 extern bool optimizer_analyze_root_partition;
 extern bool optimizer_analyze_midlevel_partition;
 
-extern bool optimizer_use_gpdb_allocators;
-
-/* optimizer GUCs for replicated table */
+/* External planner GUCs for replicated table */
 extern bool optimizer_replicated_table_insert;
 
 /* GUCs for slice table*/
 extern int	gp_max_slices;
 extern int	gp_max_system_slices;
 
-/**
- * Enable logging of DPE match in optimizer.
- */
-extern bool	optimizer_partition_selection_log;
-
 /* optimizer join heuristic models */
 #define JOIN_ORDER_IN_QUERY                 0
 #define JOIN_ORDER_GREEDY_SEARCH            1
diff --git a/src/include/utils/sync_guc_name.h b/src/include/utils/sync_guc_name.h
index 0228d8d5cf8f..2b757c1eeee3 100644
--- a/src/include/utils/sync_guc_name.h
+++ b/src/include/utils/sync_guc_name.h
@@ -137,9 +137,6 @@
 		"memory_profiler_query_id",
 		"memory_profiler_run_id",
 		"optimize_bounded_sort",
-		"optimizer_jit_above_cost",
-		"optimizer_jit_inline_above_cost",
-		"optimizer_jit_optimize_above_cost",
 		"pljava_classpath",
 		"pljava_release_lingering_savepoints",
 		"pljava_statement_cache_size",
diff --git a/src/include/utils/unsync_guc_name.h b/src/include/utils/unsync_guc_name.h
index 17e235e40be0..2eaacbfeb79a 100644
--- a/src/include/utils/unsync_guc_name.h
+++ b/src/include/utils/unsync_guc_name.h
@@ -333,123 +333,11 @@
 		"optimizer",
 		"optimizer_analyze_midlevel_partition",
 		"optimizer_analyze_root_partition",
-		"optimizer_apply_left_outer_to_union_all_disregarding_stats",
-		"optimizer_array_constraints",
-		"optimizer_array_expansion_threshold",
 		"optimizer_control",
-		"optimizer_cost_model",
-		"optimizer_cost_threshold",
-		"optimizer_cte_inlining",
-		"optimizer_cte_inlining_bound",
-		"optimizer_damping_factor_filter",
-		"optimizer_damping_factor_groupby",
-		"optimizer_damping_factor_join",
-		"optimizer_discard_redistribute_hashjoin",
-		"optimizer_dpe_stats",
-		"optimizer_enable_assert_maxonerow",
-		"optimizer_enable_associativity",
-		"optimizer_enable_bitmapscan",
-		"optimizer_enable_broadcast_nestloop_outer_child",
-		"optimizer_enable_constant_expression_evaluation",
-		"optimizer_enable_coordinator_only_queries",
-		"optimizer_enable_ctas",
-		"optimizer_enable_derive_stats_all_groups",
-		"optimizer_enable_direct_dispatch",
-		"optimizer_enable_dml",
-		"optimizer_enable_dml_constraints",
-		"optimizer_enable_dynamictablescan",
-		"optimizer_enable_dynamicindexscan",
-		"optimizer_enable_dynamicindexonlyscan",
-		"optimizer_enable_dynamicbitmapscan",
-		"optimizer_enable_eageragg",
-		"optimizer_enable_orderedagg",
-		"optimizer_enable_gather_on_segment_for_dml",
-		"optimizer_enable_groupagg",
-		"optimizer_enable_hashagg",
-		"optimizer_enable_hashjoin",
-		"optimizer_enable_hashjoin_redistribute_broadcast_children",
-		"optimizer_enable_indexjoin",
-		"optimizer_enable_indexonlyscan",
-		"optimizer_enable_indexscan",
 		"optimizer_enable_master_only_queries",
-		"optimizer_enable_materialize",
-		"optimizer_enable_mergejoin",
-		"optimizer_enable_motion_broadcast",
-		"optimizer_enable_motion_gather",
-		"optimizer_enable_motion_redistribute",
-		"optimizer_enable_motions",
-		"optimizer_enable_motions_coordinatoronly_queries",
 		"optimizer_enable_motions_masteronly_queries",
-		"optimizer_enable_multiple_distinct_aggs",
-		"optimizer_enable_nljoin",
-		"optimizer_enable_outerjoin_rewrite",
-		"optimizer_enable_outerjoin_to_unionall_rewrite",
-		"optimizer_enable_partition_propagation",
-		"optimizer_enable_partition_selection",
-		"optimizer_enable_push_join_below_union_all",
-		"optimizer_enable_range_predicate_dpe",
-		"optimizer_enable_redistribute_nestloop_loj_inner_child",
-		"optimizer_enable_replicated_table",
-		"optimizer_enable_sort",
-		"optimizer_enable_space_pruning",
-		"optimizer_enable_streaming_material",
-		"optimizer_enable_tablescan",
-		"optimizer_enable_foreign_table",
-		"optimizer_enable_right_outer_join",
 		"optimizer_enable_query_parameter",
-		"optimizer_enforce_subplans",
-		"optimizer_enumerate_plans",
-		"optimizer_expand_fulljoin",
-		"optimizer_extract_dxl_stats",
-		"optimizer_extract_dxl_stats_all_nodes",
-		"optimizer_force_agg_skew_avoidance",
-		"optimizer_force_comprehensive_join_implementation",
-		"optimizer_force_expanded_distinct_aggs",
-		"optimizer_force_multistage_agg",
-		"optimizer_force_three_stage_scalar_dqa",
-		"optimizer_join_arity_for_associativity_commutativity",
-		"optimizer_join_order",
-		"optimizer_join_order_threshold",
-		"optimizer_log",
-		"optimizer_log_failure",
-		"optimizer_mdcache_size",
-		"optimizer_metadata_caching",
-		"optimizer_minidump",
-		"optimizer_multilevel_partitioning",
-		"optimizer_nestloop_factor",
-		"optimizer_parallel_union",
-		"optimizer_partition_selection_log",
-		"optimizer_penalize_broadcast_threshold",
-		"optimizer_penalize_skew",
-		"optimizer_plan_id",
-		"optimizer_print_expression_properties",
-		"optimizer_print_group_properties",
-		"optimizer_print_job_scheduler",
-		"optimizer_print_memo_after_exploration",
-		"optimizer_print_memo_after_implementation",
-		"optimizer_print_memo_after_optimization",
-		"optimizer_print_missing_stats",
-		"optimizer_print_optimization_context",
-		"optimizer_print_optimization_stats",
-		"optimizer_print_plan",
-		"optimizer_print_query",
-		"optimizer_print_xform",
-		"optimizer_print_xform_results",
-		"optimizer_prune_computed_columns",
-		"optimizer_push_group_by_below_setop_threshold",
-		"optimizer_push_requirements_from_consumer_to_producer",
-		"optimizer_remove_order_below_dml",
 		"optimizer_replicated_table_insert",
-		"optimizer_sample_plans",
-		"optimizer_samples_number",
-		"optimizer_search_strategy_path",
-		"optimizer_segments",
-		"optimizer_skew_factor",
-		"optimizer_sort_factor",
-		"optimizer_trace_fallback",
-		"optimizer_use_external_constant_expression_evaluation_for_ints",
-		"optimizer_use_gpdb_allocators",
-		"optimizer_xform_bind_threshold",
 		"parallel_leader_participation",
 		"parallel_setup_cost",
 		"parallel_tuple_cost",

From 9d659e4357dd755d6d326e45eac47d4414ff0bc8 Mon Sep 17 00:00:00 2001
From: Roman Eskin <r.eskin@arenadata.io>
Date: Tue, 28 Jan 2025 08:58:22 +1000
Subject: [PATCH 16/17] Partially revert "Move Orca's GUCs into the extension
 (#1167)" (#1191)

This partially reverts commit 341d342a1daedb928a5b3ca081ba00c90aba94ce: it
returns back all GUCs into the core (except 'optimizer_partition_selection_log',
which is not used anywhere), but preserves GUC infrastructure inside the
extension and preserves changes in minirepro utility tool.

Reason: moving the GUCs into the extension has broken the ability to set them
in 'postgresql.conf' file. It is so, because the config file is parsed first
time before the shared libs are loaded. Thus, if any of the moved GUCs was set
in the config file, parsing failed with error "unrecognized configuration
parameter".

GPDB can handle GUCs from extensions properly, if the GUCs have a qualified name
(e.g. "<extension_name>.<guc_name>"). So, in order to move the Orca related GUCs
into the extension, we need to rename them in a way "optimizer_guc_name" ->
"orca.optimizer_guc_name". That will break backward compatibility, which we want
to avoid in current release. Therefore, we leave Orca related GUCs inside the
core in the current release, and we'll move them along with the name updating in
the next major release.
---
 .../7.2.0_arenadata7/postgres.symbols.ignore  |  119 --
 gpcontrib/orca/include/optimizer/orca_guc.h   |  150 --
 gpcontrib/orca/orca_guc.c                     | 1339 ---------------
 src/backend/utils/misc/guc_gp.c               | 1441 ++++++++++++++++-
 src/include/jit/jit.h                         |    5 +
 src/include/utils/guc.h                       |  156 +-
 src/include/utils/sync_guc_name.h             |    3 +
 src/include/utils/unsync_guc_name.h           |  111 ++
 8 files changed, 1689 insertions(+), 1635 deletions(-)

diff --git a/.abi-check/7.2.0_arenadata7/postgres.symbols.ignore b/.abi-check/7.2.0_arenadata7/postgres.symbols.ignore
index 0cfd275b1e4e..e14ab068efb4 100644
--- a/.abi-check/7.2.0_arenadata7/postgres.symbols.ignore
+++ b/.abi-check/7.2.0_arenadata7/postgres.symbols.ignore
@@ -3,124 +3,5 @@ optimize_query
 transformGroupedWindows
 optopt@@GLIBC_2.2.5
 optopt
-optimizer_log
-optimizer_log_failure
-optimizer_trace_fallback
-optimizer_minidump
-optimizer_cost_model
-optimizer_metadata_caching
-optimizer_mdcache_size
-optimizer_print_query
-optimizer_print_plan
-optimizer_print_xform
-optimizer_print_memo_after_exploration
-optimizer_print_memo_after_implementation
-optimizer_print_memo_after_optimization
-optimizer_print_job_scheduler
-optimizer_print_expression_properties
-optimizer_print_group_properties
-optimizer_print_optimization_context
-optimizer_print_optimization_stats
-optimizer_print_xform_results
-optimizer_xforms
-optimizer_search_strategy_path
-optimizer_enable_nljoin
-optimizer_enable_indexjoin
-optimizer_enable_motions_coordinatoronly_queries
-optimizer_enable_motions
-optimizer_enable_motion_broadcast
-optimizer_enable_motion_gather
-optimizer_enable_motion_redistribute
-optimizer_enable_sort
-optimizer_enable_materialize
-optimizer_enable_partition_propagation
-optimizer_enable_partition_selection
-optimizer_enable_outerjoin_rewrite
-optimizer_enable_multiple_distinct_aggs
-optimizer_enable_hashjoin_redistribute_broadcast_children
-optimizer_enable_broadcast_nestloop_outer_child
-optimizer_discard_redistribute_hashjoin
-optimizer_enable_streaming_material
-optimizer_enable_gather_on_segment_for_dml
-optimizer_enable_assert_maxonerow
-optimizer_enable_constant_expression_evaluation
-optimizer_enable_bitmapscan
-optimizer_enable_outerjoin_to_unionall_rewrite
-optimizer_enable_ctas
-optimizer_enable_dml
-optimizer_enable_dml_constraints
-optimizer_enable_direct_dispatch
-optimizer_enable_coordinator_only_queries
-optimizer_enable_hashjoin
-optimizer_enable_dynamictablescan
-optimizer_enable_dynamicindexscan
-optimizer_enable_dynamicindexonlyscan
-optimizer_enable_dynamicbitmapscan
-optimizer_enable_indexscan
-optimizer_enable_indexonlyscan
-optimizer_enable_tablescan
-optimizer_enable_eageragg
-optimizer_enable_orderedagg
-optimizer_expand_fulljoin
-optimizer_enable_hashagg
-optimizer_enable_groupagg
-optimizer_enable_mergejoin
-optimizer_enable_redistribute_nestloop_loj_inner_child
-optimizer_force_comprehensive_join_implementation
-optimizer_enable_replicated_table
-optimizer_enable_foreign_table
-optimizer_enable_right_outer_join
-optimizer_enumerate_plans
-optimizer_sample_plans
-optimizer_plan_id
-optimizer_samples_number
-optimizer_jit_above_cost
-optimizer_jit_inline_above_cost
-optimizer_jit_optimize_above_cost
-optimizer_extract_dxl_stats
-optimizer_extract_dxl_stats_all_nodes
-optimizer_print_missing_stats
-optimizer_damping_factor_filter
-optimizer_damping_factor_join
-optimizer_damping_factor_groupby
-optimizer_dpe_stats
-optimizer_enable_derive_stats_all_groups
-optimizer_segments
-optimizer_penalize_broadcast_threshold
-optimizer_cost_threshold
-optimizer_nestloop_factor
-optimizer_sort_factor
-optimizer_array_expansion_threshold
-optimizer_join_order_threshold
-optimizer_join_order
-optimizer_join_arity_for_associativity_commutativity
-optimizer_cte_inlining_bound
-optimizer_push_group_by_below_setop_threshold
-optimizer_xform_bind_threshold
-optimizer_skew_factor
-optimizer_force_multistage_agg
-optimizer_force_three_stage_scalar_dqa
-optimizer_force_expanded_distinct_aggs
-optimizer_force_agg_skew_avoidance
-optimizer_penalize_skew
-optimizer_prune_computed_columns
-optimizer_push_requirements_from_consumer_to_producer
-optimizer_enforce_subplans
-optimizer_apply_left_outer_to_union_all_disregarding_stats
-optimizer_use_external_constant_expression_evaluation_for_ints
-optimizer_remove_order_below_dml
-optimizer_multilevel_partitioning
-optimizer_parallel_union
-optimizer_array_constraints
-optimizer_cte_inlining
-optimizer_enable_space_pruning
-optimizer_enable_associativity
-optimizer_enable_range_predicate_dpe
-optimizer_enable_push_join_below_union_all
-optimizer_use_gpdb_allocators
 optimizer_partition_selection_log
 ConfigureNamesBool_gp
-ConfigureNamesEnum_gp
-ConfigureNamesInt_gp
-ConfigureNamesReal_gp
-ConfigureNamesString_gp
diff --git a/gpcontrib/orca/include/optimizer/orca_guc.h b/gpcontrib/orca/include/optimizer/orca_guc.h
index 958a02450725..3fd540ce0a64 100644
--- a/gpcontrib/orca/include/optimizer/orca_guc.h
+++ b/gpcontrib/orca/include/optimizer/orca_guc.h
@@ -1,156 +1,6 @@
 #ifndef ORCA_GUC_H
 #define ORCA_GUC_H
 
-/* ORCA related definitions */
-#define OPTIMIZER_XFORMS_COUNT 400 /* number of transformation rules */
-
-/* types of optimizer failures */
-#define OPTIMIZER_ALL_FAIL 0		/* all failures */
-#define OPTIMIZER_UNEXPECTED_FAIL 1 /* unexpected failures */
-#define OPTIMIZER_EXPECTED_FAIL 2	/* expected failures */
-
-/* optimizer minidump mode */
-#define OPTIMIZER_MINIDUMP_FAIL 0	/* create optimizer minidump on failure */
-#define OPTIMIZER_MINIDUMP_ALWAYS 1 /* always create optimizer minidump */
-
-/* optimizer cost model */
-#define OPTIMIZER_GPDB_LEGACY 0		  /* GPDB's legacy cost model */
-#define OPTIMIZER_GPDB_CALIBRATED 1	  /* GPDB's calibrated cost model */
-#define OPTIMIZER_GPDB_EXPERIMENTAL 2 /* GPDB's experimental cost model */
-
-extern bool optimizer_log;
-extern int optimizer_log_failure;
-extern bool optimizer_trace_fallback;
-extern int optimizer_minidump;
-extern int optimizer_cost_model;
-extern bool optimizer_metadata_caching;
-extern int optimizer_mdcache_size;
-
-/* Optimizer debugging GUCs */
-extern bool optimizer_print_query;
-extern bool optimizer_print_plan;
-extern bool optimizer_print_xform;
-extern bool optimizer_print_memo_after_exploration;
-extern bool optimizer_print_memo_after_implementation;
-extern bool optimizer_print_memo_after_optimization;
-extern bool optimizer_print_job_scheduler;
-extern bool optimizer_print_expression_properties;
-extern bool optimizer_print_group_properties;
-extern bool optimizer_print_optimization_context;
-extern bool optimizer_print_optimization_stats;
-extern bool optimizer_print_xform_results;
-
-/* array of xforms disable flags */
-extern bool optimizer_xforms[OPTIMIZER_XFORMS_COUNT];
-extern char *optimizer_search_strategy_path;
-
-/* GUCs to tell Optimizer to enable a physical operator */
-extern bool optimizer_enable_nljoin;
-extern bool optimizer_enable_indexjoin;
-extern bool optimizer_enable_motions_coordinatoronly_queries;
-extern bool optimizer_enable_motions;
-extern bool optimizer_enable_motion_broadcast;
-extern bool optimizer_enable_motion_gather;
-extern bool optimizer_enable_motion_redistribute;
-extern bool optimizer_enable_sort;
-extern bool optimizer_enable_materialize;
-extern bool optimizer_enable_partition_propagation;
-extern bool optimizer_enable_partition_selection;
-extern bool optimizer_enable_outerjoin_rewrite;
-extern bool optimizer_enable_multiple_distinct_aggs;
-extern bool optimizer_enable_hashjoin_redistribute_broadcast_children;
-extern bool optimizer_enable_broadcast_nestloop_outer_child;
-extern bool optimizer_discard_redistribute_hashjoin;
-extern bool optimizer_enable_streaming_material;
-extern bool optimizer_enable_gather_on_segment_for_dml;
-extern bool optimizer_enable_assert_maxonerow;
-extern bool optimizer_enable_constant_expression_evaluation;
-extern bool optimizer_enable_bitmapscan;
-extern bool optimizer_enable_outerjoin_to_unionall_rewrite;
-extern bool optimizer_enable_ctas;
-extern bool optimizer_enable_dml;
-extern bool optimizer_enable_dml_constraints;
-extern bool optimizer_enable_direct_dispatch;
-extern bool optimizer_enable_coordinator_only_queries;
-extern bool optimizer_enable_hashjoin;
-extern bool optimizer_enable_dynamictablescan;
-extern bool optimizer_enable_dynamicindexscan;
-extern bool optimizer_enable_dynamicindexonlyscan;
-extern bool optimizer_enable_dynamicbitmapscan;
-extern bool optimizer_enable_indexscan;
-extern bool optimizer_enable_indexonlyscan;
-extern bool optimizer_enable_tablescan;
-extern bool optimizer_enable_eageragg;
-extern bool optimizer_enable_orderedagg;
-extern bool optimizer_expand_fulljoin;
-extern bool optimizer_enable_hashagg;
-extern bool optimizer_enable_groupagg;
-extern bool optimizer_enable_mergejoin;
-extern bool optimizer_enable_redistribute_nestloop_loj_inner_child;
-extern bool optimizer_force_comprehensive_join_implementation;
-extern bool optimizer_enable_replicated_table;
-extern bool optimizer_enable_foreign_table;
-extern bool optimizer_enable_right_outer_join;
-
-/* Optimizer plan enumeration related GUCs */
-extern bool optimizer_enumerate_plans;
-extern bool optimizer_sample_plans;
-extern int optimizer_plan_id;
-extern int optimizer_samples_number;
-
-/* Optimizer Just In Time (JIT) compilation related GUCs*/
-extern double optimizer_jit_above_cost;
-extern double optimizer_jit_inline_above_cost;
-extern double optimizer_jit_optimize_above_cost;
-
-/* Cardinality estimation related GUCs used by the Optimizer */
-extern bool optimizer_extract_dxl_stats;
-extern bool optimizer_extract_dxl_stats_all_nodes;
-extern bool optimizer_print_missing_stats;
-extern double optimizer_damping_factor_filter;
-extern double optimizer_damping_factor_join;
-extern double optimizer_damping_factor_groupby;
-extern bool optimizer_dpe_stats;
-extern bool optimizer_enable_derive_stats_all_groups;
-
-/* Costing or tuning related GUCs used by the Optimizer */
-extern int optimizer_segments;
-extern int optimizer_penalize_broadcast_threshold;
-extern double optimizer_cost_threshold;
-extern double optimizer_nestloop_factor;
-extern double optimizer_sort_factor;
-
-/* Optimizer hints */
-extern int optimizer_array_expansion_threshold;
-extern int optimizer_join_order_threshold;
-extern int optimizer_join_order;
-extern int optimizer_join_arity_for_associativity_commutativity;
-extern int optimizer_cte_inlining_bound;
-extern int optimizer_push_group_by_below_setop_threshold;
-extern int optimizer_xform_bind_threshold;
-extern int optimizer_skew_factor;
-extern bool optimizer_force_multistage_agg;
-extern bool optimizer_force_three_stage_scalar_dqa;
-extern bool optimizer_force_expanded_distinct_aggs;
-extern bool optimizer_force_agg_skew_avoidance;
-extern bool optimizer_penalize_skew;
-extern bool optimizer_prune_computed_columns;
-extern bool optimizer_push_requirements_from_consumer_to_producer;
-extern bool optimizer_enforce_subplans;
-extern bool optimizer_apply_left_outer_to_union_all_disregarding_stats;
-extern bool optimizer_use_external_constant_expression_evaluation_for_ints;
-extern bool optimizer_remove_order_below_dml;
-extern bool optimizer_multilevel_partitioning;
-extern bool optimizer_parallel_union;
-extern bool optimizer_array_constraints;
-extern bool optimizer_cte_inlining;
-extern bool optimizer_enable_space_pruning;
-extern bool optimizer_enable_associativity;
-extern bool optimizer_enable_range_predicate_dpe;
-extern bool optimizer_enable_push_join_below_union_all;
-
-extern bool optimizer_use_gpdb_allocators;
-
 void orca_guc_define(void);
 
 #endif /* ORCA_GUC_H */
diff --git a/gpcontrib/orca/orca_guc.c b/gpcontrib/orca/orca_guc.c
index 7c7f02cbea7b..ca54a662d756 100644
--- a/gpcontrib/orca/orca_guc.c
+++ b/gpcontrib/orca/orca_guc.c
@@ -11,1362 +11,23 @@
 #define ORCA_GUC_PROCESS_NO_SYNC_FLAG(flags) \
 	((flags & GUC_GPDB_NEED_SYNC) ? flags : (flags | GUC_GPDB_NO_SYNC))
 
-bool optimizer_log;
-int optimizer_log_failure;
-bool optimizer_trace_fallback;
-int optimizer_minidump;
-int optimizer_cost_model;
-bool optimizer_metadata_caching;
-int optimizer_mdcache_size;
-bool optimizer_use_gpdb_allocators;
-
-/* Optimizer debugging GUCs */
-bool optimizer_print_query;
-bool optimizer_print_plan;
-bool optimizer_print_xform;
-bool optimizer_print_memo_after_exploration;
-bool optimizer_print_memo_after_implementation;
-bool optimizer_print_memo_after_optimization;
-bool optimizer_print_job_scheduler;
-bool optimizer_print_expression_properties;
-bool optimizer_print_group_properties;
-bool optimizer_print_optimization_context;
-bool optimizer_print_optimization_stats;
-bool optimizer_print_xform_results;
-
-/* array of xforms disable flags */
-bool optimizer_xforms[OPTIMIZER_XFORMS_COUNT] = {
-	[0 ... OPTIMIZER_XFORMS_COUNT - 1] = false};
-
-char *optimizer_search_strategy_path = NULL;
-
-/* GUCs to tell Optimizer to enable a physical operator */
-bool optimizer_enable_nljoin;
-bool optimizer_enable_indexjoin;
-bool optimizer_enable_motions_coordinatoronly_queries;
-bool optimizer_enable_motions;
-bool optimizer_enable_motion_broadcast;
-bool optimizer_enable_motion_gather;
-bool optimizer_enable_motion_redistribute;
-bool optimizer_enable_sort;
-bool optimizer_enable_materialize;
-bool optimizer_enable_partition_propagation;
-bool optimizer_enable_partition_selection;
-bool optimizer_enable_outerjoin_rewrite;
-bool optimizer_enable_multiple_distinct_aggs;
-bool optimizer_enable_direct_dispatch;
-bool optimizer_enable_hashjoin_redistribute_broadcast_children;
-bool optimizer_enable_broadcast_nestloop_outer_child;
-bool optimizer_discard_redistribute_hashjoin;
-bool optimizer_enable_streaming_material;
-bool optimizer_enable_gather_on_segment_for_dml;
-bool optimizer_enable_assert_maxonerow;
-bool optimizer_enable_constant_expression_evaluation;
-bool optimizer_enable_bitmapscan;
-bool optimizer_enable_outerjoin_to_unionall_rewrite;
-bool optimizer_enable_ctas;
-bool optimizer_enable_dml;
-bool optimizer_enable_dml_constraints;
-bool optimizer_enable_coordinator_only_queries;
-bool optimizer_enable_hashjoin;
-bool optimizer_enable_dynamictablescan;
-bool optimizer_enable_dynamicindexscan;
-bool optimizer_enable_dynamicindexonlyscan;
-bool optimizer_enable_dynamicbitmapscan;
-bool optimizer_enable_indexscan;
-bool optimizer_enable_indexonlyscan;
-bool optimizer_enable_tablescan;
-bool optimizer_enable_hashagg;
-bool optimizer_enable_groupagg;
-bool optimizer_expand_fulljoin;
-bool optimizer_enable_mergejoin;
-bool optimizer_enable_redistribute_nestloop_loj_inner_child;
-bool optimizer_force_comprehensive_join_implementation;
-bool optimizer_enable_replicated_table;
-bool optimizer_enable_foreign_table;
-bool optimizer_enable_right_outer_join;
-
-/* Optimizer plan enumeration related GUCs */
-bool optimizer_enumerate_plans;
-bool optimizer_sample_plans;
-int optimizer_plan_id;
-int optimizer_samples_number;
-
-/* Cardinality estimation related GUCs used by the Optimizer */
-bool optimizer_extract_dxl_stats;
-bool optimizer_extract_dxl_stats_all_nodes;
-bool optimizer_print_missing_stats;
-double optimizer_damping_factor_filter;
-double optimizer_damping_factor_join;
-double optimizer_damping_factor_groupby;
-bool optimizer_dpe_stats;
-bool optimizer_enable_derive_stats_all_groups;
-
-/* Costing related GUCs used by the Optimizer */
-int optimizer_segments;
-int optimizer_penalize_broadcast_threshold;
-double optimizer_cost_threshold;
-double optimizer_nestloop_factor;
-double optimizer_sort_factor;
-
-/* Optimizer hints */
-int optimizer_join_arity_for_associativity_commutativity;
-int optimizer_array_expansion_threshold;
-int optimizer_join_order_threshold;
-int optimizer_join_order;
-int optimizer_cte_inlining_bound;
-int optimizer_push_group_by_below_setop_threshold;
-int optimizer_xform_bind_threshold;
-int optimizer_skew_factor;
-bool optimizer_force_multistage_agg;
-bool optimizer_force_three_stage_scalar_dqa;
-bool optimizer_force_expanded_distinct_aggs;
-bool optimizer_force_agg_skew_avoidance;
-bool optimizer_penalize_skew;
-bool optimizer_prune_computed_columns;
-bool optimizer_push_requirements_from_consumer_to_producer;
-bool optimizer_enforce_subplans;
-bool optimizer_use_external_constant_expression_evaluation_for_ints;
-bool optimizer_apply_left_outer_to_union_all_disregarding_stats;
-bool optimizer_remove_order_below_dml;
-bool optimizer_multilevel_partitioning;
-bool optimizer_parallel_union;
-bool optimizer_array_constraints;
-bool optimizer_cte_inlining;
-bool optimizer_enable_space_pruning;
-bool optimizer_enable_associativity;
-bool optimizer_enable_eageragg;
-bool optimizer_enable_range_predicate_dpe;
-bool optimizer_enable_push_join_below_union_all;
-bool optimizer_enable_orderedagg;
-
-/* GUCs for Just In Time (JIT) compilation */
-double optimizer_jit_above_cost;
-double optimizer_jit_inline_above_cost;
-double optimizer_jit_optimize_above_cost;
-
-static const struct config_enum_entry optimizer_log_failure_options[] = {
-	{"all", OPTIMIZER_ALL_FAIL},
-	{"unexpected", OPTIMIZER_UNEXPECTED_FAIL},
-	{"expected", OPTIMIZER_EXPECTED_FAIL},
-	{NULL, 0}};
-
-static const struct config_enum_entry optimizer_minidump_options[] = {
-	{"onerror", OPTIMIZER_MINIDUMP_FAIL},
-	{"always", OPTIMIZER_MINIDUMP_ALWAYS},
-	{NULL, 0}};
-
-static const struct config_enum_entry optimizer_cost_model_options[] = {
-	{"legacy", OPTIMIZER_GPDB_LEGACY},
-	{"calibrated", OPTIMIZER_GPDB_CALIBRATED},
-	{"experimental", OPTIMIZER_GPDB_EXPERIMENTAL},
-	{NULL, 0}};
-
-static const struct config_enum_entry optimizer_join_order_options[] = {
-	{"query", JOIN_ORDER_IN_QUERY},
-	{"greedy", JOIN_ORDER_GREEDY_SEARCH},
-	{"exhaustive", JOIN_ORDER_EXHAUSTIVE_SEARCH},
-	{"exhaustive2", JOIN_ORDER_EXHAUSTIVE2_SEARCH},
-	{NULL, 0}};
-
 struct config_bool configure_names_bool_orca[] = {
-	{{"optimizer_log", PGC_USERSET, LOGGING_WHAT,
-	  gettext_noop("Log optimizer messages."), NULL,
-	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
-	 &optimizer_log,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_trace_fallback", PGC_USERSET, LOGGING_WHAT,
-	  gettext_noop(
-		  "Print a message at INFO level, whenever GPORCA falls back."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_trace_fallback,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_print_query", PGC_USERSET, LOGGING_WHAT,
-	  gettext_noop("Prints the optimizer's input query expression tree."), NULL,
-	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
-	 &optimizer_print_query,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_print_plan", PGC_USERSET, LOGGING_WHAT,
-	  gettext_noop(
-		  "Prints the plan expression tree produced by the optimizer."),
-	  NULL, GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
-	 &optimizer_print_plan,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_print_xform", PGC_USERSET, LOGGING_WHAT,
-	  gettext_noop("Prints optimizer transformation information."), NULL,
-	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
-	 &optimizer_print_xform,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_metadata_caching", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "This guc enables the optimizer to cache and reuse metadata."),
-	  NULL},
-	 &optimizer_metadata_caching,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_print_missing_stats", PGC_USERSET, LOGGING_WHAT,
-	  gettext_noop("Print columns with missing statistics."), NULL,
-	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
-	 &optimizer_print_missing_stats,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_print_xform_results", PGC_USERSET, LOGGING_WHAT,
-	  gettext_noop("Print the input and output of optimizer transformations."),
-	  NULL, GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
-	 &optimizer_print_xform_results,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_print_memo_after_exploration", PGC_USERSET, LOGGING_WHAT,
-	  gettext_noop(
-		  "Print optimizer memo structure after the exploration phase."),
-	  NULL, GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
-	 &optimizer_print_memo_after_exploration,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_print_memo_after_implementation", PGC_USERSET, LOGGING_WHAT,
-	  gettext_noop(
-		  "Print optimizer memo structure after the implementation phase."),
-	  NULL, GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
-	 &optimizer_print_memo_after_implementation,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_print_memo_after_optimization", PGC_USERSET, LOGGING_WHAT,
-	  gettext_noop("Print optimizer memo structure after optimization."), NULL,
-	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
-	 &optimizer_print_memo_after_optimization,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_print_job_scheduler", PGC_USERSET, LOGGING_WHAT,
-	  gettext_noop("Print the jobs in the scheduler on each job completion."),
-	  NULL, GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
-	 &optimizer_print_job_scheduler,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_print_expression_properties", PGC_USERSET, LOGGING_WHAT,
-	  gettext_noop("Print expression properties."), NULL,
-	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
-	 &optimizer_print_expression_properties,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_print_group_properties", PGC_USERSET, LOGGING_WHAT,
-	  gettext_noop("Print group properties."), NULL,
-	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
-	 &optimizer_print_group_properties,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_print_optimization_context", PGC_USERSET, LOGGING_WHAT,
-	  gettext_noop("Print the optimization context."), NULL,
-	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
-	 &optimizer_print_optimization_context,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_print_optimization_stats", PGC_USERSET, LOGGING_WHAT,
-	  gettext_noop("Print optimization stats."), NULL,
-	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
-	 &optimizer_print_optimization_stats,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_extract_dxl_stats", PGC_USERSET, LOGGING_WHAT,
-	  gettext_noop("Extract plan stats in dxl."), NULL,
-	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
-	 &optimizer_extract_dxl_stats,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_extract_dxl_stats_all_nodes", PGC_USERSET, LOGGING_WHAT,
-	  gettext_noop("Extract plan stats for all physical dxl nodes."), NULL,
-	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
-	 &optimizer_extract_dxl_stats_all_nodes,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_dpe_stats", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Enable statistics derivation for partitioned tables with dynamic partition elimination."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_dpe_stats,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_nljoin", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop("Enable nested loops join plans in the optimizer."), NULL,
-	  GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_nljoin,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_indexjoin", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop("Enable index nested loops join plans in the optimizer."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_indexjoin,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_motions_masteronly_queries", PGC_USERSET,
-	  QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Enable plans with Motion operators in the optimizer for queries with no distributed tables."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_motions_coordinatoronly_queries,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_motions", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop("Enable plans with Motion operators in the optimizer."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_motions,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_motion_broadcast", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Enable plans with Motion Broadcast operators in the optimizer."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_motion_broadcast,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_motion_gather", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Enable plans with Motion Gather operators in the optimizer."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_motion_gather,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_motion_redistribute", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Enable plans with Motion Redistribute operators in the optimizer."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_motion_redistribute,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_sort", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop("Enable plans with Sort operators in the optimizer."), NULL,
-	  GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_sort,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_materialize", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop("Enable plans with Materialize operators in the optimizer."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_materialize,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_partition_propagation", PGC_USERSET,
-	  QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Enable plans with Partition Propagation operators in the optimizer."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_partition_propagation,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_partition_selection", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Enable plans with Partition Selection operators in the optimizer."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_partition_selection,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_outerjoin_rewrite", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop("Enable outer join to inner join rewrite in the optimizer."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_outerjoin_rewrite,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_direct_dispatch", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop("Enable direct dispatch in the optimizer."), NULL,
-	  GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_direct_dispatch,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_space_pruning", PGC_USERSET, DEVELOPER_OPTIONS,
-	  gettext_noop("Enable space pruning in the optimizer."), NULL,
-	  GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_space_pruning,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_master_only_queries", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop("Process coordinator only queries via the optimizer."), NULL,
-	  GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_coordinator_only_queries,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_hashjoin", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop("Enables the optimizer's use of hash join plans."), NULL,
-	  GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_hashjoin,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_dynamictablescan", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Enables the optimizer's use of plans with dynamic table scan."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_dynamictablescan,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_dynamicindexscan", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Enables the optimizer's use of plans with dynamic index scan."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_dynamicindexscan,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_dynamicindexonlyscan", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Enables the optimizer's use of plans with dynamic index only scan."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_dynamicindexonlyscan,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_dynamicbitmapscan", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Enables the optimizer's use of plans with dynamic bitmap scan."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_dynamicbitmapscan,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_indexscan", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop("Enables the optimizer's use of plans with index scan."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_indexscan,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_indexonlyscan", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Enables the optimizer's use of plans with index only scan."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_indexonlyscan,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_tablescan", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop("Enables the optimizer's use of plans with table scan."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_tablescan,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_hashagg", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop("Enables GPORCA to use hash aggregates."), NULL,
-	  GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_hashagg,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_groupagg", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop("Enables GPORCA to use group aggregates."), NULL,
-	  GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_groupagg,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_force_agg_skew_avoidance", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Always pick a plan for aggregate distinct that minimizes skew."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_force_agg_skew_avoidance,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_penalize_skew", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Penalize operators with skewed hash redistribute below it."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_penalize_skew,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_multilevel_partitioning", PGC_USERSET, DEVELOPER_OPTIONS,
-	  gettext_noop(
-		  "Enable optimization of queries on multilevel partitioned tables."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_multilevel_partitioning,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_derive_stats_all_groups", PGC_USERSET,
-	  DEVELOPER_OPTIONS,
-	  gettext_noop("Enable stats derivation for all groups after exploration."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_derive_stats_all_groups,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_force_multistage_agg", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Force optimizer to always pick multistage aggregates when such a plan alternative is generated."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_force_multistage_agg,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_multiple_distinct_aggs", PGC_USERSET,
-	  QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Enable plans with multiple distinct aggregates in the optimizer."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_multiple_distinct_aggs,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_hashjoin_redistribute_broadcast_children", PGC_USERSET,
-	  QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Enable hash join plans with, Redistribute outer child and Broadcast inner child, in the optimizer."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_hashjoin_redistribute_broadcast_children,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_broadcast_nestloop_outer_child", PGC_USERSET,
-	  QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Enable nested loops join plans with replicated outer child in the optimizer."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_broadcast_nestloop_outer_child,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_discard_redistribute_hashjoin", PGC_USERSET,
-	  QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Discard hash join with redistribute motion in the optimizer."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_discard_redistribute_hashjoin,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_expand_fulljoin", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Enables the optimizer's support of expanding full outer joins using union all."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_expand_fulljoin,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_mergejoin", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop("Enables the optimizer's support of merge joins."), NULL,
-	  GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_mergejoin,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_streaming_material", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Enable plans with a streaming material node in the optimizer."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_streaming_material,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_gather_on_segment_for_dml", PGC_USERSET,
-	  QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Enable DML optimization by enforcing a non-coordinator gather in the optimizer."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_gather_on_segment_for_dml,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_assert_maxonerow", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Enable Assert MaxOneRow plans to check number of rows at runtime."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_assert_maxonerow,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enumerate_plans", PGC_USERSET, LOGGING_WHAT,
-	  gettext_noop("Enable plan enumeration"), NULL,
-	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
-	 &optimizer_enumerate_plans,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_sample_plans", PGC_USERSET, DEVELOPER_OPTIONS,
-	  gettext_noop("Enable plan sampling"), NULL,
-	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
-	 &optimizer_sample_plans,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_constant_expression_evaluation", PGC_USERSET,
-	  QUERY_TUNING_METHOD,
-	  gettext_noop("Enable constant expression evaluation in the optimizer"),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_constant_expression_evaluation,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_bitmapscan", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop("Enable bitmap plans in the optimizer"), NULL,
-	  GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_bitmapscan,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_outerjoin_to_unionall_rewrite", PGC_USERSET,
-	  QUERY_TUNING_METHOD,
-	  gettext_noop("Enable rewriting Left Outer Join to UnionAll"), NULL,
-	  GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_outerjoin_to_unionall_rewrite,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_ctas", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop("Enable CTAS plans in the optimizer"), NULL,
-	  GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_ctas,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_dml", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop("Enable DML plans in GPORCA."), NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_dml,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_dml_constraints", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Support DML with CHECK constraints and NOT NULL constraints."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_dml_constraints,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_use_gpdb_allocators", PGC_POSTMASTER, RESOURCES_MEM,
-	  gettext_noop("Enable ORCA to use GPDB Memory Contexts"), NULL,
-	  GUC_NOT_IN_SAMPLE},
-	 &optimizer_use_gpdb_allocators,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_orderedagg", PGC_USERSET, DEVELOPER_OPTIONS,
-	  gettext_noop("Enable ordered aggregate plans."), NULL},
-	 &optimizer_enable_orderedagg,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-	{{"optimizer_enable_eageragg", PGC_USERSET, DEVELOPER_OPTIONS,
-	  gettext_noop(
-		  "Enable Eager Agg transform for pushing aggregate below an innerjoin."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_eageragg,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_redistribute_nestloop_loj_inner_child", PGC_USERSET,
-	  DEVELOPER_OPTIONS,
-	  gettext_noop(
-		  "Enable nested loops left join plans with redistributed inner child in the optimizer."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_redistribute_nestloop_loj_inner_child,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_force_comprehensive_join_implementation", PGC_USERSET,
-	  QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Explore a nested loop join even if a hash join is possible"),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_force_comprehensive_join_implementation,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_replicated_table", PGC_USERSET, DEVELOPER_OPTIONS,
-	  gettext_noop("Enable replicated tables."), NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_replicated_table,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_foreign_table", PGC_USERSET, DEVELOPER_OPTIONS,
-	  gettext_noop("Enable foreign tables in Orca."), NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_foreign_table,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_right_outer_join", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Enable Orca to generate plans containing right outer joins."),
-	  gettext_noop(
-		  "Right outer join can be re-written from left outer join. "
-		  "However, there are scenarios due to cardinality and cost "
-		  "misestimation, right outer join plan may be sub-optimal and "
-		  "can either be slower than the left outer join plan alternative "
-		  "or hit out-of-memory (OOM). The root cause can be identified "
-		  "by viewing the explain analyze plan and observing that the "
-		  "right outer join plan node is consuming all resources "
-		  "(CPU/memory) or the explain analyze itself hits OOM. By "
-		  "setting this GUC value to \"false\" users can force GPORCA to "
-		  "generate an equivalent left outer join plan. We recommend that "
-		  "the GUC be set at the query level as there can be several use "
-		  "cases where right outer join is the best plan alternative to "
-		  "choose."),
-	  GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_right_outer_join,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_coordinator_only_queries", PGC_USERSET,
-	  QUERY_TUNING_METHOD,
-	  gettext_noop("Process coordinator only queries via the optimizer."), NULL,
-	  GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_coordinator_only_queries,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_motions_coordinatoronly_queries", PGC_USERSET,
-	  QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Enable plans with Motion operators in the optimizer for queries with no distributed tables."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_motions_coordinatoronly_queries,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_force_three_stage_scalar_dqa", PGC_USERSET,
-	  QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Force optimizer to always pick 3 stage aggregate plan for scalar distinct qualified aggregate."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_force_three_stage_scalar_dqa,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_parallel_union", PGC_USERSET, DEVELOPER_OPTIONS,
-	  gettext_noop("Enable parallel execution for UNION/UNION ALL queries."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_parallel_union,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_array_constraints", PGC_USERSET, DEVELOPER_OPTIONS,
-	  gettext_noop(
-		  "Allows the optimizer's constraint framework to derive array constraints."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_array_constraints,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_force_expanded_distinct_aggs", PGC_USERSET, DEVELOPER_OPTIONS,
-	  gettext_noop(
-		  "Always pick plans that expand multiple distinct aggregates into join of single distinct aggregate in the optimizer."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_force_expanded_distinct_aggs,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_prune_computed_columns", PGC_USERSET, DEVELOPER_OPTIONS,
-	  gettext_noop("Prune unused computed columns when pre-processing query"),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_prune_computed_columns,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_push_requirements_from_consumer_to_producer", PGC_USERSET,
-	  DEVELOPER_OPTIONS,
-	  gettext_noop(
-		  "Optimize CTE producer plan on requirements enforced on top of CTE consumer in the optimizer."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_push_requirements_from_consumer_to_producer,
-	 true,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enforce_subplans", PGC_USERSET, DEVELOPER_OPTIONS,
-	  gettext_noop("Enforce correlated execution in the optimizer"), NULL,
-	  GUC_NOT_IN_SAMPLE},
-	 &optimizer_enforce_subplans,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_cte_inlining", PGC_USERSET, DEVELOPER_OPTIONS,
-	  gettext_noop("Enable CTE inlining"), NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_cte_inlining,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_use_external_constant_expression_evaluation_for_ints",
-	  PGC_USERSET, DEVELOPER_OPTIONS,
-	  gettext_noop(
-		  "Use external constant expression evaluation in the optimizer for all integer types"),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_use_external_constant_expression_evaluation_for_ints,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_apply_left_outer_to_union_all_disregarding_stats", PGC_USERSET,
-	  DEVELOPER_OPTIONS,
-	  gettext_noop(
-		  "Always apply Left Outer Join to Inner Join UnionAll Left Anti Semi Join without looking at stats."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_apply_left_outer_to_union_all_disregarding_stats,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_remove_order_below_dml", PGC_USERSET, DEVELOPER_OPTIONS,
-	  gettext_noop("Remove OrderBy below a DML operation"), NULL,
-	  GUC_NOT_IN_SAMPLE},
-	 &optimizer_remove_order_below_dml,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_associativity", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop("Enables Join Associativity in optimizer"), NULL},
-	 &optimizer_enable_associativity,
-	 false,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_range_predicate_dpe", PGC_USERSET, DEVELOPER_OPTIONS,
-	  gettext_noop(
-		  "Enable range predicates for dynamic partition elimination."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_range_predicate_dpe,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_enable_push_join_below_union_all", PGC_USERSET,
-	  DEVELOPER_OPTIONS,
-	  gettext_noop(
-		  "Enable transform of join of union all to union all of joins. May improve the join performance."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_enable_push_join_below_union_all,
-	 false,
-	 NULL,
-	 NULL,
-	 NULL},
-
 	/* End-of-list marker */
 	{{NULL, 0, 0, NULL, NULL}, NULL, false, NULL, NULL}};
 
 struct config_int configure_names_int_orca[] = {
-	{{"optimizer_plan_id", PGC_USERSET, DEVELOPER_OPTIONS,
-	  gettext_noop("Choose a plan alternative"), NULL,
-	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
-	 &optimizer_plan_id,
-	 0,
-	 0,
-	 INT_MAX,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_samples_number", PGC_USERSET, DEVELOPER_OPTIONS,
-	  gettext_noop("Set the number of plan samples"), NULL,
-	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
-	 &optimizer_samples_number,
-	 1000,
-	 1,
-	 INT_MAX,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_segments", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Number of segments to be considered by the optimizer during costing, or 0 to take the actual number of segments."),
-	  NULL, GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
-	 &optimizer_segments,
-	 0,
-	 0,
-	 INT_MAX,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_penalize_broadcast_threshold", PGC_USERSET,
-	  QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Maximum number of rows of a relation that can be broadcasted without penalty. A value of 0 disables."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_penalize_broadcast_threshold,
-	 100000,
-	 0,
-	 INT_MAX,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_mdcache_size", PGC_USERSET, RESOURCES_MEM,
-	  gettext_noop("Sets the size of MDCache."), NULL, GUC_UNIT_KB},
-	 &optimizer_mdcache_size,
-	 16384,
-	 0,
-	 INT_MAX,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_cte_inlining_bound", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop("Set the CTE inlining cutoff"), NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_cte_inlining_bound,
-	 0,
-	 0,
-	 INT_MAX,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_array_expansion_threshold", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Item limit for expansion of arrays in WHERE clause for constraint derivation."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_array_expansion_threshold,
-	 20,
-	 0,
-	 INT_MAX,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_push_group_by_below_setop_threshold", PGC_USERSET,
-	  QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Maximum number of children setops have to consider pushing group bys below it"),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_push_group_by_below_setop_threshold,
-	 10,
-	 0,
-	 INT_MAX,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_xform_bind_threshold", PGC_USERSET, DEVELOPER_OPTIONS,
-	  gettext_noop(
-		  "Maximum number bindings per xform per group expression. A value of 0 disables."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_xform_bind_threshold,
-	 0,
-	 0,
-	 INT_MAX,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_skew_factor", PGC_USERSET, DEVELOPER_OPTIONS,
-	  gettext_noop(
-		  "Coefficient of skew ratio computed from sample stastics. Default 0: skew computation from sample statistics turned off. [1,100]: skew ratio computed from sample statistics. The skewness used for costing is the product of the optimizer_skew_factor and the skew ratio."),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_skew_factor,
-	 0,
-	 0,
-	 100,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_join_order_threshold", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Maximum number of join children to use dynamic programming based join ordering algorithm."),
-	  NULL},
-	 &optimizer_join_order_threshold,
-	 10,
-	 0,
-	 12,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_join_arity_for_associativity_commutativity", PGC_USERSET,
-	  QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "Maximum number of children n-ary-join have without disabling commutativity and associativity transform"),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_join_arity_for_associativity_commutativity,
-	 18,
-	 0,
-	 INT_MAX,
-	 NULL,
-	 NULL,
-	 NULL},
-
 	/* End-of-list marker */
 	{{NULL, 0, 0, NULL, NULL}, NULL, 0, 0, 0, NULL, NULL}};
 
 struct config_real configure_names_real_orca[] = {
-	{{"optimizer_damping_factor_filter", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "select predicate damping factor in optimizer, 1.0 means no damping"),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_damping_factor_filter,
-	 0.75,
-	 0.0,
-	 1.0,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_damping_factor_join", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "join predicate damping factor in optimizer, 1.0 means no damping, 0.0 means square root method"),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_damping_factor_join,
-	 0.0,
-	 0.0,
-	 1.0,
-	 NULL,
-	 NULL,
-	 NULL},
-	{{"optimizer_damping_factor_groupby", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop(
-		  "groupby operator damping factor in optimizer, 1.0 means no damping"),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_damping_factor_groupby,
-	 0.75,
-	 0.0,
-	 1.0,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_cost_threshold", PGC_USERSET, DEVELOPER_OPTIONS,
-	  gettext_noop(
-		  "Set the threshold for plan sampling relative to the cost of best plan, 0.0 means unbounded"),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_cost_threshold,
-	 0.0,
-	 0.0,
-	 INT_MAX,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_nestloop_factor", PGC_USERSET, QUERY_TUNING_OTHER,
-	  gettext_noop("Set the nestloop join cost factor in the optimizer"), NULL,
-	  GUC_NOT_IN_SAMPLE},
-	 &optimizer_nestloop_factor,
-	 1024.0,
-	 1.0,
-	 DBL_MAX,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_sort_factor", PGC_USERSET, QUERY_TUNING_OTHER,
-	  gettext_noop(
-		  "Set the sort cost factor in the optimizer, 1.0 means same as default, > 1.0 means more costly than default, < 1.0 means means less costly than default"),
-	  NULL, GUC_NOT_IN_SAMPLE},
-	 &optimizer_sort_factor,
-	 1.0,
-	 0.0,
-	 DBL_MAX,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_jit_above_cost", PGC_USERSET, QUERY_TUNING_COST,
-	  gettext_noop("Perform JIT compilation if query is more expensive."),
-	  gettext_noop("-1 disables JIT compilation."),
-	  GUC_EXPLAIN | GUC_GPDB_NEED_SYNC},
-	 &optimizer_jit_above_cost,
-	 7500,
-	 -1,
-	 DBL_MAX,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_jit_optimize_above_cost", PGC_USERSET, QUERY_TUNING_COST,
-	  gettext_noop("Optimize JITed functions if query is more expensive."),
-	  gettext_noop("-1 disables JIT optimization."),
-	  GUC_EXPLAIN | GUC_GPDB_NEED_SYNC},
-	 &optimizer_jit_optimize_above_cost,
-	 37500,
-	 -1,
-	 DBL_MAX,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_jit_inline_above_cost", PGC_USERSET, QUERY_TUNING_COST,
-	  gettext_noop("Perform JIT inlining if query is more expensive."),
-	  gettext_noop("-1 disables inlining."), GUC_EXPLAIN | GUC_GPDB_NEED_SYNC},
-	 &optimizer_jit_inline_above_cost,
-	 37500,
-	 -1,
-	 DBL_MAX,
-	 NULL,
-	 NULL,
-	 NULL},
-
 	/* End-of-list marker */
 	{{NULL, 0, 0, NULL, NULL}, NULL, 0.0, 0.0, 0.0, NULL, NULL}};
 
 struct config_string configure_names_string_orca[] = {
-	{{"optimizer_search_strategy_path", PGC_USERSET, QUERY_TUNING_METHOD,
-	  gettext_noop("Sets the search strategy used by gp optimizer."), NULL,
-	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
-	 &optimizer_search_strategy_path,
-	 "default",
-	 NULL,
-	 NULL,
-	 NULL},
-
 	/* End-of-list marker */
 	{{NULL, 0, 0, NULL, NULL}, NULL, NULL, NULL, NULL}};
 
 struct config_enum configure_names_enum_orca[] = {
-	{{"optimizer_log_failure", PGC_USERSET, LOGGING_WHEN,
-	  gettext_noop("Sets which optimizer failures are logged."),
-	  gettext_noop("Valid values are unexpected, expected, all"),
-	  GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE},
-	 &optimizer_log_failure,
-	 OPTIMIZER_UNEXPECTED_FAIL,
-	 optimizer_log_failure_options,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{
-		 "optimizer_minidump",
-		 PGC_USERSET,
-		 LOGGING_WHEN,
-		 gettext_noop("Generate optimizer minidump."),
-		 gettext_noop("Valid values are onerror, always"),
-	 },
-	 &optimizer_minidump,
-	 OPTIMIZER_MINIDUMP_FAIL,
-	 optimizer_minidump_options,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_cost_model", PGC_USERSET, DEVELOPER_OPTIONS,
-	  gettext_noop("Set optimizer cost model."),
-	  gettext_noop("Valid values are legacy, calibrated, experimental"),
-	  GUC_NOT_IN_SAMPLE},
-	 &optimizer_cost_model,
-	 OPTIMIZER_GPDB_CALIBRATED,
-	 optimizer_cost_model_options,
-	 NULL,
-	 NULL,
-	 NULL},
-
-	{{"optimizer_join_order", PGC_USERSET, QUERY_TUNING_OTHER,
-	  gettext_noop("Set optimizer join heuristic model."),
-	  gettext_noop(
-		  "Valid values are query, greedy, exhaustive and exhaustive2"),
-	  GUC_NOT_IN_SAMPLE},
-	 &optimizer_join_order,
-	 JOIN_ORDER_EXHAUSTIVE2_SEARCH,
-	 optimizer_join_order_options,
-	 NULL,
-	 NULL,
-	 NULL},
-
 	/* End-of-list marker */
 	{{NULL, 0, 0, NULL, NULL}, NULL, 0, NULL, NULL, NULL}};
 
diff --git a/src/backend/utils/misc/guc_gp.c b/src/backend/utils/misc/guc_gp.c
index d9b9816b72bb..ebc00df87cd5 100644
--- a/src/backend/utils/misc/guc_gp.c
+++ b/src/backend/utils/misc/guc_gp.c
@@ -272,13 +272,138 @@ bool		gp_recursive_cte = true;
 bool		gp_eager_two_phase_agg = false;
 bool		gp_force_random_redistribution = false;
 
-/* External planner related gucs */
+/* Optimizer related gucs */
 bool		optimizer;
+bool		optimizer_log;
+int			optimizer_log_failure;
 bool		optimizer_control = true;
-
+bool		optimizer_trace_fallback;
+int			optimizer_minidump;
+int			optimizer_cost_model;
+bool		optimizer_metadata_caching;
+int			optimizer_mdcache_size;
+bool		optimizer_use_gpdb_allocators;
+
+/* Optimizer debugging GUCs */
+bool		optimizer_print_query;
+bool		optimizer_print_plan;
+bool		optimizer_print_xform;
+bool		optimizer_print_memo_after_exploration;
+bool		optimizer_print_memo_after_implementation;
+bool		optimizer_print_memo_after_optimization;
+bool		optimizer_print_job_scheduler;
+bool		optimizer_print_expression_properties;
+bool		optimizer_print_group_properties;
+bool		optimizer_print_optimization_context;
+bool		optimizer_print_optimization_stats;
+bool		optimizer_print_xform_results;
+
+/* array of xforms disable flags */
+bool		optimizer_xforms[OPTIMIZER_XFORMS_COUNT] = {[0 ... OPTIMIZER_XFORMS_COUNT - 1] = false};
+char	   *optimizer_search_strategy_path = NULL;
+
+/* GUCs to tell Optimizer to enable a physical operator */
+bool		optimizer_enable_nljoin;
+bool		optimizer_enable_indexjoin;
+bool		optimizer_enable_motions_coordinatoronly_queries;
+bool		optimizer_enable_motions;
+bool		optimizer_enable_motion_broadcast;
+bool		optimizer_enable_motion_gather;
+bool		optimizer_enable_motion_redistribute;
+bool		optimizer_enable_sort;
+bool		optimizer_enable_materialize;
+bool		optimizer_enable_partition_propagation;
+bool		optimizer_enable_partition_selection;
+bool		optimizer_enable_outerjoin_rewrite;
+bool		optimizer_enable_multiple_distinct_aggs;
+bool		optimizer_enable_direct_dispatch;
+bool		optimizer_enable_hashjoin_redistribute_broadcast_children;
+bool		optimizer_enable_broadcast_nestloop_outer_child;
+bool		optimizer_discard_redistribute_hashjoin;
+bool		optimizer_enable_streaming_material;
+bool		optimizer_enable_gather_on_segment_for_dml;
+bool		optimizer_enable_assert_maxonerow;
+bool		optimizer_enable_constant_expression_evaluation;
+bool		optimizer_enable_bitmapscan;
+bool		optimizer_enable_outerjoin_to_unionall_rewrite;
+bool		optimizer_enable_ctas;
+bool		optimizer_enable_dml;
+bool		optimizer_enable_dml_constraints;
+bool		optimizer_enable_coordinator_only_queries;
+bool		optimizer_enable_hashjoin;
+bool		optimizer_enable_dynamictablescan;
+bool		optimizer_enable_dynamicindexscan;
+bool		optimizer_enable_dynamicindexonlyscan;
+bool		optimizer_enable_dynamicbitmapscan;
+bool		optimizer_enable_indexscan;
+bool		optimizer_enable_indexonlyscan;
+bool		optimizer_enable_tablescan;
+bool		optimizer_enable_hashagg;
+bool		optimizer_enable_groupagg;
+bool		optimizer_expand_fulljoin;
+bool		optimizer_enable_mergejoin;
+bool		optimizer_enable_redistribute_nestloop_loj_inner_child;
+bool		optimizer_force_comprehensive_join_implementation;
+bool		optimizer_enable_replicated_table;
+bool		optimizer_enable_foreign_table;
+bool		optimizer_enable_right_outer_join;
 bool		optimizer_enable_query_parameter;
 
-/* Analyze related GUCs for external planner */
+/* Optimizer plan enumeration related GUCs */
+bool		optimizer_enumerate_plans;
+bool		optimizer_sample_plans;
+int			optimizer_plan_id;
+int			optimizer_samples_number;
+
+/* Cardinality estimation related GUCs used by the Optimizer */
+bool		optimizer_extract_dxl_stats;
+bool		optimizer_extract_dxl_stats_all_nodes;
+bool		optimizer_print_missing_stats;
+double		optimizer_damping_factor_filter;
+double		optimizer_damping_factor_join;
+double		optimizer_damping_factor_groupby;
+bool		optimizer_dpe_stats;
+bool		optimizer_enable_derive_stats_all_groups;
+
+/* Costing related GUCs used by the Optimizer */
+int			optimizer_segments;
+int			optimizer_penalize_broadcast_threshold;
+double		optimizer_cost_threshold;
+double		optimizer_nestloop_factor;
+double		optimizer_sort_factor;
+
+/* Optimizer hints */
+int			optimizer_join_arity_for_associativity_commutativity;
+int         optimizer_array_expansion_threshold;
+int         optimizer_join_order_threshold;
+int			optimizer_join_order;
+int			optimizer_cte_inlining_bound;
+int			optimizer_push_group_by_below_setop_threshold;
+int			optimizer_xform_bind_threshold;
+int			optimizer_skew_factor;
+bool		optimizer_force_multistage_agg;
+bool		optimizer_force_three_stage_scalar_dqa;
+bool		optimizer_force_expanded_distinct_aggs;
+bool		optimizer_force_agg_skew_avoidance;
+bool		optimizer_penalize_skew;
+bool		optimizer_prune_computed_columns;
+bool		optimizer_push_requirements_from_consumer_to_producer;
+bool		optimizer_enforce_subplans;
+bool		optimizer_use_external_constant_expression_evaluation_for_ints;
+bool		optimizer_apply_left_outer_to_union_all_disregarding_stats;
+bool		optimizer_remove_order_below_dml;
+bool		optimizer_multilevel_partitioning;
+bool 		optimizer_parallel_union;
+bool		optimizer_array_constraints;
+bool		optimizer_cte_inlining;
+bool		optimizer_enable_space_pruning;
+bool		optimizer_enable_associativity;
+bool		optimizer_enable_eageragg;
+bool		optimizer_enable_range_predicate_dpe;
+bool		optimizer_enable_push_join_below_union_all;
+bool		optimizer_enable_orderedagg;
+
+/* Analyze related GUCs for Optimizer */
 bool		optimizer_analyze_root_partition;
 bool		optimizer_analyze_midlevel_partition;
 
@@ -322,6 +447,10 @@ bool		gp_log_endpoints = false;
 /* optional reject to  parse ambigous 5-digits date in YYYMMDD format */
 bool		gp_allow_date_field_width_5digits = false;
 
+/* GUCs for Just In Time (JIT) compilation */
+double		optimizer_jit_above_cost;
+double		optimizer_jit_inline_above_cost;
+double		optimizer_jit_optimize_above_cost;
 
 /* Switch to toggle block-directory based sampling for AO/CO tables */
 bool		gp_enable_blkdir_sampling;
@@ -350,6 +479,26 @@ static const struct config_enum_entry debug_dtm_action_protocol_options[] = {
 	{NULL, 0}
 };
 
+static const struct config_enum_entry optimizer_log_failure_options[] = {
+	{"all", OPTIMIZER_ALL_FAIL},
+	{"unexpected", OPTIMIZER_UNEXPECTED_FAIL},
+	{"expected", OPTIMIZER_EXPECTED_FAIL},
+	{NULL, 0}
+};
+
+static const struct config_enum_entry optimizer_minidump_options[] = {
+	{"onerror", OPTIMIZER_MINIDUMP_FAIL},
+	{"always", OPTIMIZER_MINIDUMP_ALWAYS},
+	{NULL, 0}
+};
+
+static const struct config_enum_entry optimizer_cost_model_options[] = {
+	{"legacy", OPTIMIZER_GPDB_LEGACY},
+	{"calibrated", OPTIMIZER_GPDB_CALIBRATED},
+	{"experimental", OPTIMIZER_GPDB_EXPERIMENTAL},
+	{NULL, 0}
+};
+
 static const struct config_enum_entry explain_memory_verbosity_options[] = {
 	{"suppress", EXPLAIN_MEMORY_VERBOSITY_SUPPRESS},
 	{"summary", EXPLAIN_MEMORY_VERBOSITY_SUMMARY},
@@ -417,6 +566,14 @@ static const struct config_enum_entry gp_resqueue_memory_policies[] = {
 	{NULL, 0}
 };
 
+static const struct config_enum_entry optimizer_join_order_options[] = {
+	{"query", JOIN_ORDER_IN_QUERY},
+	{"greedy", JOIN_ORDER_GREEDY_SEARCH},
+	{"exhaustive", JOIN_ORDER_EXHAUSTIVE_SEARCH},
+	{"exhaustive2", JOIN_ORDER_EXHAUSTIVE2_SEARCH},
+	{NULL, 0}
+};
+
 static const struct config_enum_entry gp_autovacuum_scope_options[] = {
 	{"catalog", AV_SCOPE_CATALOG},
 	{"catalog_ao_aux", AV_SCOPE_CATALOG_AO_AUX},
@@ -1717,59 +1874,886 @@ struct config_bool ConfigureNamesBool_gp[] =
 	},
 
 	{
-		{"optimizer_control", PGC_SUSET, DEVELOPER_OPTIONS,
-			gettext_noop("Allow/disallow turning the optimizer on or off."),
-			NULL
+		{"optimizer_log", PGC_USERSET, LOGGING_WHAT,
+			gettext_noop("Log optimizer messages."),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
 		},
-		&optimizer_control,
+		&optimizer_log,
 		true,
 		NULL, NULL, NULL
 	},
 
+	{
+		{"optimizer_trace_fallback", PGC_USERSET, LOGGING_WHAT,
+			gettext_noop("Print a message at INFO level, whenever GPORCA falls back."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_trace_fallback,
+		false,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_print_query", PGC_USERSET, LOGGING_WHAT,
+			gettext_noop("Prints the optimizer's input query expression tree."),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_print_query,
+		false,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_print_plan", PGC_USERSET, LOGGING_WHAT,
+			gettext_noop("Prints the plan expression tree produced by the optimizer."),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_print_plan,
+		false,
+		NULL, NULL, NULL
+	},
 
+	{
+		{"optimizer_print_xform", PGC_USERSET, LOGGING_WHAT,
+			gettext_noop("Prints optimizer transformation information."),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_print_xform,
+		false,
+		NULL, NULL, NULL
+	},
 
 	{
-		{"optimizer_analyze_root_partition", PGC_USERSET, STATS_ANALYZE,
-			gettext_noop("Enable statistics collection on root partitions during ANALYZE"),
+		{"optimizer_metadata_caching", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("This guc enables the optimizer to cache and reuse metadata."),
 			NULL
 		},
-		&optimizer_analyze_root_partition,
+		&optimizer_metadata_caching,
 		true,
 		NULL, NULL, NULL
 	},
 
 	{
-		{"optimizer_analyze_midlevel_partition", PGC_USERSET, STATS_ANALYZE,
-			gettext_noop("Enable statistics collection on intermediate partitions during ANALYZE"),
+		{"optimizer_print_missing_stats", PGC_USERSET, LOGGING_WHAT,
+			gettext_noop("Print columns with missing statistics."),
 			NULL,
-			GUC_NOT_IN_SAMPLE
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
 		},
-		&optimizer_analyze_midlevel_partition,
+		&optimizer_print_missing_stats,
+		true,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_print_xform_results", PGC_USERSET, LOGGING_WHAT,
+			gettext_noop("Print the input and output of optimizer transformations."),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_print_xform_results,
 		false,
 		NULL, NULL, NULL
 	},
 
-	
+	{
+		{"optimizer_print_memo_after_exploration", PGC_USERSET, LOGGING_WHAT,
+			gettext_noop("Print optimizer memo structure after the exploration phase."),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_print_memo_after_exploration,
+		false,
+		NULL, NULL, NULL
+	},
 
 	{
-		{"gp_log_optimization_time", PGC_USERSET, LOGGING_WHAT,
-			gettext_noop("Writes time spent producing a plan to the server log"),
+		{"optimizer_print_memo_after_implementation", PGC_USERSET, LOGGING_WHAT,
+			gettext_noop("Print optimizer memo structure after the implementation phase."),
 			NULL,
 			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
 		},
-		&gp_log_optimization_time,
+		&optimizer_print_memo_after_implementation,
+		false,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_print_memo_after_optimization", PGC_USERSET, LOGGING_WHAT,
+			gettext_noop("Print optimizer memo structure after optimization."),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_print_memo_after_optimization,
+		false,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_print_job_scheduler", PGC_USERSET, LOGGING_WHAT,
+			gettext_noop("Print the jobs in the scheduler on each job completion."),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_print_job_scheduler,
+		false,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_print_expression_properties", PGC_USERSET, LOGGING_WHAT,
+			gettext_noop("Print expression properties."),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_print_expression_properties,
+		false,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_print_group_properties", PGC_USERSET, LOGGING_WHAT,
+			gettext_noop("Print group properties."),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_print_group_properties,
+		false,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_print_optimization_context", PGC_USERSET, LOGGING_WHAT,
+			gettext_noop("Print the optimization context."),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_print_optimization_context,
+		false,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_print_optimization_stats", PGC_USERSET, LOGGING_WHAT,
+			gettext_noop("Print optimization stats."),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_print_optimization_stats,
+		false,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_extract_dxl_stats", PGC_USERSET, LOGGING_WHAT,
+			gettext_noop("Extract plan stats in dxl."),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_extract_dxl_stats,
+		false,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_extract_dxl_stats_all_nodes", PGC_USERSET, LOGGING_WHAT,
+			gettext_noop("Extract plan stats for all physical dxl nodes."),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_extract_dxl_stats_all_nodes,
+		false,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_dpe_stats", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enable statistics derivation for partitioned tables with dynamic partition elimination."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_dpe_stats,
+		true,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_enable_nljoin", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enable nested loops join plans in the optimizer."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_nljoin,
+		true,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_enable_indexjoin", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enable index nested loops join plans in the optimizer."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_indexjoin,
+		true,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_enable_motions_masteronly_queries", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enable plans with Motion operators in the optimizer for queries with no distributed tables."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_motions_coordinatoronly_queries,
 		false,
 		NULL, NULL, NULL
 	},
+	{
+		{"optimizer_enable_motions", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enable plans with Motion operators in the optimizer."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_motions,
+		true,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_enable_motion_broadcast", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enable plans with Motion Broadcast operators in the optimizer."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_motion_broadcast,
+		true,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_enable_motion_gather", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enable plans with Motion Gather operators in the optimizer."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_motion_gather,
+		true,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_enable_motion_redistribute", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enable plans with Motion Redistribute operators in the optimizer."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_motion_redistribute,
+		true,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_enable_sort", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enable plans with Sort operators in the optimizer."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_sort,
+		true,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_enable_materialize", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enable plans with Materialize operators in the optimizer."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_materialize,
+		true,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_enable_partition_propagation", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enable plans with Partition Propagation operators in the optimizer."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_partition_propagation,
+		true,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_enable_partition_selection", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enable plans with Partition Selection operators in the optimizer."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_partition_selection,
+		true,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_enable_outerjoin_rewrite", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enable outer join to inner join rewrite in the optimizer."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_outerjoin_rewrite,
+		true,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_enable_direct_dispatch", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enable direct dispatch in the optimizer."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_direct_dispatch,
+		true,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_control", PGC_SUSET, DEVELOPER_OPTIONS,
+			gettext_noop("Allow/disallow turning the optimizer on or off."),
+			NULL
+		},
+		&optimizer_control,
+		true,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_enable_space_pruning", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Enable space pruning in the optimizer."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_space_pruning,
+		true,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_enable_master_only_queries", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Process coordinator only queries via the optimizer."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_coordinator_only_queries,
+		false,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_enable_hashjoin", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enables the optimizer's use of hash join plans."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_hashjoin,
+		true,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_enable_dynamictablescan", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enables the optimizer's use of plans with dynamic table scan."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_dynamictablescan,
+		true,
+		NULL, NULL, NULL
+	},
+
+	{
+			{"optimizer_enable_dynamicindexscan", PGC_USERSET, QUERY_TUNING_METHOD,
+					gettext_noop("Enables the optimizer's use of plans with dynamic index scan."),
+					NULL,
+					GUC_NOT_IN_SAMPLE
+			},
+			&optimizer_enable_dynamicindexscan,
+			true,
+			NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_enable_dynamicindexonlyscan", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enables the optimizer's use of plans with dynamic index only scan."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_dynamicindexonlyscan,
+		true,
+		NULL, NULL, NULL
+	},
+
+	{
+			{"optimizer_enable_dynamicbitmapscan", PGC_USERSET, QUERY_TUNING_METHOD,
+					gettext_noop("Enables the optimizer's use of plans with dynamic bitmap scan."),
+					NULL,
+					GUC_NOT_IN_SAMPLE
+			},
+			&optimizer_enable_dynamicbitmapscan,
+			true,
+			NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_enable_indexscan", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enables the optimizer's use of plans with index scan."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_indexscan,
+		true,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_enable_indexonlyscan", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enables the optimizer's use of plans with index only scan."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_indexonlyscan,
+		true,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_enable_tablescan", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enables the optimizer's use of plans with table scan."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_tablescan,
+		true,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_enable_hashagg", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enables GPORCA to use hash aggregates."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_hashagg,
+		true,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_enable_groupagg", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enables GPORCA to use group aggregates."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_groupagg,
+		true,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_force_agg_skew_avoidance", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Always pick a plan for aggregate distinct that minimizes skew."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_force_agg_skew_avoidance,
+		true,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_penalize_skew", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Penalize operators with skewed hash redistribute below it."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_penalize_skew,
+		true,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_multilevel_partitioning", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Enable optimization of queries on multilevel partitioned tables."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_multilevel_partitioning,
+		true,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_enable_derive_stats_all_groups", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Enable stats derivation for all groups after exploration."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_derive_stats_all_groups,
+		false,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_force_multistage_agg", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Force optimizer to always pick multistage aggregates when such a plan alternative is generated."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_force_multistage_agg,
+		false,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_enable_multiple_distinct_aggs", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enable plans with multiple distinct aggregates in the optimizer."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_multiple_distinct_aggs,
+		false,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_force_expanded_distinct_aggs", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Always pick plans that expand multiple distinct aggregates into join of single distinct aggregate in the optimizer."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_force_expanded_distinct_aggs,
+		true,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_prune_computed_columns", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Prune unused computed columns when pre-processing query"),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_prune_computed_columns,
+		true,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_push_requirements_from_consumer_to_producer", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Optimize CTE producer plan on requirements enforced on top of CTE consumer in the optimizer."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_push_requirements_from_consumer_to_producer,
+		true,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_enable_hashjoin_redistribute_broadcast_children", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enable hash join plans with, Redistribute outer child and Broadcast inner child, in the optimizer."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_hashjoin_redistribute_broadcast_children,
+		false,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_enable_broadcast_nestloop_outer_child", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enable nested loops join plans with replicated outer child in the optimizer."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_broadcast_nestloop_outer_child,
+		true,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_discard_redistribute_hashjoin", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Discard hash join with redistribute motion in the optimizer."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_discard_redistribute_hashjoin,
+		false,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_expand_fulljoin", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enables the optimizer's support of expanding full outer joins using union all."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_expand_fulljoin,
+		false,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_enable_mergejoin", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enables the optimizer's support of merge joins."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_mergejoin,
+		true,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_enable_streaming_material", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enable plans with a streaming material node in the optimizer."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_streaming_material,
+		true,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_enable_gather_on_segment_for_dml", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enable DML optimization by enforcing a non-coordinator gather in the optimizer."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_gather_on_segment_for_dml,
+		true,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_enforce_subplans", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Enforce correlated execution in the optimizer"),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enforce_subplans,
+		false,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_enable_assert_maxonerow", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enable Assert MaxOneRow plans to check number of rows at runtime."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_assert_maxonerow,
+		true,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_enumerate_plans", PGC_USERSET, LOGGING_WHAT,
+			gettext_noop("Enable plan enumeration"),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enumerate_plans,
+		false,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_sample_plans", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Enable plan sampling"),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_sample_plans,
+		false,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_cte_inlining", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Enable CTE inlining"),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_cte_inlining,
+		false,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_analyze_root_partition", PGC_USERSET, STATS_ANALYZE,
+			gettext_noop("Enable statistics collection on root partitions during ANALYZE"),
+			NULL
+		},
+		&optimizer_analyze_root_partition,
+		true,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_analyze_midlevel_partition", PGC_USERSET, STATS_ANALYZE,
+			gettext_noop("Enable statistics collection on intermediate partitions during ANALYZE"),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_analyze_midlevel_partition,
+		false,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_enable_constant_expression_evaluation", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enable constant expression evaluation in the optimizer"),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_constant_expression_evaluation,
+		true,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_use_external_constant_expression_evaluation_for_ints", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Use external constant expression evaluation in the optimizer for all integer types"),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_use_external_constant_expression_evaluation_for_ints,
+		false,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_enable_bitmapscan", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enable bitmap plans in the optimizer"),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_bitmapscan,
+		true,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_enable_outerjoin_to_unionall_rewrite", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enable rewriting Left Outer Join to UnionAll"),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_outerjoin_to_unionall_rewrite,
+		false,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_apply_left_outer_to_union_all_disregarding_stats", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Always apply Left Outer Join to Inner Join UnionAll Left Anti Semi Join without looking at stats."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_apply_left_outer_to_union_all_disregarding_stats,
+		false,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_enable_ctas", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enable CTAS plans in the optimizer"),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_ctas,
+		true,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_remove_order_below_dml", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Remove OrderBy below a DML operation"),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_remove_order_below_dml,
+		false,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_enable_dml", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enable DML plans in GPORCA."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_dml,
+		true,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_enable_dml_constraints", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Support DML with CHECK constraints and NOT NULL constraints."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_dml_constraints,
+		true,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"gp_log_optimization_time", PGC_USERSET, LOGGING_WHAT,
+			gettext_noop("Writes time spent producing a plan to the server log"),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&gp_log_optimization_time,
+		false,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"gp_reject_internal_tcp_connection", PGC_POSTMASTER, DEFUNCT_OPTIONS,
+			gettext_noop("Unused. Syntax check only for GPDB compatibility."),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&gp_reject_internal_tcp_conn,
+		false,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_force_three_stage_scalar_dqa", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Force optimizer to always pick 3 stage aggregate plan for scalar distinct qualified aggregate."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_force_three_stage_scalar_dqa,
+		true,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_parallel_union", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Enable parallel execution for UNION/UNION ALL queries."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_parallel_union,
+		false,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_array_constraints", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Allows the optimizer's constraint framework to derive array constraints."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_array_constraints,
+		true,
+		NULL, NULL, NULL
+	},
 
 	{
-		{"gp_reject_internal_tcp_connection", PGC_POSTMASTER, DEFUNCT_OPTIONS,
-			gettext_noop("Unused. Syntax check only for GPDB compatibility."),
+		{"optimizer_use_gpdb_allocators", PGC_POSTMASTER, RESOURCES_MEM,
+			gettext_noop("Enable ORCA to use GPDB Memory Contexts"),
 			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+			GUC_NOT_IN_SAMPLE
 		},
-		&gp_reject_internal_tcp_conn,
-		false,
+		&optimizer_use_gpdb_allocators,
+		true,
 		NULL, NULL, NULL
 	},
 
@@ -1828,6 +2812,15 @@ struct config_bool ConfigureNamesBool_gp[] =
 		NULL, NULL, NULL
 	},
 
+	{
+		{"optimizer_enable_associativity", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enables Join Associativity in optimizer"),
+			NULL
+		},
+		&optimizer_enable_associativity,
+		false, NULL, NULL
+	},
+
 	{
 		{"optimizer_replicated_table_insert", PGC_USERSET, STATS_ANALYZE,
 			gettext_noop("Omit broadcast motion when inserting into replicated table"),
@@ -1933,7 +2926,47 @@ struct config_bool ConfigureNamesBool_gp[] =
 		false,
 		NULL, NULL, NULL
 	},
+	{
+		{"optimizer_enable_orderedagg", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Enable ordered aggregate plans."),
+			NULL
+		},
+		&optimizer_enable_orderedagg,
+		true,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_enable_eageragg", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Enable Eager Agg transform for pushing aggregate below an innerjoin."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_eageragg,
+		false,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_enable_range_predicate_dpe", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Enable range predicates for dynamic partition elimination."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_range_predicate_dpe,
+		false,
+		NULL, NULL, NULL
+	},
 
+	{
+		{"optimizer_enable_push_join_below_union_all", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Enable transform of join of union all to union all of joins. May improve the join performance."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_push_join_below_union_all,
+		false,
+		NULL, NULL, NULL
+	},
 	{
 		{"gp_autostats_allow_nonowner", PGC_SUSET, DEVELOPER_OPTIONS,
 			gettext_noop("Allow automatic stats collection on tables even for users who are not the owner of the relation."),
@@ -1943,6 +2976,69 @@ struct config_bool ConfigureNamesBool_gp[] =
 		false,
 		NULL, NULL, NULL
 	},
+
+	{
+		{"optimizer_enable_redistribute_nestloop_loj_inner_child", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Enable nested loops left join plans with redistributed inner child in the optimizer."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_redistribute_nestloop_loj_inner_child,
+		true,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_force_comprehensive_join_implementation", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Explore a nested loop join even if a hash join is possible"),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_force_comprehensive_join_implementation,
+		false,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_enable_replicated_table", PGC_USERSET, DEVELOPER_OPTIONS,
+		 gettext_noop("Enable replicated tables."),
+		 NULL,
+		 GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_replicated_table,
+		true,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_enable_foreign_table", PGC_USERSET, DEVELOPER_OPTIONS,
+		 gettext_noop("Enable foreign tables in Orca."),
+		 NULL,
+		 GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_foreign_table,
+		true,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_enable_right_outer_join", PGC_USERSET, QUERY_TUNING_METHOD,
+		 gettext_noop("Enable Orca to generate plans containing right outer joins."),
+		 gettext_noop("Right outer join can be re-written from left outer join. "
+					  "However, there are scenarios due to cardinality and cost "
+					  "misestimation, right outer join plan may be sub-optimal and "
+					  "can either be slower than the left outer join plan alternative "
+					  "or hit out-of-memory (OOM). The root cause can be identified "
+					  "by viewing the explain analyze plan and observing that the "
+					  "right outer join plan node is consuming all resources "
+					  "(CPU/memory) or the explain analyze itself hits OOM. By "
+					  "setting this GUC value to \"false\" users can force GPORCA to "
+					  "generate an equivalent left outer join plan. We recommend that "
+					  "the GUC be set at the query level as there can be several use "
+					  "cases where right outer join is the best plan alternative to "
+					  "choose."),
+		 GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_right_outer_join,
+		true,
+		NULL, NULL, NULL
+	},
 	{
 		{"optimizer_enable_query_parameter", PGC_USERSET, DEVELOPER_OPTIONS,
 		 gettext_noop("Enable query parameters in Orca."),
@@ -1953,6 +3049,26 @@ struct config_bool ConfigureNamesBool_gp[] =
 		true,
 		NULL, NULL, NULL
 	},
+	{
+		{"optimizer_enable_coordinator_only_queries", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Process coordinator only queries via the optimizer."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_coordinator_only_queries,
+		false,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_enable_motions_coordinatoronly_queries", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enable plans with Motion operators in the optimizer for queries with no distributed tables."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_enable_motions_coordinatoronly_queries,
+		false,
+		NULL, NULL, NULL
+	},
 	{
 		{"gp_log_suboverflow_statement", PGC_SUSET, LOGGING_WHAT,
 		 gettext_noop("Enable logging of statements that cause subtransaction overflow."),
@@ -2970,6 +4086,136 @@ struct config_int ConfigureNamesInt_gp[] =
 		120, 5, INT_MAX, NULL, NULL
 	},
 
+	{
+		{"optimizer_plan_id", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Choose a plan alternative"),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_plan_id,
+		0, 0, INT_MAX,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_samples_number", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Set the number of plan samples"),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_samples_number,
+		1000, 1, INT_MAX,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_cte_inlining_bound", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Set the CTE inlining cutoff"),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_cte_inlining_bound,
+		0, 0, INT_MAX,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_segments", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Number of segments to be considered by the optimizer during costing, or 0 to take the actual number of segments."),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_segments,
+		0, 0, INT_MAX,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_array_expansion_threshold", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Item limit for expansion of arrays in WHERE clause for constraint derivation."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_array_expansion_threshold,
+		20, 0, INT_MAX,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_push_group_by_below_setop_threshold", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Maximum number of children setops have to consider pushing group bys below it"),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_push_group_by_below_setop_threshold,
+		10, 0, INT_MAX,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_xform_bind_threshold", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Maximum number bindings per xform per group expression. A value of 0 disables."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_xform_bind_threshold,
+		0, 0, INT_MAX,
+		NULL, NULL, NULL
+	},
+
+    {
+            {"optimizer_skew_factor", PGC_USERSET, DEVELOPER_OPTIONS,
+             gettext_noop("Coefficient of skew ratio computed from sample stastics. Default 0: skew computation from sample statistics turned off. [1,100]: skew ratio computed from sample statistics. The skewness used for costing is the product of the optimizer_skew_factor and the skew ratio."),
+             NULL,
+			 GUC_NOT_IN_SAMPLE
+            },
+            &optimizer_skew_factor,
+            0, 0, 100,
+            NULL, NULL, NULL
+    },
+
+	{
+		{"optimizer_join_order_threshold", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Maximum number of join children to use dynamic programming based join ordering algorithm."),
+			NULL
+		},
+		&optimizer_join_order_threshold,
+		10, 0, 12,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_join_arity_for_associativity_commutativity", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Maximum number of children n-ary-join have without disabling commutativity and associativity transform"),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_join_arity_for_associativity_commutativity,
+		18, 0, INT_MAX,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_penalize_broadcast_threshold", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Maximum number of rows of a relation that can be broadcasted without penalty. A value of 0 disables."),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_penalize_broadcast_threshold,
+		100000, 0, INT_MAX,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_mdcache_size", PGC_USERSET, RESOURCES_MEM,
+			gettext_noop("Sets the size of MDCache."),
+			NULL,
+			GUC_UNIT_KB
+		},
+		&optimizer_mdcache_size,
+		16384, 0, INT_MAX,
+		NULL, NULL, NULL
+	},
 
 	{
 		{"memory_profiler_dataset_size", PGC_USERSET, DEVELOPER_OPTIONS,
@@ -3207,6 +4453,101 @@ struct config_real ConfigureNamesReal_gp[] =
 		NULL, NULL, NULL
 	},
 
+	{
+		{"optimizer_damping_factor_filter", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("select predicate damping factor in optimizer, 1.0 means no damping"),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_damping_factor_filter,
+		0.75, 0.0, 1.0,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_damping_factor_join", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("join predicate damping factor in optimizer, 1.0 means no damping, 0.0 means square root method"),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_damping_factor_join,
+		0.0, 0.0, 1.0,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_damping_factor_groupby", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("groupby operator damping factor in optimizer, 1.0 means no damping"),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_damping_factor_groupby,
+		0.75, 0.0, 1.0,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_cost_threshold", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Set the threshold for plan sampling relative to the cost of best plan, 0.0 means unbounded"),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_cost_threshold,
+		0.0, 0.0, INT_MAX,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_nestloop_factor", PGC_USERSET, QUERY_TUNING_OTHER,
+			gettext_noop("Set the nestloop join cost factor in the optimizer"),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_nestloop_factor,
+		1024.0, 1.0, DBL_MAX,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_sort_factor",PGC_USERSET, QUERY_TUNING_OTHER,
+			gettext_noop("Set the sort cost factor in the optimizer, 1.0 means same as default, > 1.0 means more costly than default, < 1.0 means means less costly than default"),
+			NULL,
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_sort_factor,
+		1.0, 0.0, DBL_MAX,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_jit_above_cost",PGC_USERSET, QUERY_TUNING_COST,
+			gettext_noop("Perform JIT compilation if query is more expensive."),
+			gettext_noop("-1 disables JIT compilation."),
+			GUC_EXPLAIN
+		},
+		&optimizer_jit_above_cost,
+		7500, -1, DBL_MAX,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_jit_optimize_above_cost",PGC_USERSET, QUERY_TUNING_COST,
+			gettext_noop("Optimize JITed functions if query is more expensive."),
+			gettext_noop("-1 disables JIT optimization."),
+			GUC_EXPLAIN
+		},
+		&optimizer_jit_optimize_above_cost,
+		37500, -1, DBL_MAX,
+		NULL, NULL, NULL
+	},
+	{
+		{"optimizer_jit_inline_above_cost",PGC_USERSET, QUERY_TUNING_COST,
+			gettext_noop("Perform JIT inlining if query is more expensive."),
+			gettext_noop("-1 disables inlining."),
+			GUC_EXPLAIN
+		},
+		&optimizer_jit_inline_above_cost,
+		37500, -1, DBL_MAX,
+		NULL, NULL, NULL
+	},
+
 	/* End-of-list marker */
 	{
 		{NULL, 0, 0, NULL, NULL}, NULL, 0.0, 0.0, 0.0, NULL, NULL
@@ -3348,6 +4689,17 @@ struct config_string ConfigureNamesString_gp[] =
 		NULL, NULL, NULL
 	},
 
+	{
+		{"optimizer_search_strategy_path", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Sets the search strategy used by gp optimizer."),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_search_strategy_path,
+		"default",
+		NULL, NULL, NULL
+	},
+
 	{
 		{"gp_default_storage_options", PGC_USERSET, APPENDONLY_TABLES,
 			gettext_noop("Sets the default options for appendonly storage."),
@@ -3452,6 +4804,38 @@ struct config_enum ConfigureNamesEnum_gp[] =
 		NULL, NULL, NULL
 	},
 
+	{
+		{"optimizer_log_failure", PGC_USERSET, LOGGING_WHEN,
+			gettext_noop("Sets which optimizer failures are logged."),
+			gettext_noop("Valid values are unexpected, expected, all"),
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_log_failure,
+		OPTIMIZER_UNEXPECTED_FAIL, optimizer_log_failure_options,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_minidump", PGC_USERSET, LOGGING_WHEN,
+			gettext_noop("Generate optimizer minidump."),
+			gettext_noop("Valid values are onerror, always"),
+		},
+		&optimizer_minidump,
+		OPTIMIZER_MINIDUMP_FAIL, optimizer_minidump_options,
+		NULL, NULL, NULL
+	},
+
+	{
+		{"optimizer_cost_model", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Set optimizer cost model."),
+			gettext_noop("Valid values are legacy, calibrated, experimental"),
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_cost_model,
+		OPTIMIZER_GPDB_CALIBRATED, optimizer_cost_model_options,
+		NULL, NULL, NULL
+	},
+
 	{
 		{"explain_memory_verbosity", PGC_USERSET, RESOURCES_MEM,
 			gettext_noop("Experimental feature: show memory account usage in EXPLAIN ANALYZE."),
@@ -3590,6 +4974,17 @@ struct config_enum ConfigureNamesEnum_gp[] =
 		RESMANAGER_MEMORY_POLICY_EAGER_FREE, gp_resqueue_memory_policies, NULL, NULL
 	},
 
+	{
+		{"optimizer_join_order", PGC_USERSET, QUERY_TUNING_OTHER,
+			gettext_noop("Set optimizer join heuristic model."),
+			gettext_noop("Valid values are query, greedy, exhaustive and exhaustive2"),
+			GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_join_order,
+		JOIN_ORDER_EXHAUSTIVE2_SEARCH, optimizer_join_order_options,
+		NULL, NULL, NULL
+	},
+
 	{
 		{"gp_autovacuum_scope", PGC_SIGHUP, AUTOVACUUM,
 		 gettext_noop("Sets which tables are eligible for autovacuum of dead tuples."),
diff --git a/src/include/jit/jit.h b/src/include/jit/jit.h
index 5c9d2f1910bf..c76941ed4b62 100644
--- a/src/include/jit/jit.h
+++ b/src/include/jit/jit.h
@@ -90,6 +90,11 @@ extern double jit_above_cost;
 extern double jit_inline_above_cost;
 extern double jit_optimize_above_cost;
 
+/* Optimizer specific JIT GUCs */
+extern double optimizer_jit_above_cost;
+extern double optimizer_jit_inline_above_cost;
+extern double optimizer_jit_optimize_above_cost;
+
 extern void jit_reset_after_error(void);
 extern void jit_release_context(JitContext *context);
 
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index bb5bacfabcf0..fcd9c5112fdc 100644
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -422,18 +422,166 @@ extern bool create_restartpoint_on_ckpt_record_replay;
 #define EXPLAIN_MEMORY_VERBOSITY_SUMMARY	1 /* Summary of memory usage for each owner in explain analyze */
 #define EXPLAIN_MEMORY_VERBOSITY_DETAIL		2 /* Detail memory accounting tree for each slice in explain analyze */
 
+/* ORCA related definitions */
+#define OPTIMIZER_XFORMS_COUNT 400 /* number of transformation rules */
 
-/* External planner related gucs */
+/* types of optimizer failures */
+#define OPTIMIZER_ALL_FAIL 			0  /* all failures */
+#define OPTIMIZER_UNEXPECTED_FAIL 	1  /* unexpected failures */
+#define OPTIMIZER_EXPECTED_FAIL 	2 /* expected failures */
+
+/* optimizer minidump mode */
+#define OPTIMIZER_MINIDUMP_FAIL  	0  /* create optimizer minidump on failure */
+#define OPTIMIZER_MINIDUMP_ALWAYS 	1  /* always create optimizer minidump */
+
+/* optimizer cost model */
+#define OPTIMIZER_GPDB_LEGACY           0       /* GPDB's legacy cost model */
+#define OPTIMIZER_GPDB_CALIBRATED       1       /* GPDB's calibrated cost model */
+#define OPTIMIZER_GPDB_EXPERIMENTAL     2       /* GPDB's experimental cost model */
+
+
+/* Optimizer related gucs */
 extern bool	optimizer;
 extern bool optimizer_control;	/* controls whether the user can change the setting of the "optimizer" guc */
-
+extern bool	optimizer_log;
+extern int  optimizer_log_failure;
+extern bool	optimizer_trace_fallback;
+extern int optimizer_minidump;
+extern int  optimizer_cost_model;
+extern bool optimizer_metadata_caching;
+extern int	optimizer_mdcache_size;
+
+/* Optimizer debugging GUCs */
+extern bool optimizer_print_query;
+extern bool optimizer_print_plan;
+extern bool optimizer_print_xform;
+extern bool	optimizer_print_memo_after_exploration;
+extern bool	optimizer_print_memo_after_implementation;
+extern bool	optimizer_print_memo_after_optimization;
+extern bool	optimizer_print_job_scheduler;
+extern bool	optimizer_print_expression_properties;
+extern bool	optimizer_print_group_properties;
+extern bool	optimizer_print_optimization_context;
+extern bool optimizer_print_optimization_stats;
+extern bool optimizer_print_xform_results;
+
+/* array of xforms disable flags */
+extern bool optimizer_xforms[OPTIMIZER_XFORMS_COUNT];
+extern char *optimizer_search_strategy_path;
+
+/* GUCs to tell Optimizer to enable a physical operator */
+extern bool optimizer_enable_nljoin;
+extern bool optimizer_enable_indexjoin;
+extern bool optimizer_enable_motions_coordinatoronly_queries;
+extern bool optimizer_enable_motions;
+extern bool optimizer_enable_motion_broadcast;
+extern bool optimizer_enable_motion_gather;
+extern bool optimizer_enable_motion_redistribute;
+extern bool optimizer_enable_sort;
+extern bool optimizer_enable_materialize;
+extern bool optimizer_enable_partition_propagation;
+extern bool optimizer_enable_partition_selection;
+extern bool optimizer_enable_outerjoin_rewrite;
+extern bool optimizer_enable_multiple_distinct_aggs;
+extern bool optimizer_enable_hashjoin_redistribute_broadcast_children;
+extern bool optimizer_enable_broadcast_nestloop_outer_child;
+extern bool optimizer_discard_redistribute_hashjoin;
+extern bool optimizer_enable_streaming_material;
+extern bool optimizer_enable_gather_on_segment_for_dml;
+extern bool optimizer_enable_assert_maxonerow;
+extern bool optimizer_enable_constant_expression_evaluation;
+extern bool optimizer_enable_bitmapscan;
+extern bool optimizer_enable_outerjoin_to_unionall_rewrite;
+extern bool optimizer_enable_ctas;
+extern bool optimizer_enable_dml;
+extern bool	optimizer_enable_dml_constraints;
+extern bool optimizer_enable_direct_dispatch;
+extern bool optimizer_enable_coordinator_only_queries;
+extern bool optimizer_enable_hashjoin;
+extern bool optimizer_enable_dynamictablescan;
+extern bool optimizer_enable_dynamicindexscan;
+extern bool optimizer_enable_dynamicindexonlyscan;
+extern bool optimizer_enable_dynamicbitmapscan;
+extern bool optimizer_enable_indexscan;
+extern bool optimizer_enable_indexonlyscan;
+extern bool optimizer_enable_tablescan;
+extern bool optimizer_enable_eageragg;
+extern bool optimizer_enable_orderedagg;
+extern bool optimizer_expand_fulljoin;
+extern bool optimizer_enable_hashagg;
+extern bool optimizer_enable_groupagg;
+extern bool optimizer_enable_mergejoin;
+extern bool optimizer_enable_redistribute_nestloop_loj_inner_child;
+extern bool optimizer_force_comprehensive_join_implementation;
+extern bool optimizer_enable_replicated_table;
+extern bool optimizer_enable_foreign_table;
+extern bool optimizer_enable_right_outer_join;
 extern bool optimizer_enable_query_parameter;
 
-/* Analyze related GUCs for external planner */
+/* Optimizer plan enumeration related GUCs */
+extern bool optimizer_enumerate_plans;
+extern bool optimizer_sample_plans;
+extern int	optimizer_plan_id;
+extern int	optimizer_samples_number;
+
+/* Optimizer Just In Time (JIT) compilation related GUCs*/
+extern  double  optimizer_jit_above_cost;
+extern  double  optimizer_jit_inline_above_cost;
+extern  double  optimizer_jit_optimize_above_cost;
+
+/* Cardinality estimation related GUCs used by the Optimizer */
+extern bool optimizer_extract_dxl_stats;
+extern bool optimizer_extract_dxl_stats_all_nodes;
+extern bool optimizer_print_missing_stats;
+extern double optimizer_damping_factor_filter;
+extern double optimizer_damping_factor_join;
+extern double optimizer_damping_factor_groupby;
+extern bool optimizer_dpe_stats;
+extern bool optimizer_enable_derive_stats_all_groups;
+
+/* Costing or tuning related GUCs used by the Optimizer */
+extern int optimizer_segments;
+extern int optimizer_penalize_broadcast_threshold;
+extern double optimizer_cost_threshold;
+extern double optimizer_nestloop_factor;
+extern double optimizer_sort_factor;
+
+/* Optimizer hints */
+extern int optimizer_array_expansion_threshold;
+extern int optimizer_join_order_threshold;
+extern int optimizer_join_order;
+extern int optimizer_join_arity_for_associativity_commutativity;
+extern int optimizer_cte_inlining_bound;
+extern int optimizer_push_group_by_below_setop_threshold;
+extern int optimizer_xform_bind_threshold;
+extern int optimizer_skew_factor;
+extern bool optimizer_force_multistage_agg;
+extern bool optimizer_force_three_stage_scalar_dqa;
+extern bool optimizer_force_expanded_distinct_aggs;
+extern bool optimizer_force_agg_skew_avoidance;
+extern bool optimizer_penalize_skew;
+extern bool optimizer_prune_computed_columns;
+extern bool optimizer_push_requirements_from_consumer_to_producer;
+extern bool optimizer_enforce_subplans;
+extern bool optimizer_apply_left_outer_to_union_all_disregarding_stats;
+extern bool optimizer_use_external_constant_expression_evaluation_for_ints;
+extern bool optimizer_remove_order_below_dml;
+extern bool optimizer_multilevel_partitioning;
+extern bool optimizer_parallel_union;
+extern bool optimizer_array_constraints;
+extern bool optimizer_cte_inlining;
+extern bool optimizer_enable_space_pruning;
+extern bool optimizer_enable_associativity;
+extern bool optimizer_enable_range_predicate_dpe;
+extern bool optimizer_enable_push_join_below_union_all;
+
+/* Analyze related GUCs for Optimizer */
 extern bool optimizer_analyze_root_partition;
 extern bool optimizer_analyze_midlevel_partition;
 
-/* External planner GUCs for replicated table */
+extern bool optimizer_use_gpdb_allocators;
+
+/* optimizer GUCs for replicated table */
 extern bool optimizer_replicated_table_insert;
 
 /* GUCs for slice table*/
diff --git a/src/include/utils/sync_guc_name.h b/src/include/utils/sync_guc_name.h
index 2b757c1eeee3..0228d8d5cf8f 100644
--- a/src/include/utils/sync_guc_name.h
+++ b/src/include/utils/sync_guc_name.h
@@ -137,6 +137,9 @@
 		"memory_profiler_query_id",
 		"memory_profiler_run_id",
 		"optimize_bounded_sort",
+		"optimizer_jit_above_cost",
+		"optimizer_jit_inline_above_cost",
+		"optimizer_jit_optimize_above_cost",
 		"pljava_classpath",
 		"pljava_release_lingering_savepoints",
 		"pljava_statement_cache_size",
diff --git a/src/include/utils/unsync_guc_name.h b/src/include/utils/unsync_guc_name.h
index 2eaacbfeb79a..a0c3c97c609f 100644
--- a/src/include/utils/unsync_guc_name.h
+++ b/src/include/utils/unsync_guc_name.h
@@ -333,11 +333,122 @@
 		"optimizer",
 		"optimizer_analyze_midlevel_partition",
 		"optimizer_analyze_root_partition",
+		"optimizer_apply_left_outer_to_union_all_disregarding_stats",
+		"optimizer_array_constraints",
+		"optimizer_array_expansion_threshold",
 		"optimizer_control",
+		"optimizer_cost_model",
+		"optimizer_cost_threshold",
+		"optimizer_cte_inlining",
+		"optimizer_cte_inlining_bound",
+		"optimizer_damping_factor_filter",
+		"optimizer_damping_factor_groupby",
+		"optimizer_damping_factor_join",
+		"optimizer_discard_redistribute_hashjoin",
+		"optimizer_dpe_stats",
+		"optimizer_enable_assert_maxonerow",
+		"optimizer_enable_associativity",
+		"optimizer_enable_bitmapscan",
+		"optimizer_enable_broadcast_nestloop_outer_child",
+		"optimizer_enable_constant_expression_evaluation",
+		"optimizer_enable_coordinator_only_queries",
+		"optimizer_enable_ctas",
+		"optimizer_enable_derive_stats_all_groups",
+		"optimizer_enable_direct_dispatch",
+		"optimizer_enable_dml",
+		"optimizer_enable_dml_constraints",
+		"optimizer_enable_dynamictablescan",
+		"optimizer_enable_dynamicindexscan",
+		"optimizer_enable_dynamicindexonlyscan",
+		"optimizer_enable_dynamicbitmapscan",
+		"optimizer_enable_eageragg",
+		"optimizer_enable_orderedagg",
+		"optimizer_enable_gather_on_segment_for_dml",
+		"optimizer_enable_groupagg",
+		"optimizer_enable_hashagg",
+		"optimizer_enable_hashjoin",
+		"optimizer_enable_hashjoin_redistribute_broadcast_children",
+		"optimizer_enable_indexjoin",
+		"optimizer_enable_indexonlyscan",
+		"optimizer_enable_indexscan",
 		"optimizer_enable_master_only_queries",
+		"optimizer_enable_materialize",
+		"optimizer_enable_mergejoin",
+		"optimizer_enable_motion_broadcast",
+		"optimizer_enable_motion_gather",
+		"optimizer_enable_motion_redistribute",
+		"optimizer_enable_motions",
+		"optimizer_enable_motions_coordinatoronly_queries",
 		"optimizer_enable_motions_masteronly_queries",
+		"optimizer_enable_multiple_distinct_aggs",
+		"optimizer_enable_nljoin",
+		"optimizer_enable_outerjoin_rewrite",
+		"optimizer_enable_outerjoin_to_unionall_rewrite",
+		"optimizer_enable_partition_propagation",
+		"optimizer_enable_partition_selection",
+		"optimizer_enable_push_join_below_union_all",
+		"optimizer_enable_range_predicate_dpe",
+		"optimizer_enable_redistribute_nestloop_loj_inner_child",
+		"optimizer_enable_replicated_table",
+		"optimizer_enable_sort",
+		"optimizer_enable_space_pruning",
+		"optimizer_enable_streaming_material",
+		"optimizer_enable_tablescan",
+		"optimizer_enable_foreign_table",
+		"optimizer_enable_right_outer_join",
 		"optimizer_enable_query_parameter",
+		"optimizer_enforce_subplans",
+		"optimizer_enumerate_plans",
+		"optimizer_expand_fulljoin",
+		"optimizer_extract_dxl_stats",
+		"optimizer_extract_dxl_stats_all_nodes",
+		"optimizer_force_agg_skew_avoidance",
+		"optimizer_force_comprehensive_join_implementation",
+		"optimizer_force_expanded_distinct_aggs",
+		"optimizer_force_multistage_agg",
+		"optimizer_force_three_stage_scalar_dqa",
+		"optimizer_join_arity_for_associativity_commutativity",
+		"optimizer_join_order",
+		"optimizer_join_order_threshold",
+		"optimizer_log",
+		"optimizer_log_failure",
+		"optimizer_mdcache_size",
+		"optimizer_metadata_caching",
+		"optimizer_minidump",
+		"optimizer_multilevel_partitioning",
+		"optimizer_nestloop_factor",
+		"optimizer_parallel_union",
+		"optimizer_penalize_broadcast_threshold",
+		"optimizer_penalize_skew",
+		"optimizer_plan_id",
+		"optimizer_print_expression_properties",
+		"optimizer_print_group_properties",
+		"optimizer_print_job_scheduler",
+		"optimizer_print_memo_after_exploration",
+		"optimizer_print_memo_after_implementation",
+		"optimizer_print_memo_after_optimization",
+		"optimizer_print_missing_stats",
+		"optimizer_print_optimization_context",
+		"optimizer_print_optimization_stats",
+		"optimizer_print_plan",
+		"optimizer_print_query",
+		"optimizer_print_xform",
+		"optimizer_print_xform_results",
+		"optimizer_prune_computed_columns",
+		"optimizer_push_group_by_below_setop_threshold",
+		"optimizer_push_requirements_from_consumer_to_producer",
+		"optimizer_remove_order_below_dml",
 		"optimizer_replicated_table_insert",
+		"optimizer_sample_plans",
+		"optimizer_samples_number",
+		"optimizer_search_strategy_path",
+		"optimizer_segments",
+		"optimizer_skew_factor",
+		"optimizer_sort_factor",
+		"optimizer_trace_fallback",
+		"optimizer_use_external_constant_expression_evaluation_for_ints",
+		"optimizer_use_gpdb_allocators",
+		"optimizer_xform_bind_threshold",
 		"parallel_leader_participation",
 		"parallel_setup_cost",
 		"parallel_tuple_cost",

From 3c4665927f74b875fd41467622a62b65abe7e005 Mon Sep 17 00:00:00 2001
From: Roman Eskin <r.eskin@arenadata.io>
Date: Wed, 5 Feb 2025 17:16:49 +1000
Subject: [PATCH 17/17] Partial revert "Decouple Orca from Explain component"
 (#1208)

This partially reverts commit bf2cc5abaa2a35f77b489a87e0c35c2f7f5d220a.

Only changes in 'PlannedStmt' structure are reverted. It is done to preserve
binary compatibility, as 'PlannedStmt' is used widely across various extensions.
---
 .abi-check/7.2.0_arenadata7/postgres.types.ignore |  1 -
 .../gpopt/translate/CTranslatorDXLToPlStmt.cpp    |  2 +-
 src/backend/commands/explain.c                    |  4 ++--
 src/backend/nodes/copyfuncs.c                     |  2 +-
 src/backend/nodes/outfuncs.c                      |  2 +-
 src/backend/nodes/readfuncs.c                     |  2 +-
 src/include/nodes/plannodes.h                     | 15 ++++++++-------
 7 files changed, 14 insertions(+), 14 deletions(-)
 delete mode 100644 .abi-check/7.2.0_arenadata7/postgres.types.ignore

diff --git a/.abi-check/7.2.0_arenadata7/postgres.types.ignore b/.abi-check/7.2.0_arenadata7/postgres.types.ignore
deleted file mode 100644
index 68428bc6a3b6..000000000000
--- a/.abi-check/7.2.0_arenadata7/postgres.types.ignore
+++ /dev/null
@@ -1 +0,0 @@
-struct PlannedStmt
diff --git a/gpcontrib/orca/gpopt/translate/CTranslatorDXLToPlStmt.cpp b/gpcontrib/orca/gpopt/translate/CTranslatorDXLToPlStmt.cpp
index a873c71c45b5..e8c514060e79 100644
--- a/gpcontrib/orca/gpopt/translate/CTranslatorDXLToPlStmt.cpp
+++ b/gpcontrib/orca/gpopt/translate/CTranslatorDXLToPlStmt.cpp
@@ -219,7 +219,7 @@ CTranslatorDXLToPlStmt::GetPlannedStmtFromDXL(const CDXLNode *dxlnode,
 
 	// assemble planned stmt
 	PlannedStmt *planned_stmt = MakeNode(PlannedStmt);
-	planned_stmt->plannerName = "GPORCA";
+	planned_stmt->planGen = PLANGEN_OPTIMIZER;
 
 	planned_stmt->rtable = m_dxl_to_plstmt_context->GetRTableEntriesList();
 	planned_stmt->subplans = m_dxl_to_plstmt_context->GetSubplanEntriesList();
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
index 8e6ef25d949a..922f64e863ce 100644
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@ -889,10 +889,10 @@ ExplainPrintPlan(ExplainState *es, QueryDesc *queryDesc)
 	 * If requested, include information about GUC parameters with values that
 	 * don't match the built-in defaults.
 	 */
-	if (queryDesc->plannedstmt->plannerName == NULL)
+	if (queryDesc->plannedstmt->planGen == PLANGEN_PLANNER)
 		ExplainPropertyStringInfo("Optimizer", es, "Postgres-based planner");
 	else
-		ExplainPropertyStringInfo("Optimizer", es, "%s", queryDesc->plannedstmt->plannerName);
+		ExplainPropertyStringInfo("Optimizer", es, "GPORCA");
 
 	ExplainPrintSettings(es);
 }
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index fd52b2037526..795a93e89a10 100644
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -103,6 +103,7 @@ _copyPlannedStmt(const PlannedStmt *from)
 	PlannedStmt *newnode = makeNode(PlannedStmt);
 
 	COPY_SCALAR_FIELD(commandType);
+	COPY_SCALAR_FIELD(planGen);
 	COPY_SCALAR_FIELD(queryId);
 	COPY_SCALAR_FIELD(hasReturning);
 	COPY_SCALAR_FIELD(hasModifyingCTE);
@@ -150,7 +151,6 @@ _copyPlannedStmt(const PlannedStmt *from)
 	COPY_NODE_FIELD(copyIntoClause);
 	COPY_NODE_FIELD(refreshClause);
 	COPY_SCALAR_FIELD(metricsQueryType);
-	COPY_STRING_FIELD(plannerName);
 
 	return newnode;
 }
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 88e2b9629b5c..7b242b35bbe5 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -338,6 +338,7 @@ _outPlannedStmt(StringInfo str, const PlannedStmt *node)
 	WRITE_NODE_TYPE("PLANNEDSTMT");
 
 	WRITE_ENUM_FIELD(commandType, CmdType);
+	WRITE_ENUM_FIELD(planGen, PlanGenerator);
 	WRITE_UINT64_FIELD(queryId);
 	WRITE_BOOL_FIELD(hasReturning);
 	WRITE_BOOL_FIELD(hasModifyingCTE);
@@ -392,7 +393,6 @@ _outPlannedStmt(StringInfo str, const PlannedStmt *node)
 	WRITE_NODE_FIELD(copyIntoClause);
 	WRITE_NODE_FIELD(refreshClause);
 	WRITE_INT_FIELD(metricsQueryType);
-	WRITE_STRING_FIELD(plannerName);
 }
 
 
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index 3a44cc7080a0..109155faff9b 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -2408,6 +2408,7 @@ _readPlannedStmt(void)
 	READ_LOCALS(PlannedStmt);
 
 	READ_ENUM_FIELD(commandType, CmdType);
+	READ_ENUM_FIELD(planGen, PlanGenerator);
 	READ_UINT64_FIELD(queryId);
 	READ_BOOL_FIELD(hasReturning);
 	READ_BOOL_FIELD(hasModifyingCTE);
@@ -2460,7 +2461,6 @@ _readPlannedStmt(void)
 	READ_NODE_FIELD(copyIntoClause);
 	READ_NODE_FIELD(refreshClause);
 	READ_INT_FIELD(metricsQueryType);
-	READ_STRING_FIELD(plannerName);
 
 	READ_DONE();
 }
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index bd016fac263a..073c29cd363e 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -40,6 +40,12 @@ typedef struct DirectDispatchInfo
 	bool		haveProcessedAnyCalculations;
 } DirectDispatchInfo;
 
+typedef enum PlanGenerator
+{
+	PLANGEN_PLANNER,			/* plan produced by the planner*/
+	PLANGEN_OPTIMIZER,			/* plan produced by the optimizer*/
+} PlanGenerator;
+
 /* DML Actions */
 typedef enum DMLAction
 {
@@ -70,6 +76,8 @@ typedef struct PlannedStmt
 
 	CmdType		commandType;	/* select|insert|update|delete|utility */
 
+	PlanGenerator	planGen;		/* optimizer generation */
+
 	uint64		queryId;		/* query identifier (copied from Query) */
 
 	bool		hasReturning;	/* is it insert|update|delete RETURNING? */
@@ -148,13 +156,6 @@ typedef struct PlannedStmt
  	 * GPDB: whether a query is a SPI inner query for extension usage 
  	 */
 	int8		metricsQueryType;
-
-	/*
-	 * If the plan is done by an extension, the field below should contain
-	 * the name of the extension planner. Should be NULL if planning is done
-	 * by Postgres planner.
-	 */
-	const char	*plannerName;
 } PlannedStmt;
 
 /*