diff options
author | Alexey Ozeritskiy <[email protected]> | 2022-06-10 07:42:09 +0300 |
---|---|---|
committer | Alexey Ozeritskiy <[email protected]> | 2022-06-10 07:42:09 +0300 |
commit | c8103e6df850cb8ea0d035aab3c248f83106e88a (patch) | |
tree | dec113b5f4bbfb9fb487633148a4020e7c0dabe3 | |
parent | 2c6785d31f5d3a356e1d593b3e7020459b0a3589 (diff) |
YQL-14386: Set ChunkSizeLimit to 128Mb
ref:18cb02100ea93754da5d7160075a74cf75ccca96
3 files changed, 8 insertions, 2 deletions
diff --git a/ydb/library/yql/providers/dq/common/yql_dq_settings.cpp b/ydb/library/yql/providers/dq/common/yql_dq_settings.cpp index 4a5af653e02..0cfedf42d2b 100644 --- a/ydb/library/yql/providers/dq/common/yql_dq_settings.cpp +++ b/ydb/library/yql/providers/dq/common/yql_dq_settings.cpp @@ -23,6 +23,7 @@ TDqConfiguration::TDqConfiguration() { REGISTER_SETTING(*this, OptLLVM); REGISTER_SETTING(*this, ChannelBufferSize); REGISTER_SETTING(*this, OutputChunkMaxSize); + REGISTER_SETTING(*this, ChunkSizeLimit); REGISTER_SETTING(*this, MemoryLimit); REGISTER_SETTING(*this, EnableInsert); diff --git a/ydb/library/yql/providers/dq/common/yql_dq_settings.h b/ydb/library/yql/providers/dq/common/yql_dq_settings.h index e357bd0f8e2..facb9756fff 100644 --- a/ydb/library/yql/providers/dq/common/yql_dq_settings.h +++ b/ydb/library/yql/providers/dq/common/yql_dq_settings.h @@ -25,6 +25,9 @@ struct TDqSettings { static constexpr ui64 LiteralTimeout = 60000; // 1 minutes static constexpr ui64 TableTimeout = 600000; // 10 minutes static constexpr ui32 CloudFunctionConcurrency = 10; + static constexpr ui64 ChannelBufferSize = 2000_MB; + static constexpr ui64 OutputChunkMaxSize = 4_MB; + static constexpr ui64 ChunkSizeLimit = 128_MB; }; using TPtr = std::shared_ptr<TDqSettings>; @@ -49,6 +52,7 @@ struct TDqSettings { NCommon::TConfSetting<TString, false> OptLLVM; NCommon::TConfSetting<ui64, false> ChannelBufferSize; NCommon::TConfSetting<ui64, false> OutputChunkMaxSize; + NCommon::TConfSetting<ui64, false> ChunkSizeLimit; NCommon::TConfSetting<NSize::TSize, false> MemoryLimit; NCommon::TConfSetting<ui64, false> _LiteralTimeout; NCommon::TConfSetting<ui64, false> _TableTimeout; diff --git a/ydb/library/yql/providers/dq/runtime/task_command_executor.cpp b/ydb/library/yql/providers/dq/runtime/task_command_executor.cpp index 1d8fd7a28a7..e7b9a2c6cb9 100644 --- a/ydb/library/yql/providers/dq/runtime/task_command_executor.cpp +++ b/ydb/library/yql/providers/dq/runtime/task_command_executor.cpp @@ -759,8 +759,9 @@ public: QueryStat.Measure<void>("Prepare", [&]() { NDq::TDqTaskRunnerMemoryLimits limits; - limits.ChannelBufferSize = DqConfiguration->ChannelBufferSize.Get().GetOrElse(2000_MB); - limits.OutputChunkMaxSize = DqConfiguration->OutputChunkMaxSize.Get().GetOrElse(4_MB); + limits.ChannelBufferSize = DqConfiguration->ChannelBufferSize.Get().GetOrElse(TDqSettings::TDefault::ChannelBufferSize); + limits.OutputChunkMaxSize = DqConfiguration->OutputChunkMaxSize.Get().GetOrElse(TDqSettings::TDefault::OutputChunkMaxSize); + limits.ChunkSizeLimit = DqConfiguration->ChunkSizeLimit.Get().GetOrElse(TDqSettings::TDefault::ChunkSizeLimit); Runner->Prepare(task, limits); }); |