disable spilling (#15605)

Author: lll-phill-lll

ydb/core/kqp/compile_service/kqp_compile_actor.cpp

@@ -651,6 +651,7 @@ void ApplyServiceConfig(TKikimrConfiguration& kqpConfig, const TTableServiceConf
     kqpConfig.EnableConstantFolding = serviceConfig.GetEnableConstantFolding();
     kqpConfig.SetDefaultEnabledSpillingNodes(serviceConfig.GetEnableSpillingNodes());
     kqpConfig.EnableSnapshotIsolationRW = serviceConfig.GetEnableSnapshotIsolationRW();
+    kqpConfig.EnableSpilling = serviceConfig.GetEnableQueryServiceSpilling();
 
     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

@@ -311,6 +311,7 @@ class TKqpCompileService : public TActorBootstrapped<TKqpCompileService> {
         bool enableConstantFolding = TableServiceConfig.GetEnableConstantFolding();
 
         TString enableSpillingNodes = TableServiceConfig.GetEnableSpillingNodes();
+        bool enableSpilling = TableServiceConfig.GetEnableQueryServiceSpilling();
 
         bool enableSnapshotIsolationRW = TableServiceConfig.GetEnableSnapshotIsolationRW();
 
@@ -343,7 +344,8 @@ class TKqpCompileService : public TActorBootstrapped<TKqpCompileService> {
             TableServiceConfig.GetEnableImplicitQueryParameterTypes() != enableImplicitQueryParameterTypes ||
             TableServiceConfig.GetEnablePgConstsToParams() != enablePgConstsToParams ||
             TableServiceConfig.GetEnablePerStatementQueryExecution() != enablePerStatementQueryExecution ||
-            TableServiceConfig.GetEnableSnapshotIsolationRW() != enableSnapshotIsolationRW) {
+            TableServiceConfig.GetEnableSnapshotIsolationRW() != enableSnapshotIsolationRW ||
+            TableServiceConfig.GetEnableQueryServiceSpilling() != enableSpilling) {
 
             QueryCache->Clear();
 

ydb/core/kqp/ut/join/data/join_order/tpcds78_1000s.json

@@ -19,14 +19,8 @@
                           "table":"test\/ds\/store_sales"
                         },
                         {
-                          "op_name":"Union",
-                          "args":
-                            [
-                              {
-                                "op_name":"TableFullScan",
-                                "table":"test\/ds\/date_dim"
-                              }
-                            ]
+                          "op_name":"TableFullScan",
+                          "table":"test\/ds\/date_dim"
                         }
                       ]
                   },
@@ -55,14 +49,8 @@
                       ]
                   },
                   {
-                    "op_name":"Union",
-                    "args":
-                      [
-                        {
-                          "op_name":"TableFullScan",
-                          "table":"test\/ds\/date_dim"
-                        }
-                      ]
+                    "op_name":"TableFullScan",
+                    "table":"test\/ds\/date_dim"
                   }
                 ]
             }
@@ -87,14 +75,8 @@
                 ]
             },
             {
-              "op_name":"Union",
-              "args":
-                [
-                  {
-                    "op_name":"TableFullScan",
-                    "table":"test\/ds\/date_dim"
-                  }
-                ]
+              "op_name":"TableFullScan",
+              "table":"test\/ds\/date_dim"
             }
           ]
       }

ydb/core/kqp/ut/spilling/kqp_scan_spilling_ut.cpp

@@ -17,7 +17,10 @@ namespace {
 NKikimrConfig::TAppConfig AppCfg() {
     NKikimrConfig::TAppConfig appCfg;
 
-    auto* rm = appCfg.MutableTableServiceConfig()->MutableResourceManager();
+    auto* ts = appCfg.MutableTableServiceConfig();
+    ts->SetEnableQueryServiceSpilling(true);
+
+    auto* rm = ts->MutableResourceManager();
     rm->SetChannelBufferSize(50);
     rm->SetMinChannelBufferSize(50);
     rm->SetMkqlLightProgramMemoryLimit(100 << 20);
@@ -33,12 +36,16 @@ NKikimrConfig::TAppConfig AppCfg() {
 NKikimrConfig::TAppConfig AppCfgLowComputeLimits(double reasonableTreshold, bool enableSpilling=true, bool limitFileSize=false) {
     NKikimrConfig::TAppConfig appCfg;
 
-    auto* rm = appCfg.MutableTableServiceConfig()->MutableResourceManager();
+    auto* ts = appCfg.MutableTableServiceConfig();
+
+    ts->SetEnableQueryServiceSpilling(enableSpilling);
+
+    auto* rm = ts->MutableResourceManager();
     rm->SetMkqlLightProgramMemoryLimit(100);
     rm->SetMkqlHeavyProgramMemoryLimit(300);
     rm->SetSpillingPercent(reasonableTreshold);
 
-    auto* spilling = appCfg.MutableTableServiceConfig()->MutableSpillingServiceConfig()->MutableLocalFileConfig();
+    auto* spilling = ts->MutableSpillingServiceConfig()->MutableLocalFileConfig();
 
     spilling->SetEnable(enableSpilling);
     spilling->SetRoot("./spilling/");

ydb/core/protos/table_service_config.proto

@@ -304,7 +304,7 @@ message TTableServiceConfig {
 
     optional uint64 QueryReplayCacheUploadTTLSec = 62 [default = 36000];
 
-    optional bool EnableQueryServiceSpilling = 63 [ default = true ];
+    optional bool EnableQueryServiceSpilling = 63 [ default = false ];
 
     optional uint32 DefaultCostBasedOptimizationLevel = 64 [default = 2];