From 5c4df0448719e73932e2452f0552abc1f9f286f8 Mon Sep 17 00:00:00 2001 From: Vitalii Gridnev Date: Fri, 18 Oct 2024 00:49:29 +0300 Subject: [PATCH 1/2] fixes applied to spilling enable --- ydb/core/kqp/opt/kqp_opt_build_txs.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ydb/core/kqp/opt/kqp_opt_build_txs.cpp b/ydb/core/kqp/opt/kqp_opt_build_txs.cpp index f15d85253640..95e276543040 100644 --- a/ydb/core/kqp/opt/kqp_opt_build_txs.cpp +++ b/ydb/core/kqp/opt/kqp_opt_build_txs.cpp @@ -495,16 +495,14 @@ class TKqpBuildTxsTransformer : public TSyncTransformerBase { { BuildTxTransformer = new TKqpBuildTxTransformer(); - const bool enableSpillingGenericQuery = - kqpCtx->IsGenericQuery() && config->SpillingEnabled() && - config->EnableSpillingGenericQuery; + config->EnableSpillingGenericQuery &= (kqpCtx->IsGenericQuery() && config->SpillingEnabled()); DataTxTransformer = TTransformationPipeline(&typesCtx) .AddServiceTransformers() .Add(TExprLogTransformer::Sync("TxOpt", NYql::NLog::EComponent::ProviderKqp, NYql::NLog::ELevel::TRACE), "TxOpt") .Add(*TypeAnnTransformer, "TypeAnnotation") .AddPostTypeAnnotation(/* forSubgraph */ true) - .Add(CreateKqpBuildPhyStagesTransformer(enableSpillingGenericQuery, typesCtx, config->BlockChannelsMode), "BuildPhysicalStages") + .Add(CreateKqpBuildPhyStagesTransformer(config->EnableSpillingGenericQuery, typesCtx, config->BlockChannelsMode), "BuildPhysicalStages") // TODO(ilezhankin): "BuildWideBlockChannels" transformer is required only for BLOCK_CHANNELS_FORCE mode. .Add(CreateKqpBuildWideBlockChannelsTransformer(typesCtx, config->BlockChannelsMode), "BuildWideBlockChannels") .Add(*BuildTxTransformer, "BuildPhysicalTx") From af0f6fb9903a6169ac7d3bae3e84ae19ba1d2ecc Mon Sep 17 00:00:00 2001 From: Vitalii Gridnev Date: Fri, 18 Oct 2024 00:53:42 +0300 Subject: [PATCH 2/2] disable spilling --- ydb/core/protos/table_service_config.proto | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ydb/core/protos/table_service_config.proto b/ydb/core/protos/table_service_config.proto index afa136bbf5f1..190a2b350987 100644 --- a/ydb/core/protos/table_service_config.proto +++ b/ydb/core/protos/table_service_config.proto @@ -55,7 +55,7 @@ message TTableServiceConfig { message TSpillingServiceConfig { message TLocalFileConfig { - optional bool Enable = 1 [default = true]; + optional bool Enable = 1 [default = false]; optional string Root = 2 [default = ""]; optional uint64 MaxTotalSize = 3 [default = 21474836480]; // 20 GiB optional uint64 MaxFileSize = 4 [default = 5368709120]; // 5 GiB @@ -309,7 +309,7 @@ message TTableServiceConfig { optional bool EnableImplicitQueryParameterTypes = 66 [ default = false ]; - optional string EnableSpillingNodes = 67 [ default = "All" ]; + optional string EnableSpillingNodes = 67 [ default = "None" ]; message TComputeSchedulerSettings { optional uint64 AdvanceTimeIntervalUsec = 1 [default = 50000];