Skip to content

Commit 526949b

Browse files
shnikdshnikd
committed
Fixes
1 parent a2a9a5a commit 526949b

File tree

18 files changed

+190
-112
lines changed

18 files changed

+190
-112
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ class TExecuteQueryRPC : public TActorBootstrapped<TExecuteQueryRPC> {
424424
response.mutable_exec_stats()->set_query_ast(kqpResponse.GetQueryAst());
425425
}
426426
if (NeedCollectDiagnostics(*Request_->GetProtoRequest())) {
427-
response.mutable_exec_stats()->set_query_diagnostics(kqpResponse.GetQueryDiagnostics());
427+
response.mutable_exec_stats()->set_query_meta(kqpResponse.GetQueryDiagnostics());
428428
}
429429
}
430430

‎ydb/core/grpc_services/rpc_execute_data_query.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ class TExecuteDataQueryRPC : public TRpcKqpRequestActor<TExecuteDataQueryRPC, TE
156156
req->collect_stats(),
157157
req->has_query_cache_policy() ? &req->query_cache_policy() : nullptr,
158158
req->has_operation_params() ? &req->operation_params() : nullptr);
159-
159+
160160
ev->Record.MutableRequest()->SetCollectDiagnostics(NeedCollectDiagnostics(*req));
161161

162162
ReportCostInfo_ = req->operation_params().report_cost_info() == Ydb::FeatureFlag::ENABLED;
@@ -178,7 +178,9 @@ class TExecuteDataQueryRPC : public TRpcKqpRequestActor<TExecuteDataQueryRPC, TE
178178
if (from.HasQueryStats()) {
179179
FillQueryStats(*to->mutable_query_stats(), from);
180180
to->mutable_query_stats()->set_query_ast(from.GetQueryAst());
181-
to->mutable_query_stats()->set_query_diagnostics(from.GetQueryDiagnostics());
181+
if (from.HasQueryDiagnostics()) {
182+
to->mutable_query_stats()->set_query_meta(from.GetQueryDiagnostics());
183+
}
182184
return;
183185
}
184186
}

‎ydb/core/grpc_services/rpc_stream_execute_scan_query.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ class TStreamExecuteScanQueryRPC : public TActorBootstrapped<TStreamExecuteScanQ
331331
}
332332

333333
if (collectDiagnostics) {
334-
response.mutable_result()->mutable_query_stats()->set_query_diagnostics(kqpResponse.GetQueryDiagnostics());
334+
response.mutable_result()->mutable_query_stats()->set_query_meta(kqpResponse.GetQueryDiagnostics());
335335
}
336336

337337
Y_PROTOBUF_SUPPRESS_NODISCARD response.SerializeToString(&out);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,6 @@ class TKqpCompileActor : public TActorBootstrapped<TKqpCompileActor> {
354354

355355
replayMessage.InsertValue("query_id", Uid);
356356
replayMessage.InsertValue("version", "1.0");
357-
replayMessage.InsertValue("query_text", EscapeC(QueryId.Text));
358357
NJson::TJsonValue queryParameterTypes(NJson::JSON_MAP);
359358
if (QueryId.QueryParameterTypes) {
360359
for (const auto& [paramName, paramType] : *QueryId.QueryParameterTypes) {
@@ -383,6 +382,7 @@ class TKqpCompileActor : public TActorBootstrapped<TKqpCompileActor> {
383382
ReplayMessageUserView = NJson::WriteJson(replayMessage, /*formatOutput*/ false);
384383
}
385384

385+
replayMessage.InsertValue("query_text", EscapeC(QueryId.Text));
386386
replayMessage.InsertValue("table_metadata", TString(NJson::WriteJson(tablesMeta, false)));
387387
replayMessage.InsertValue("table_meta_serialization_type", EMetaSerializationType::EncodedProto);
388388

‎ydb/core/kqp/ut/olap/helpers/query_executor.cpp

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@
55

66
namespace NKikimr::NKqp {
77

8-
TVector<THashMap<TString, NYdb::TValue>> CollectRows(NYdb::NTable::TScanQueryPartIterator& it, NJson::TJsonValue* statInfo /*= nullptr*/, NJson::TJsonValue* diagnostics /*= nullptr*/) {
8+
TVector<THashMap<TString, NYdb::TValue>> CollectRows(NYdb::NTable::TScanQueryPartIterator& it, NJson::TJsonValue* statInfo /*= nullptr*/, NJson::TJsonValue* meta /*= nullptr*/) {
99
TVector<THashMap<TString, NYdb::TValue>> rows;
1010
if (statInfo) {
1111
*statInfo = NJson::JSON_NULL;
1212
}
13-
if (diagnostics) {
14-
*diagnostics = NJson::JSON_NULL;
13+
if (meta) {
14+
*meta = NJson::JSON_NULL;
1515
}
1616
for (;;) {
1717
auto streamPart = it.ReadNext().GetValueSync();
@@ -28,12 +28,10 @@ TVector<THashMap<TString, NYdb::TValue>> CollectRows(NYdb::NTable::TScanQueryPar
2828
if (plan && statInfo) {
2929
UNIT_ASSERT(NJson::ReadJsonFastTree(*plan, statInfo));
3030
}
31-
}
3231

33-
if (streamPart.HasDiagnostics()) {
34-
auto diagnosticsString = TString{streamPart.GetDiagnostics()};
35-
if (!diagnosticsString.empty() && diagnostics) {
36-
UNIT_ASSERT(NJson::ReadJsonFastTree(diagnosticsString, diagnostics));
32+
auto metaString = streamPart.GetQueryStats().GetMeta();
33+
if (metaString && !metaString->empty() && meta) {
34+
UNIT_ASSERT(NJson::ReadJsonFastTree(*metaString, meta));
3735
}
3836
}
3937

@@ -70,4 +68,4 @@ TVector<THashMap<TString, NYdb::TValue>> ExecuteScanQuery(NYdb::NTable::TTableCl
7068
return rows;
7169
}
7270

73-
}
71+
}

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

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
380380
}
381381
}
382382

383-
Y_UNIT_TEST(SimpleQueryOlapDiagnostics) {
383+
Y_UNIT_TEST(SimpleQueryOlapMeta) {
384384
auto settings = TKikimrSettings()
385385
.SetWithSampleTables(false);
386386
TKikimrRunner kikimr(settings);
@@ -402,9 +402,9 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
402402
)", settings).GetValueSync();
403403

404404
UNIT_ASSERT_C(it.IsSuccess(), it.GetIssues().ToString());
405-
NJson::TJsonValue jsonDiagnostics;
406-
CollectRows(it, nullptr, &jsonDiagnostics);
407-
UNIT_ASSERT_C(!jsonDiagnostics.IsDefined(), "Query result diagnostics should be empty, but it's not");
405+
NJson::TJsonValue jsonMeta;
406+
CollectRows(it, nullptr, &jsonMeta);
407+
UNIT_ASSERT_C(!jsonMeta.IsDefined(), "Query result meta should be empty, but it's not");
408408
}
409409

410410
{
@@ -419,22 +419,21 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
419419
)", settings).GetValueSync();
420420

421421
UNIT_ASSERT_C(it.IsSuccess(), it.GetIssues().ToString());
422-
NJson::TJsonValue jsonDiagnostics;
423-
CollectRows(it, nullptr, &jsonDiagnostics);
424-
UNIT_ASSERT(!jsonDiagnostics.IsNull());
425-
426-
UNIT_ASSERT_C(jsonDiagnostics.IsMap(), "Incorrect Diagnostics");
427-
UNIT_ASSERT_C(jsonDiagnostics.Has("query_id"), "Incorrect Diagnostics");
428-
UNIT_ASSERT_C(jsonDiagnostics.Has("version"), "Incorrect Diagnostics");
429-
UNIT_ASSERT_C(jsonDiagnostics.Has("query_text"), "Incorrect Diagnostics");
430-
UNIT_ASSERT_C(jsonDiagnostics.Has("query_parameter_types"), "Incorrect Diagnostics");
431-
UNIT_ASSERT_C(jsonDiagnostics.Has("table_metadata"), "Incorrect Diagnostics");
432-
UNIT_ASSERT_C(jsonDiagnostics.Has("created_at"), "Incorrect Diagnostics");
433-
UNIT_ASSERT_C(jsonDiagnostics.Has("query_syntax"), "Incorrect Diagnostics");
434-
UNIT_ASSERT_C(jsonDiagnostics.Has("query_database"), "Incorrect Diagnostics");
435-
UNIT_ASSERT_C(jsonDiagnostics.Has("query_cluster"), "Incorrect Diagnostics");
436-
UNIT_ASSERT_C(jsonDiagnostics.Has("query_plan"), "Incorrect Diagnostics");
437-
UNIT_ASSERT_C(jsonDiagnostics.Has("query_type"), "Incorrect Diagnostics");
422+
NJson::TJsonValue jsonMeta;
423+
CollectRows(it, nullptr, &jsonMeta);
424+
UNIT_ASSERT(!jsonMeta.IsNull());
425+
426+
UNIT_ASSERT_C(jsonMeta.IsMap(), "Incorrect Meta");
427+
UNIT_ASSERT_C(jsonMeta.Has("query_id"), "Incorrect Meta");
428+
UNIT_ASSERT_C(jsonMeta.Has("version"), "Incorrect Meta");
429+
UNIT_ASSERT_C(jsonMeta.Has("query_parameter_types"), "Incorrect Meta");
430+
UNIT_ASSERT_C(jsonMeta.Has("table_metadata"), "Incorrect Meta");
431+
UNIT_ASSERT_C(jsonMeta.Has("created_at"), "Incorrect Meta");
432+
UNIT_ASSERT_C(jsonMeta.Has("query_syntax"), "Incorrect Meta");
433+
UNIT_ASSERT_C(jsonMeta.Has("query_database"), "Incorrect Meta");
434+
UNIT_ASSERT_C(jsonMeta.Has("query_cluster"), "Incorrect Meta");
435+
UNIT_ASSERT_C(!jsonMeta.Has("query_plan"), "Incorrect Meta");
436+
UNIT_ASSERT_C(jsonMeta.Has("query_type"), "Incorrect Meta");
438437
}
439438
}
440439

@@ -2785,7 +2784,7 @@ Y_UNIT_TEST_SUITE(KqpOlap) {
27852784
auto alterQuery =
27862785
TStringBuilder() <<
27872786
R"(ALTER OBJECT `/Root/olapStore` (TYPE TABLESTORE) SET (ACTION=UPSERT_OPTIONS, `COMPACTION_PLANNER.CLASS_NAME`=`lc-buckets`, `COMPACTION_PLANNER.FEATURES`=`
2788-
{"levels" : [{"class_name" : "Zero", "portions_live_duration" : "180s", "expected_blobs_size" : 2048000},
2787+
{"levels" : [{"class_name" : "Zero", "portions_live_duration" : "180s", "expected_blobs_size" : 2048000},
27892788
{"class_name" : "Zero", "expected_blobs_size" : 2048000}, {"class_name" : "Zero"}]}`);
27902789
)";
27912790
auto session = tableClient.CreateSession().GetValueSync().GetSession();

‎ydb/core/kqp/ut/query/kqp_query_ut.cpp

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ Y_UNIT_TEST_SUITE(KqpQuery) {
179179
UNIT_ASSERT_VALUES_EQUAL(counters.RecompileRequestGet()->Val(), 1);
180180
}
181181

182-
Y_UNIT_TEST(ExecuteDataQueryCollectFullDiagnostics) {
182+
Y_UNIT_TEST(ExecuteDataQueryCollectMeta) {
183183
auto setting = NKikimrKqp::TKqpSetting();
184184
auto serverSettings = TKikimrSettings()
185185
.SetKqpSettings({setting});
@@ -211,26 +211,25 @@ Y_UNIT_TEST_SUITE(KqpQuery) {
211211

212212
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString().c_str());
213213

214-
UNIT_ASSERT_C(!result.GetDiagnostics().empty(), "Query result diagnostics is empty");
214+
UNIT_ASSERT_C(!result.GetMeta().empty(), "Query result meta is empty");
215215

216216
TStringStream in;
217-
in << result.GetDiagnostics();
217+
in << result.GetMeta();
218218
NJson::TJsonValue value;
219219
ReadJsonTree(&in, &value);
220220

221-
UNIT_ASSERT_C(value.IsMap(), "Incorrect Diagnostics");
222-
UNIT_ASSERT_C(value.Has("query_id"), "Incorrect Diagnostics");
223-
UNIT_ASSERT_C(value.Has("version"), "Incorrect Diagnostics");
224-
UNIT_ASSERT_C(value.Has("query_text"), "Incorrect Diagnostics");
225-
UNIT_ASSERT_C(value.Has("query_parameter_types"), "Incorrect Diagnostics");
226-
UNIT_ASSERT_C(value.Has("table_metadata"), "Incorrect Diagnostics");
227-
UNIT_ASSERT_C(value["table_metadata"].IsArray(), "Incorrect Diagnostics: table_metadata type should be an array");
228-
UNIT_ASSERT_C(value.Has("created_at"), "Incorrect Diagnostics");
229-
UNIT_ASSERT_C(value.Has("query_syntax"), "Incorrect Diagnostics");
230-
UNIT_ASSERT_C(value.Has("query_database"), "Incorrect Diagnostics");
231-
UNIT_ASSERT_C(value.Has("query_cluster"), "Incorrect Diagnostics");
232-
UNIT_ASSERT_C(value.Has("query_plan"), "Incorrect Diagnostics");
233-
UNIT_ASSERT_C(value.Has("query_type"), "Incorrect Diagnostics");
221+
UNIT_ASSERT_C(value.IsMap(), "Incorrect Meta");
222+
UNIT_ASSERT_C(value.Has("query_id"), "Incorrect Meta");
223+
UNIT_ASSERT_C(value.Has("version"), "Incorrect Meta");
224+
UNIT_ASSERT_C(value.Has("query_parameter_types"), "Incorrect Meta");
225+
UNIT_ASSERT_C(value.Has("table_metadata"), "Incorrect Meta");
226+
UNIT_ASSERT_C(value["table_metadata"].IsArray(), "Incorrect Meta: table_metadata type should be an array");
227+
UNIT_ASSERT_C(value.Has("created_at"), "Incorrect Meta");
228+
UNIT_ASSERT_C(value.Has("query_syntax"), "Incorrect Meta");
229+
UNIT_ASSERT_C(value.Has("query_database"), "Incorrect Meta");
230+
UNIT_ASSERT_C(value.Has("query_cluster"), "Incorrect Meta");
231+
UNIT_ASSERT_C(!value.Has("query_plan"), "Incorrect Meta");
232+
UNIT_ASSERT_C(value.Has("query_type"), "Incorrect Meta");
234233
}
235234

236235
{
@@ -240,7 +239,7 @@ Y_UNIT_TEST_SUITE(KqpQuery) {
240239

241240
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString().c_str());
242241

243-
UNIT_ASSERT_C(result.GetDiagnostics().empty(), "Query result diagnostics should be empty, but it's not");
242+
UNIT_ASSERT_C(result.GetMeta().empty(), "Query result meta should be empty, but it's not");
244243
}
245244
}
246245
}

‎ydb/core/kqp/ut/service/kqp_qs_queries_ut.cpp

Lines changed: 35 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -650,7 +650,7 @@ Y_UNIT_TEST_SUITE(KqpQueryService) {
650650
}
651651
}
652652

653-
Y_UNIT_TEST(ExecuteCollectFullDiagnostics) {
653+
Y_UNIT_TEST(ExecuteCollectMeta) {
654654
auto kikimr = DefaultKikimrRunner();
655655
auto db = kikimr.GetQueryClient();
656656

@@ -661,29 +661,28 @@ Y_UNIT_TEST_SUITE(KqpQueryService) {
661661
auto result = db.ExecuteQuery(R"(
662662
SELECT Key, Value2 FROM TwoShard WHERE Value2 > 0;
663663
)", TTxControl::BeginTx().CommitTx(), settings).ExtractValueSync();
664-
664+
665665
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
666666
auto& stats = NYdb::TProtoAccessor::GetProto(*result.GetStats());
667-
UNIT_ASSERT_C(!stats.query_diagnostics().empty(), "Query result diagnostics is empty");
667+
UNIT_ASSERT_C(!stats.query_meta().empty(), "Query result meta is empty");
668668

669669
TStringStream in;
670-
in << stats.query_diagnostics();
670+
in << stats.query_meta();
671671
NJson::TJsonValue value;
672672
ReadJsonTree(&in, &value);
673673

674-
UNIT_ASSERT_C(value.IsMap(), "Incorrect Diagnostics");
675-
UNIT_ASSERT_C(value.Has("query_id"), "Incorrect Diagnostics");
676-
UNIT_ASSERT_C(value.Has("version"), "Incorrect Diagnostics");
677-
UNIT_ASSERT_C(value.Has("query_text"), "Incorrect Diagnostics");
678-
UNIT_ASSERT_C(value.Has("query_parameter_types"), "Incorrect Diagnostics");
679-
UNIT_ASSERT_C(value.Has("table_metadata"), "Incorrect Diagnostics");
680-
UNIT_ASSERT_C(value["table_metadata"].IsArray(), "Incorrect Diagnostics: table_metadata type should be an array");
681-
UNIT_ASSERT_C(value.Has("created_at"), "Incorrect Diagnostics");
682-
UNIT_ASSERT_C(value.Has("query_syntax"), "Incorrect Diagnostics");
683-
UNIT_ASSERT_C(value.Has("query_database"), "Incorrect Diagnostics");
684-
UNIT_ASSERT_C(value.Has("query_cluster"), "Incorrect Diagnostics");
685-
UNIT_ASSERT_C(!value.Has("query_plan"), "Incorrect Diagnostics");
686-
UNIT_ASSERT_C(value.Has("query_type"), "Incorrect Diagnostics");
674+
UNIT_ASSERT_C(value.IsMap(), "Incorrect Meta");
675+
UNIT_ASSERT_C(value.Has("query_id"), "Incorrect Meta");
676+
UNIT_ASSERT_C(value.Has("version"), "Incorrect Meta");
677+
UNIT_ASSERT_C(value.Has("query_parameter_types"), "Incorrect Meta");
678+
UNIT_ASSERT_C(value.Has("table_metadata"), "Incorrect Meta");
679+
UNIT_ASSERT_C(value["table_metadata"].IsArray(), "Incorrect Meta: table_metadata type should be an array");
680+
UNIT_ASSERT_C(value.Has("created_at"), "Incorrect Meta");
681+
UNIT_ASSERT_C(value.Has("query_syntax"), "Incorrect Meta");
682+
UNIT_ASSERT_C(value.Has("query_database"), "Incorrect Meta");
683+
UNIT_ASSERT_C(value.Has("query_cluster"), "Incorrect Meta");
684+
UNIT_ASSERT_C(!value.Has("query_plan"), "Incorrect Meta");
685+
UNIT_ASSERT_C(value.Has("query_type"), "Incorrect Meta");
687686
}
688687

689688
{
@@ -693,15 +692,15 @@ Y_UNIT_TEST_SUITE(KqpQueryService) {
693692
auto result = db.ExecuteQuery(R"(
694693
SELECT Key, Value2 FROM TwoShard WHERE Value2 > 0;
695694
)", TTxControl::BeginTx().CommitTx(), settings).ExtractValueSync();
696-
695+
697696
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString().c_str());
698697

699698
auto& stats = NYdb::TProtoAccessor::GetProto(*result.GetStats());
700-
UNIT_ASSERT_C(stats.query_diagnostics().empty(), "Query result diagnostics should be empty, but it's not");
699+
UNIT_ASSERT_C(stats.query_meta().empty(), "Query result Meta should be empty, but it's not");
701700
}
702701
}
703702

704-
Y_UNIT_TEST(StreamExecuteCollectFullDiagnostics) {
703+
Y_UNIT_TEST(StreamExecuteCollectMeta) {
705704
auto kikimr = DefaultKikimrRunner();
706705
auto db = kikimr.GetQueryClient();
707706

@@ -725,30 +724,29 @@ Y_UNIT_TEST_SUITE(KqpQueryService) {
725724
const auto& execStats = streamPart.GetStats();
726725
if (execStats.Defined()) {
727726
auto& stats = NYdb::TProtoAccessor::GetProto(*execStats);
728-
statsString = stats.query_diagnostics();
727+
statsString = stats.query_meta();
729728
}
730729
}
731730

732-
UNIT_ASSERT_C(!statsString.empty(), "Query result diagnostics is empty");
731+
UNIT_ASSERT_C(!statsString.empty(), "Query result meta is empty");
733732

734733
TStringStream in;
735734
in << statsString;
736735
NJson::TJsonValue value;
737736
ReadJsonTree(&in, &value);
738737

739-
UNIT_ASSERT_C(value.IsMap(), "Incorrect Diagnostics");
740-
UNIT_ASSERT_C(value.Has("query_id"), "Incorrect Diagnostics");
741-
UNIT_ASSERT_C(value.Has("version"), "Incorrect Diagnostics");
742-
UNIT_ASSERT_C(value.Has("query_text"), "Incorrect Diagnostics");
743-
UNIT_ASSERT_C(value.Has("query_parameter_types"), "Incorrect Diagnostics");
744-
UNIT_ASSERT_C(value.Has("table_metadata"), "Incorrect Diagnostics");
745-
UNIT_ASSERT_C(value["table_metadata"].IsArray(), "Incorrect Diagnostics: table_metadata type should be an array");
746-
UNIT_ASSERT_C(value.Has("created_at"), "Incorrect Diagnostics");
747-
UNIT_ASSERT_C(value.Has("query_syntax"), "Incorrect Diagnostics");
748-
UNIT_ASSERT_C(value.Has("query_database"), "Incorrect Diagnostics");
749-
UNIT_ASSERT_C(value.Has("query_cluster"), "Incorrect Diagnostics");
750-
UNIT_ASSERT_C(!value.Has("query_plan"), "Incorrect Diagnostics");
751-
UNIT_ASSERT_C(value.Has("query_type"), "Incorrect Diagnostics");
738+
UNIT_ASSERT_C(value.IsMap(), "Incorrect Meta");
739+
UNIT_ASSERT_C(value.Has("query_id"), "Incorrect Meta");
740+
UNIT_ASSERT_C(value.Has("version"), "Incorrect Meta");
741+
UNIT_ASSERT_C(value.Has("query_parameter_types"), "Incorrect Meta");
742+
UNIT_ASSERT_C(value.Has("table_metadata"), "Incorrect Meta");
743+
UNIT_ASSERT_C(value["table_metadata"].IsArray(), "Incorrect Meta: table_metadata type should be an array");
744+
UNIT_ASSERT_C(value.Has("created_at"), "Incorrect Meta");
745+
UNIT_ASSERT_C(value.Has("query_syntax"), "Incorrect Meta");
746+
UNIT_ASSERT_C(value.Has("query_database"), "Incorrect Meta");
747+
UNIT_ASSERT_C(value.Has("query_cluster"), "Incorrect Meta");
748+
UNIT_ASSERT_C(!value.Has("query_plan"), "Incorrect Meta");
749+
UNIT_ASSERT_C(value.Has("query_type"), "Incorrect Meta");
752750
}
753751

754752
{
@@ -771,11 +769,11 @@ Y_UNIT_TEST_SUITE(KqpQueryService) {
771769
const auto& execStats = streamPart.GetStats();
772770
if (execStats.Defined()) {
773771
auto& stats = NYdb::TProtoAccessor::GetProto(*execStats);
774-
statsString = stats.query_diagnostics();
772+
statsString = stats.query_meta();
775773
}
776774
}
777775

778-
UNIT_ASSERT_C(statsString.empty(), "Query result diagnostics should be empty, but it's not");
776+
UNIT_ASSERT_C(statsString.empty(), "Query result meta should be empty, but it's not");
779777
}
780778
}
781779

‎ydb/public/api/protos/ydb_query_stats.proto

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,7 @@ message QueryStats {
4343
string query_ast = 5;
4444
uint64 total_duration_us = 6;
4545
uint64 total_cpu_time_us = 7;
46-
string query_diagnostics = 8;
46+
// will be filled only in MODE_EXPLAIN or in MODE_EXEC with QueryStatsCollection.Mode >= STATS_COLLECTION_FULL,
47+
// collects additional meta about query compilation, including table metadata
48+
string query_meta = 8;
4749
}

0 commit comments

Comments
 (0)