ORCA: Support create plan in singlenode mode

Author: jiaqizho

.asf.yaml

@@ -96,7 +96,8 @@ github:
           - pax-ic-isolation2-opt-off
           - pax-ic-isolation2-opt-on
           - ic-expandshrink
-          - ic-singlenode
+          - ic-singlenode-opt-off
+          - ic-singlenode-opt-on
           - ic-resgroup-v2
           - ic-contrib
           - ic-gpcontrib

.github/workflows/build-cloudberry.yml

@@ -269,10 +269,22 @@ jobs:
               {"test":"ic-expandshrink",
                "make_configs":["src/test/isolation2:installcheck-expandshrink"]
               },
-              {"test":"ic-singlenode",
+              {"test":"ic-singlenode-opt-off",
                "make_configs":["src/test/isolation:installcheck-singlenode",
                                "src/test/singlenode_regress:installcheck-singlenode",
                                "src/test/singlenode_isolation2:installcheck-singlenode"],
+                "pg_settings":{
+                 "optimizer":"off",
+                },
+               "num_primary_mirror_pairs":0
+              },
+              {"test":"ic-singlenode-opt-on",
+               "make_configs":["src/test/isolation:installcheck-singlenode",
+                               "src/test/singlenode_regress:installcheck-singlenode",
+                               "src/test/singlenode_isolation2:installcheck-singlenode"],
+                "pg_settings":{
+                 "optimizer":"on",
+                },
                "num_primary_mirror_pairs":0
               },
               {"test":"ic-resgroup-v2",

src/backend/gpopt/config/CConfigParamMapping.cpp

@@ -15,7 +15,7 @@
 
 extern "C" {
 #include "postgres.h"
-
+#include "cdb/cdbvars.h"
 #include "utils/guc.h"
 }
 
@@ -379,6 +379,10 @@ CConfigParamMapping::PackConfigParamInBitset(
 		}
 	}
 
+	if (IS_SINGLENODE()) {
+		traceflag_bitset->ExchangeSet(EopttraceSingleNodeMode);
+	}
+
 	if (!optimizer_enable_nljoin)
 	{
 		CBitSet *nl_join_bitset = CXform::PbsNLJoinXforms(mp);

src/backend/gpopt/translate/CTranslatorUtils.cpp

@@ -150,6 +150,7 @@ CTranslatorUtils::GetTableDescr(CMemoryPool *mp, CMDAccessor *md_accessor,
 	}
 	else if (IMDRelation::ErelstorageForeign != rel->RetrieveRelStorageType() &&
 			 !optimizer_enable_master_only_queries &&
+			 !GPOS_FTRACE(EopttraceSingleNodeMode) &&
 			 (IMDRelation::EreldistrMasterOnly == distribution_policy))
 	{
 		// fall back to the planner for queries on master-only table if they are disabled with Orca. This is due to

src/backend/gpopt/utils/COptTasks.cpp

@@ -953,10 +953,9 @@ COptTasks::OptimizeTask(void *ptr)
 				query_to_dxl_translator->GetCTEs();
 			GPOS_ASSERT(nullptr != query_output_dxlnode_array);
 
-			BOOL is_master_only =
-				!optimizer_enable_motions ||
-				(!optimizer_enable_motions_masteronly_queries &&
-				 !query_to_dxl_translator->HasDistributedTables());
+			BOOL is_master_only = !GPOS_FTRACE(EopttraceDisableMotions) || 
+				GPOS_FTRACE(EopttraceSingleNodeMode) || 
+				!query_to_dxl_translator->HasDistributedTables();
 			// See NoteDistributionPolicyOpclasses() in src/backend/gpopt/translate/CTranslatorQueryToDXL.cpp
 			BOOL use_legacy_opfamilies =
 				(query_to_dxl_translator->GetDistributionHashOpsKind() ==

src/backend/gporca/libnaucrates/include/naucrates/traceflags/traceflags.h

@@ -83,6 +83,9 @@ enum EOptTraceFlag
 	// print debug info of CTE
 	EopttraceDebugCTE = 101020,
 
+	// Is singlenode
+	EopttraceSingleNodeMode = 101021,
+
 	///////////////////////////////////////////////////////
 	////////////////// transformations flags //////////////
 	///////////////////////////////////////////////////////

src/backend/optimizer/plan/planner.c

@@ -373,7 +373,7 @@ standard_planner(Query *parse, const char *query_string, int cursorOptions,
 	 * PARALLEL RETRIEVE CURSOR is not supported by ORCA yet.
 	 */
 	if (optimizer &&
-		GP_ROLE_DISPATCH == Gp_role &&
+		IS_QD_OR_SINGLENODE() &&
 		IS_QUERY_DISPATCHER() &&
 		(cursorOptions & CURSOR_OPT_SKIP_FOREIGN_PARTITIONS) == 0 &&
 		(cursorOptions & CURSOR_OPT_PARALLEL_RETRIEVE) == 0)

src/backend/utils/misc/guc_gp.c

@@ -322,7 +322,6 @@ 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_masteronly_queries;
 bool		optimizer_enable_motions;
 bool		optimizer_enable_motion_broadcast;
 bool		optimizer_enable_motion_gather;
@@ -2175,16 +2174,6 @@ struct config_bool ConfigureNamesBool_gp[] =
 		true,
 		NULL, NULL, NULL
 	},
-	{
-		{"optimizer_enable_motions_masteronly_queries", PGC_USERSET, DEVELOPER_OPTIONS,
-			gettext_noop("Enable plans with Motion operators in the optimizer for queries with no distributed tables."),
-			NULL,
-			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
-		},
-		&optimizer_enable_motions_masteronly_queries,
-		false,
-		NULL, NULL, NULL
-	},
 	{
 		{"optimizer_enable_motions", PGC_USERSET, DEVELOPER_OPTIONS,
 			gettext_noop("Enable plans with Motion operators in the optimizer."),

src/include/utils/guc.h

@@ -501,7 +501,6 @@ 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_masteronly_queries;
 extern bool optimizer_enable_motions;
 extern bool optimizer_enable_motion_broadcast;
 extern bool optimizer_enable_motion_gather;

src/include/utils/unsync_guc_name.h

@@ -420,7 +420,6 @@
 		"optimizer_enable_motion_gather",
 		"optimizer_enable_motion_redistribute",
 		"optimizer_enable_motions",
-		"optimizer_enable_motions_masteronly_queries",
 		"optimizer_enable_multiple_distinct_aggs",
 		"optimizer_enable_nljoin",
 		"optimizer_enable_outerjoin_rewrite",