New GUC optimizer_prefer_scalar_dqa_multistage_agg, and bump gpos to 1.129

src/backend/gpopt/config/CConfigParamMapping.cpp

@@ -347,7 +347,15 @@ CConfigParamMapping::SConfigMappingElem CConfigParamMapping::m_elem[] =
 		&optimizer_prune_computed_columns,
 		true,  // m_fNegate
 		GPOS_WSZ_LIT("Prune unused computed columns when pre-processing query")
+		},
+
+		{
+		EopttracePreferScalarDQAMultiStageAgg,
+		&optimizer_prefer_scalar_dqa_multistage_agg,
+		false, // m_fNegate
+		GPOS_WSZ_LIT("Prefer multistage aggregates for scalar distinct qualified aggregate in the optimizer.")
 		}
+
 };
 
 //---------------------------------------------------------------------------

src/backend/utils/misc/guc_gp.c

@@ -570,6 +570,7 @@ bool		optimizer_enable_master_only_queries;
 bool		optimizer_multilevel_partitioning;
 bool		optimizer_enable_derive_stats_all_groups;
 bool		optimizer_explain_show_status;
+bool		optimizer_prefer_scalar_dqa_multistage_agg;
 
 /* Security */
 bool		gp_reject_internal_tcp_conn = true;
@@ -3398,6 +3399,16 @@ struct config_bool ConfigureNamesBool_gp[] =
 		false, NULL, NULL
 	},
 
+	{
+		{"optimizer_prefer_scalar_dqa_multistage_agg", PGC_USERSET, DEVELOPER_OPTIONS,
+			gettext_noop("Prefer multistage aggregates for scalar distinct qualified aggregate in the optimizer."),
+			NULL,
+			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
+		},
+		&optimizer_prefer_scalar_dqa_multistage_agg,
+		true, NULL, NULL
+	},
+
 	/* End-of-list marker */
 	{
 		{NULL, 0, 0, NULL, NULL}, NULL, false, NULL, NULL

src/include/utils/guc.h

@@ -448,6 +448,7 @@ extern bool optimizer_enable_master_only_queries;
 extern bool optimizer_multilevel_partitioning;
 extern bool optimizer_enable_derive_stats_all_groups;
 extern bool optimizer_explain_show_status;
+extern bool optimizer_prefer_scalar_dqa_multistage_agg;
 
 /**
  * Enable logging of DPE match in optimizer.