Skip to content

Commit e028994

Browse files
shnikdshnikd
authored
Merge cc58b9a into 1e172ec 
2 parents 1e172ec + cc58b9a commit e028994

File tree

26 files changed

+280
-55
lines changed

26 files changed

+280
-55
lines changed

‎ydb/core/grpc_services/query/rpc_execute_query.cpp‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,25 @@ bool NeedReportAst(const Ydb::Query::ExecuteQueryRequest& req) {
175175
}
176176
}
177177

178+
bool NeedCollectDiagnostics(const Ydb::Query::ExecuteQueryRequest& req) {
179+
switch (req.exec_mode()) {
180+
case Ydb::Query::EXEC_MODE_EXPLAIN:
181+
return true;
182+
183+
case Ydb::Query::EXEC_MODE_EXECUTE:
184+
switch (req.stats_mode()) {
185+
case Ydb::Query::StatsMode::STATS_MODE_FULL:
186+
case Ydb::Query::StatsMode::STATS_MODE_PROFILE:
187+
return true;
188+
default:
189+
return false;
190+
}
191+
192+
default:
193+
return false;
194+
}
195+
}
196+
178197
class TExecuteQueryRPC : public TActorBootstrapped<TExecuteQueryRPC> {
179198
public:
180199
static constexpr NKikimrServices::TActivity::EType ActorActivityType() {
@@ -278,6 +297,8 @@ class TExecuteQueryRPC : public TActorBootstrapped<TExecuteQueryRPC> {
278297
settings,
279298
req->pool_id());
280299

300+
ev->Record.MutableRequest()->SetCollectDiagnostics(NeedCollectDiagnostics(*req));
301+
281302
if (!ctx.Send(NKqp::MakeKqpProxyID(ctx.SelfID.NodeId()), ev.Release(), 0, 0, Span_.GetTraceId())) {
282303
NYql::TIssues issues;
283304
issues.AddIssue(MakeIssue(NKikimrIssues::TIssuesIds::DEFAULT_ERROR, "Internal error"));
@@ -375,6 +396,9 @@ class TExecuteQueryRPC : public TActorBootstrapped<TExecuteQueryRPC> {
375396
if (NeedReportAst(*Request_->GetProtoRequest())) {
376397
response.mutable_exec_stats()->set_query_ast(kqpResponse.GetQueryAst());
377398
}
399+
if (NeedCollectDiagnostics(*Request_->GetProtoRequest())) {
400+
response.mutable_exec_stats()->set_query_diagnostics(kqpResponse.GetQueryDiagnostics());
401+
}
378402
}
379403

380404
if (record.GetYdbStatus() == Ydb::StatusIds::SUCCESS) {

‎ydb/core/grpc_services/rpc_execute_data_query.cpp‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,16 @@ using namespace Ydb;
2727
using namespace Ydb::Table;
2828
using namespace NKqp;
2929

30+
bool NeedCollectDiagnostics(const Ydb::Table::ExecuteDataQueryRequest& req) {
31+
switch (req.collect_stats()) {
32+
case Ydb::Table::QueryStatsCollection::STATS_COLLECTION_FULL:
33+
case Ydb::Table::QueryStatsCollection::STATS_COLLECTION_PROFILE:
34+
return true;
35+
default:
36+
return false;
37+
}
38+
}
39+
3040
using TEvExecuteDataQueryRequest = TGrpcRequestOperationCall<Ydb::Table::ExecuteDataQueryRequest,
3141
Ydb::Table::ExecuteDataQueryResponse>;
3242

@@ -146,6 +156,8 @@ class TExecuteDataQueryRPC : public TRpcKqpRequestActor<TExecuteDataQueryRPC, TE
146156
req->collect_stats(),
147157
req->has_query_cache_policy() ? &req->query_cache_policy() : nullptr,
148158
req->has_operation_params() ? &req->operation_params() : nullptr);
159+
160+
ev->Record.MutableRequest()->SetCollectDiagnostics(NeedCollectDiagnostics(*req));
149161

150162
ReportCostInfo_ = req->operation_params().report_cost_info() == Ydb::FeatureFlag::ENABLED;
151163

@@ -166,6 +178,7 @@ class TExecuteDataQueryRPC : public TRpcKqpRequestActor<TExecuteDataQueryRPC, TE
166178
if (from.HasQueryStats()) {
167179
FillQueryStats(*to->mutable_query_stats(), from);
168180
to->mutable_query_stats()->set_query_ast(from.GetQueryAst());
181+
to->mutable_query_stats()->set_query_diagnostics(from.GetQueryDiagnostics());
169182
return;
170183
}
171184
}

‎ydb/core/grpc_services/rpc_stream_execute_scan_query.cpp‎

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,27 @@ bool NeedReportPlan(const Ydb::Table::ExecuteScanQueryRequest& req) {
9393
}
9494
}
9595

96+
bool NeedCollectDiagnostics(const Ydb::Table::ExecuteScanQueryRequest& req) {
97+
switch (req.mode()) {
98+
case ExecuteScanQueryRequest_Mode_MODE_EXPLAIN:
99+
return true;
100+
101+
case ExecuteScanQueryRequest_Mode_MODE_EXEC:
102+
switch (req.collect_stats()) {
103+
case Ydb::Table::QueryStatsCollection::STATS_COLLECTION_FULL:
104+
case Ydb::Table::QueryStatsCollection::STATS_COLLECTION_PROFILE:
105+
return true;
106+
default:
107+
break;
108+
}
109+
110+
return false;
111+
112+
default:
113+
return false;
114+
}
115+
}
116+
96117
bool CheckRequest(const Ydb::Table::ExecuteScanQueryRequest& req, TParseRequestError& error)
97118
{
98119
switch (req.mode()) {
@@ -228,7 +249,7 @@ class TStreamExecuteScanQueryRPC : public TActorBootstrapped<TStreamExecuteScanQ
228249
nullptr
229250
);
230251

231-
ev->Record.MutableRequest()->SetCollectDiagnostics(req->Getcollect_full_diagnostics());
252+
ev->Record.MutableRequest()->SetCollectDiagnostics(NeedCollectDiagnostics(*req));
232253

233254
if (!ctx.Send(NKqp::MakeKqpProxyID(ctx.SelfID.NodeId()), ev.Release())) {
234255
NYql::TIssues issues;
@@ -291,6 +312,7 @@ class TStreamExecuteScanQueryRPC : public TActorBootstrapped<TStreamExecuteScanQ
291312

292313
bool reportStats = NeedReportStats(*Request_->GetProtoRequest());
293314
bool reportPlan = reportStats && NeedReportPlan(*Request_->GetProtoRequest());
315+
bool collectDiagnostics = NeedCollectDiagnostics(*Request_->GetProtoRequest());
294316

295317
if (reportStats) {
296318
if (kqpResponse.HasQueryStats()) {
@@ -308,7 +330,9 @@ class TStreamExecuteScanQueryRPC : public TActorBootstrapped<TStreamExecuteScanQ
308330
response.mutable_result()->mutable_query_stats()->set_query_ast(kqpResponse.GetQueryAst());
309331
}
310332

311-
response.mutable_result()->set_query_full_diagnostics(kqpResponse.GetQueryDiagnostics());
333+
if (collectDiagnostics) {
334+
response.mutable_result()->mutable_query_stats()->set_query_diagnostics(kqpResponse.GetQueryDiagnostics());
335+
}
312336

313337
Y_PROTOBUF_SUPPRESS_NODISCARD response.SerializeToString(&out);
314338
Request_->SendSerializedResult(std::move(out), record.GetYdbStatus());

‎ydb/core/kqp/common/compilation/events.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ namespace NKikimr::NKqp::NPrivateEvents {
1616

1717
struct TEvCompileRequest: public TEventLocal<TEvCompileRequest, TKqpEvents::EvCompileRequest> {
1818
TEvCompileRequest(const TIntrusiveConstPtr<NACLib::TUserToken>& userToken, const TString& clientAddress, const TMaybe<TString>& uid,
19-
TMaybe<TKqpQueryId>&& query, bool keepInCache, bool isQueryActionPrepare, bool perStatementResult, TInstant deadline,
19+
TMaybe<TKqpQueryId>&& query, bool keepInCache, NKikimrKqp::EQueryAction queryAction, bool perStatementResult, TInstant deadline,
2020
TKqpDbCountersPtr dbCounters, const TGUCSettings::TPtr& gUCSettings, const TMaybe<TString>& applicationName,
2121
std::shared_ptr<std::atomic<bool>> intrestedInResult, const TIntrusivePtr<TUserRequestContext>& userRequestContext, NLWTrace::TOrbit orbit = {},
2222
TKqpTempTablesState::TConstPtr tempTablesState = nullptr, bool collectDiagnostics = false, TMaybe<TQueryAst> queryAst = Nothing(),
@@ -26,7 +26,7 @@ struct TEvCompileRequest: public TEventLocal<TEvCompileRequest, TKqpEvents::EvCo
2626
, Uid(uid)
2727
, Query(std::move(query))
2828
, KeepInCache(keepInCache)
29-
, IsQueryActionPrepare(isQueryActionPrepare)
29+
, QueryAction(queryAction)
3030
, PerStatementResult(perStatementResult)
3131
, Deadline(deadline)
3232
, DbCounters(dbCounters)
@@ -50,7 +50,7 @@ struct TEvCompileRequest: public TEventLocal<TEvCompileRequest, TKqpEvents::EvCo
5050
TMaybe<TString> Uid;
5151
TMaybe<TKqpQueryId> Query;
5252
bool KeepInCache = false;
53-
bool IsQueryActionPrepare = false;
53+
NKikimrKqp::EQueryAction QueryAction;
5454
bool PerStatementResult = false;
5555
// it is allowed for local event to use absolute time (TInstant) instead of time interval (TDuration)
5656
TInstant Deadline;
@@ -76,7 +76,7 @@ struct TEvCompileRequest: public TEventLocal<TEvCompileRequest, TKqpEvents::EvCo
7676

7777
struct TEvRecompileRequest: public TEventLocal<TEvRecompileRequest, TKqpEvents::EvRecompileRequest> {
7878
TEvRecompileRequest(const TIntrusiveConstPtr<NACLib::TUserToken>& userToken, const TString& clientAddress, const TString& uid,
79-
const TMaybe<TKqpQueryId>& query, bool isQueryActionPrepare, TInstant deadline,
79+
const TMaybe<TKqpQueryId>& query, NKikimrKqp::EQueryAction queryAction, TInstant deadline,
8080
TKqpDbCountersPtr dbCounters, const TGUCSettings::TPtr& gUCSettings, const TMaybe<TString>& applicationName,
8181
std::shared_ptr<std::atomic<bool>> intrestedInResult, const TIntrusivePtr<TUserRequestContext>& userRequestContext,
8282
NLWTrace::TOrbit orbit = {}, TKqpTempTablesState::TConstPtr tempTablesState = nullptr, TMaybe<TQueryAst> queryAst = Nothing(),
@@ -85,7 +85,7 @@ struct TEvRecompileRequest: public TEventLocal<TEvRecompileRequest, TKqpEvents::
8585
, ClientAddress(clientAddress)
8686
, Uid(uid)
8787
, Query(query)
88-
, IsQueryActionPrepare(isQueryActionPrepare)
88+
, QueryAction(queryAction)
8989
, Deadline(deadline)
9090
, DbCounters(dbCounters)
9191
, GUCSettings(gUCSettings)
@@ -105,7 +105,7 @@ struct TEvRecompileRequest: public TEventLocal<TEvRecompileRequest, TKqpEvents::
105105
TString ClientAddress;
106106
TString Uid;
107107
TMaybe<TKqpQueryId> Query;
108-
bool IsQueryActionPrepare = false;
108+
NKikimrKqp::EQueryAction QueryAction;
109109

110110
TInstant Deadline;
111111
TKqpDbCountersPtr DbCounters;

‎ydb/core/kqp/common/events/query.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -282,7 +282,7 @@ struct TEvQueryRequest: public NActors::TEventLocal<TEvQueryRequest, TKqpEvents:
282282
}
283283

284284
bool GetCollectDiagnostics() const {
285-
return Record.GetRequest().GetCollectDiagnostics();
285+
return Record.MutableRequest()->GetCollectDiagnostics();
286286
}
287287

288288
ui32 CalculateSerializedSize() const override {

‎ydb/core/kqp/compile_service/kqp_compile_actor.cpp‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ class TKqpCompileActor : public TActorBootstrapped<TKqpCompileActor> {
5252
TKqpDbCountersPtr dbCounters, std::optional<TKqpFederatedQuerySetup> federatedQuerySetup,
5353
const TIntrusivePtr<TUserRequestContext>& userRequestContext,
5454
NWilson::TTraceId traceId, TKqpTempTablesState::TConstPtr tempTablesState, bool collectFullDiagnostics,
55-
bool perStatementResult,
55+
bool perStatementResult, NKikimrKqp::EQueryAction queryAction,
5656
ECompileActorAction compileAction, TMaybe<TQueryAst> queryAst,
5757
NYql::TExprContext* splitCtx,
5858
NYql::TExprNode::TPtr splitExpr)
@@ -75,6 +75,7 @@ class TKqpCompileActor : public TActorBootstrapped<TKqpCompileActor> {
7575
, CompileActorSpan(TWilsonKqp::CompileActor, std::move(traceId), "CompileActor")
7676
, TempTablesState(std::move(tempTablesState))
7777
, CollectFullDiagnostics(collectFullDiagnostics)
78+
, QueryAction(queryAction)
7879
, CompileAction(compileAction)
7980
, QueryAst(std::move(queryAst))
8081
, SplitCtx(splitCtx)
@@ -365,7 +366,9 @@ class TKqpCompileActor : public TActorBootstrapped<TKqpCompileActor> {
365366
replayMessage.InsertValue("query_syntax", ToString(Config->_KqpYqlSyntaxVersion.Get().GetRef()));
366367
replayMessage.InsertValue("query_database", QueryId.Database);
367368
replayMessage.InsertValue("query_cluster", QueryId.Cluster);
368-
replayMessage.InsertValue("query_plan", queryPlan);
369+
if (QueryAction == NKikimrKqp::QUERY_ACTION_EXPLAIN) {
370+
replayMessage.InsertValue("query_plan", queryPlan);
371+
}
369372
replayMessage.InsertValue("query_type", ToString(QueryId.Settings.QueryType));
370373

371374
if (CollectFullDiagnostics) {
@@ -613,6 +616,7 @@ class TKqpCompileActor : public TActorBootstrapped<TKqpCompileActor> {
613616
bool CollectFullDiagnostics;
614617

615618
bool PerStatementResult;
619+
NKikimrKqp::EQueryAction QueryAction;
616620
ECompileActorAction CompileAction;
617621
TMaybe<TQueryAst> QueryAst;
618622

@@ -665,7 +669,7 @@ IActor* CreateKqpCompileActor(const TActorId& owner, const TKqpSettings::TConstP
665669
const TString& uid, const TKqpQueryId& query, const TIntrusiveConstPtr<NACLib::TUserToken>& userToken, const TString& clientAddress,
666670
std::optional<TKqpFederatedQuerySetup> federatedQuerySetup, TKqpDbCountersPtr dbCounters, const TGUCSettings::TPtr& gUCSettings,
667671
const TMaybe<TString>& applicationName, const TIntrusivePtr<TUserRequestContext>& userRequestContext,
668-
NWilson::TTraceId traceId, TKqpTempTablesState::TConstPtr tempTablesState,
672+
NWilson::TTraceId traceId, TKqpTempTablesState::TConstPtr tempTablesState, NKikimrKqp::EQueryAction queryAction,
669673
ECompileActorAction compileAction, TMaybe<TQueryAst> queryAst, bool collectFullDiagnostics,
670674
bool perStatementResult, NYql::TExprContext* splitCtx, NYql::TExprNode::TPtr splitExpr)
671675
{
@@ -674,7 +678,7 @@ IActor* CreateKqpCompileActor(const TActorId& owner, const TKqpSettings::TConstP
674678
uid, query, userToken, clientAddress, dbCounters,
675679
federatedQuerySetup, userRequestContext,
676680
std::move(traceId), std::move(tempTablesState), collectFullDiagnostics,
677-
perStatementResult, compileAction, std::move(queryAst),
681+
perStatementResult, queryAction, compileAction, std::move(queryAst),
678682
splitCtx, splitExpr);
679683
}
680684

‎ydb/core/kqp/compile_service/kqp_compile_service.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,17 @@ using namespace NYql;
2929

3030

3131
struct TKqpCompileSettings {
32-
TKqpCompileSettings(bool keepInCache, bool isQueryActionPrepare, bool perStatementResult,
32+
TKqpCompileSettings(bool keepInCache, NKikimrKqp::EQueryAction queryAction, bool perStatementResult,
3333
const TInstant& deadline, ECompileActorAction action = ECompileActorAction::COMPILE)
3434
: KeepInCache(keepInCache)
35-
, IsQueryActionPrepare(isQueryActionPrepare)
35+
, QueryAction(queryAction)
3636
, PerStatementResult(perStatementResult)
3737
, Deadline(deadline)
3838
, Action(action)
3939
{}
4040

4141
bool KeepInCache;
42-
bool IsQueryActionPrepare;
42+
NKikimrKqp::EQueryAction QueryAction;
4343
bool PerStatementResult;
4444
TInstant Deadline;
4545
ECompileActorAction Action;
@@ -464,7 +464,7 @@ class TKqpCompileService : public TActorBootstrapped<TKqpCompileService> {
464464

465465
TKqpCompileSettings compileSettings(
466466
request.KeepInCache,
467-
request.IsQueryActionPrepare,
467+
request.QueryAction,
468468
request.PerStatementResult,
469469
request.Deadline,
470470
ev->Get()->Split
@@ -532,7 +532,7 @@ class TKqpCompileService : public TActorBootstrapped<TKqpCompileService> {
532532

533533
TKqpCompileSettings compileSettings(
534534
true,
535-
request.IsQueryActionPrepare,
535+
request.QueryAction,
536536
false,
537537
request.Deadline,
538538
ev->Get()->Split
@@ -626,7 +626,7 @@ class TKqpCompileService : public TActorBootstrapped<TKqpCompileService> {
626626
try {
627627
if (compileResult->Status == Ydb::StatusIds::SUCCESS) {
628628
if (!hasTempTablesNameClashes) {
629-
UpdateQueryCache(ctx, compileResult, keepInCache, compileRequest.CompileSettings.IsQueryActionPrepare, isPerStatementExecution);
629+
UpdateQueryCache(ctx, compileResult, keepInCache, compileRequest.CompileSettings.QueryAction == NKikimrKqp::QUERY_ACTION_PREPARE, isPerStatementExecution);
630630
}
631631

632632
if (ev->Get()->ReplayMessage && !QueryReplayBackend->IsNull()) {
@@ -849,7 +849,7 @@ class TKqpCompileService : public TActorBootstrapped<TKqpCompileService> {
849849
void StartCompilation(TKqpCompileRequest&& request, const TActorContext& ctx) {
850850
auto compileActor = CreateKqpCompileActor(ctx.SelfID, KqpSettings, TableServiceConfig, QueryServiceConfig, ModuleResolverState, Counters,
851851
request.Uid, request.Query, request.UserToken, request.ClientAddress, FederatedQuerySetup, request.DbCounters, request.GUCSettings, request.ApplicationName, request.UserRequestContext,
852-
request.CompileServiceSpan.GetTraceId(), request.TempTablesState, request.CompileSettings.Action, std::move(request.QueryAst), CollectDiagnostics,
852+
request.CompileServiceSpan.GetTraceId(), request.TempTablesState, request.CompileSettings.QueryAction, request.CompileSettings.Action, std::move(request.QueryAst), CollectDiagnostics,
853853
request.CompileSettings.PerStatementResult, request.SplitCtx, request.SplitExpr);
854854
auto compileActorId = ctx.ExecutorThread.RegisterActor(compileActor, TMailboxType::HTSwap,
855855
AppData(ctx)->UserPoolId);

‎ydb/core/kqp/compile_service/kqp_compile_service.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,7 @@ IActor* CreateKqpCompileActor(const TActorId& owner, const TKqpSettings::TConstP
166166
TKqpDbCountersPtr dbCounters, const TGUCSettings::TPtr& gUCSettings, const TMaybe<TString>& applicationName,
167167
const TIntrusivePtr<TUserRequestContext>& userRequestContext, NWilson::TTraceId traceId = {},
168168
TKqpTempTablesState::TConstPtr tempTablesState = nullptr,
169+
NKikimrKqp::EQueryAction queryAction = NKikimrKqp::QUERY_ACTION_EXECUTE,
169170
ECompileActorAction compileAction = ECompileActorAction::COMPILE,
170171
TMaybe<TQueryAst> queryAst = {},
171172
bool collectFullDiagnostics = false,

‎ydb/core/kqp/session_actor/kqp_query_state.cpp‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -300,16 +300,14 @@ std::unique_ptr<TEvKqp::TEvCompileRequest> TKqpQueryState::BuildCompileRequest(s
300300
compileDeadline = Min(compileDeadline, QueryDeadlines.CancelAt);
301301
}
302302

303-
bool isQueryActionPrepare = GetAction() == NKikimrKqp::QUERY_ACTION_PREPARE;
304-
305303
TMaybe<TQueryAst> statementAst;
306304
if (!Statements.empty()) {
307305
YQL_ENSURE(CurrentStatementId < Statements.size());
308306
statementAst = Statements[CurrentStatementId];
309307
}
310308

311309
return std::make_unique<TEvKqp::TEvCompileRequest>(UserToken, ClientAddress, uid, std::move(query), keepInCache,
312-
isQueryActionPrepare, perStatementResult, compileDeadline, DbCounters, gUCSettingsPtr, ApplicationName, std::move(cookie),
310+
GetAction(), perStatementResult, compileDeadline, DbCounters, gUCSettingsPtr, ApplicationName, std::move(cookie),
313311
UserRequestContext, std::move(Orbit), TempTablesState, GetCollectDiagnostics(), statementAst);
314312
}
315313

@@ -344,12 +342,11 @@ std::unique_ptr<TEvKqp::TEvRecompileRequest> TKqpQueryState::BuildReCompileReque
344342
}
345343

346344
auto compileDeadline = QueryDeadlines.TimeoutAt;
347-
bool isQueryActionPrepare = GetAction() == NKikimrKqp::QUERY_ACTION_PREPARE;
348345
if (QueryDeadlines.CancelAt) {
349346
compileDeadline = Min(compileDeadline, QueryDeadlines.CancelAt);
350347
}
351348

352-
return std::make_unique<TEvKqp::TEvRecompileRequest>(UserToken, ClientAddress, CompileResult->Uid, query, isQueryActionPrepare,
349+
return std::make_unique<TEvKqp::TEvRecompileRequest>(UserToken, ClientAddress, CompileResult->Uid, query, GetAction(),
353350
compileDeadline, DbCounters, gUCSettingsPtr, ApplicationName, std::move(cookie), UserRequestContext, std::move(Orbit), TempTablesState,
354351
CompileResult->QueryAst);
355352
}
@@ -392,7 +389,7 @@ std::unique_ptr<TEvKqp::TEvCompileRequest> TKqpQueryState::BuildCompileSplittedR
392389
}
393390

394391
return std::make_unique<TEvKqp::TEvCompileRequest>(UserToken, ClientAddress, uid, std::move(query), false,
395-
false, perStatementResult, compileDeadline, DbCounters, gUCSettingsPtr, ApplicationName, std::move(cookie),
392+
NKikimrKqp::QUERY_ACTION_EXECUTE, perStatementResult, compileDeadline, DbCounters, gUCSettingsPtr, ApplicationName, std::move(cookie),
396393
UserRequestContext, std::move(Orbit), TempTablesState, GetCollectDiagnostics(), statementAst,
397394
false, SplittedCtx.get(), SplittedExprs.at(NextSplittedExpr));
398395
}

‎ydb/core/kqp/ut/olap/kqp_olap_ut.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
308308

309309
{
310310
TStreamExecScanQuerySettings settings;
311-
settings.CollectQueryStats(ECollectQueryStatsMode::Full);
311+
settings.CollectQueryStats(ECollectQueryStatsMode::Basic);
312312
auto it = client.StreamExecuteScanQuery(R"(
313313
--!syntax_v1
314314
SELECT `resource_id`, `timestamp`
@@ -325,7 +325,7 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
325325
{
326326
TStreamExecScanQuerySettings settings;
327327
settings.CollectQueryStats(ECollectQueryStatsMode::Full);
328-
settings.CollectFullDiagnostics(true);
328+
329329
auto it = client.StreamExecuteScanQuery(R"(
330330
--!syntax_v1
331331
SELECT `resource_id`, `timestamp`

0 commit comments

Comments
 (0)