From 0a1a5248c7b7c2c9016358ff6528d25d630bfd33 Mon Sep 17 00:00:00 2001 From: Mikhail Surin Date: Tue, 18 Feb 2025 11:50:41 +0300 Subject: [PATCH] enable metering by default (#14615) --- ydb/core/kqp/executer_actor/kqp_tasks_graph.cpp | 2 +- ydb/core/kqp/ut/opt/kqp_ne_ut.cpp | 1 - ydb/library/yql/dq/proto/dq_tasks.proto | 2 +- ydb/library/yql/dq/runtime/dq_tasks_runner.h | 2 +- 4 files changed, 3 insertions(+), 4 deletions(-) diff --git a/ydb/core/kqp/executer_actor/kqp_tasks_graph.cpp b/ydb/core/kqp/executer_actor/kqp_tasks_graph.cpp index 9f69322f2206..32f854c5771f 100644 --- a/ydb/core/kqp/executer_actor/kqp_tasks_graph.cpp +++ b/ydb/core/kqp/executer_actor/kqp_tasks_graph.cpp @@ -1245,7 +1245,7 @@ void SerializeTaskToProto( SerializeCtxToMap(*tasksGraph.GetMeta().UserRequestContext, *result->MutableRequestContext()); - result->SetEnableMetering(enableMetering); + result->SetDisableMetering(!enableMetering); FillTaskMeta(stageInfo, task, *result); } diff --git a/ydb/core/kqp/ut/opt/kqp_ne_ut.cpp b/ydb/core/kqp/ut/opt/kqp_ne_ut.cpp index 58398038fe5d..a0dc58429b18 100644 --- a/ydb/core/kqp/ut/opt/kqp_ne_ut.cpp +++ b/ydb/core/kqp/ut/opt/kqp_ne_ut.cpp @@ -4261,7 +4261,6 @@ Y_UNIT_TEST_SUITE(KqpNewEngine) { CompareYson(R"([[[1u];[2u]];[[2u];[2u]]])", FormatResultSetYson(result.GetResultSet(0))); } - Y_UNIT_TEST(FullScanCount) { TKikimrSettings settings; NKikimrConfig::TAppConfig appConfig; diff --git a/ydb/library/yql/dq/proto/dq_tasks.proto b/ydb/library/yql/dq/proto/dq_tasks.proto index 41c1dbc9df6a..c3eb74e5d15c 100644 --- a/ydb/library/yql/dq/proto/dq_tasks.proto +++ b/ydb/library/yql/dq/proto/dq_tasks.proto @@ -210,5 +210,5 @@ message TDqTask { map RequestContext = 18; optional bool EnableSpilling = 19; optional uint32 ArrayBufferMinFillPercentage = 20; - optional bool EnableMetering = 21; + optional bool DisableMetering = 22; } diff --git a/ydb/library/yql/dq/runtime/dq_tasks_runner.h b/ydb/library/yql/dq/runtime/dq_tasks_runner.h index 887b3bbc42de..74679f7e51ae 100644 --- a/ydb/library/yql/dq/runtime/dq_tasks_runner.h +++ b/ydb/library/yql/dq/runtime/dq_tasks_runner.h @@ -323,7 +323,7 @@ class TDqTaskSettings { } bool EnableMetering() const { - return Task_->GetEnableMetering(); + return !Task_->GetDisableMetering(); } ui64 GetStageId() const {