Added a flag to disable SimplifiedPlan generation that caused compilation slowdown (ydb-platform#9482)

Author: pavelvelikhov

ydb/core/kqp/compile_service/kqp_compile_actor.cpp

@@ -611,6 +611,7 @@ void ApplyServiceConfig(TKikimrConfiguration& kqpConfig, const TTableServiceConf
     kqpConfig.IdxLookupJoinsPrefixPointLimit = serviceConfig.GetIdxLookupJoinPointsLimit();
     kqpConfig.OldLookupJoinBehaviour = serviceConfig.GetOldLookupJoinBehaviour();
     kqpConfig.EnableSpillingGenericQuery = serviceConfig.GetEnableQueryServiceSpilling();
+    kqpConfig.DisableSimplifiedPlans = serviceConfig.GetDisableSimplifiedPlans();
 
     if (const auto limit = serviceConfig.GetResourceManager().GetMkqlHeavyProgramMemoryLimit()) {
         kqpConfig._KqpYqlCombinerMemoryLimit = std::max(1_GB, limit - (limit >> 2U));

ydb/core/kqp/compile_service/kqp_compile_service.cpp

@@ -537,6 +537,8 @@ class TKqpCompileService : public TActorBootstrapped<TKqpCompileService> {
 
         bool enableQueryServiceSpilling = TableServiceConfig.GetEnableQueryServiceSpilling();
 
+        bool disableSimplifiedPlans = TableServiceConfig.GetDisableSimplifiedPlans();
+
         TableServiceConfig.Swap(event.MutableConfig()->MutableTableServiceConfig());
         LOG_INFO(*TlsActivationContext, NKikimrServices::KQP_COMPILE_SERVICE, "Updated config");
 
@@ -564,7 +566,8 @@ class TKqpCompileService : public TActorBootstrapped<TKqpCompileService> {
             TableServiceConfig.GetResourceManager().GetMkqlHeavyProgramMemoryLimit() != mkqlHeavyLimit ||
             TableServiceConfig.GetIdxLookupJoinPointsLimit() != idxLookupPointsLimit ||
             TableServiceConfig.GetEnableQueryServiceSpilling() != enableQueryServiceSpilling ||
-            TableServiceConfig.GetEnableImplicitQueryParameterTypes() != enableImplicitQueryParameterTypes) {
+            TableServiceConfig.GetEnableImplicitQueryParameterTypes() != enableImplicitQueryParameterTypes ||
+            TableServiceConfig.GetDisableSimplifiedPlans() != disableSimplifiedPlans) {
 
             QueryCache.Clear();
 

ydb/core/kqp/opt/kqp_query_plan.cpp

@@ -2304,7 +2304,12 @@ TString SerializeTxPlans(const TVector<const TString>& txPlans, TIntrusivePtr<NO
     writer.EndObject();
 
     auto resultPlan =  writer.Str();
-    return AddSimplifiedPlan(resultPlan, optCtx, false);
+    if (!optCtx || optCtx->Config->DisableSimplifiedPlans) {
+        return resultPlan;
+    }
+    else {
+        return AddSimplifiedPlan(resultPlan, optCtx, false);
+    }
 }
 
 } // namespace
@@ -2700,7 +2705,12 @@ TString AddExecStatsToTxPlan(const TString& txPlanJson, const NYql::NDqProto::TD
     NJsonWriter::TBuf txWriter;
     txWriter.WriteJsonValue(&root, true);
     auto resultPlan = txWriter.Str();
-    return AddSimplifiedPlan(resultPlan, optCtx, true);
+    if (!optCtx || optCtx->Config->DisableSimplifiedPlans) {
+        return resultPlan;
+    }
+    else {
+        return AddSimplifiedPlan(resultPlan, optCtx, true);
+    }
 }
 
 TString AddExecStatsToTxPlan(const TString& txPlanJson, const NYql::NDqProto::TDqExecutionStats& stats) {

ydb/core/kqp/provider/yql_kikimr_settings.h

@@ -169,6 +169,7 @@ struct TKikimrConfiguration : public TKikimrSettings, public NCommon::TSettingDi
     bool EnableOltpSink = false;
     NKikimrConfig::TTableServiceConfig_EBlockChannelsMode BlockChannelsMode;
     bool EnableSpillingGenericQuery = false;
+    bool DisableSimplifiedPlans = false;
 };
 
 }

ydb/core/protos/table_service_config.proto

@@ -304,4 +304,7 @@ message TTableServiceConfig {
     optional bool EnableQueryServiceSpilling = 63 [ default = true ];
 
     optional bool EnableImplicitQueryParameterTypes = 66 [ default = false ];
+
+    optional bool DisableSimplifiedPlans = 67 [ default = false ];
+
 };