From e33cb200c98fe2d7d5c9ac41d75dfc9eca94bd11 Mon Sep 17 00:00:00 2001 From: Vitalii Gridnev Date: Thu, 3 Oct 2024 08:49:42 +0300 Subject: [PATCH] get rid of mkql results in scripting (#9997) --- ydb/core/kqp/common/kqp_event_impl.cpp | 7 ------- ydb/core/kqp/provider/yql_kikimr_gateway.h | 1 - ydb/core/viewer/viewer_query.h | 8 +------- 3 files changed, 1 insertion(+), 15 deletions(-) diff --git a/ydb/core/kqp/common/kqp_event_impl.cpp b/ydb/core/kqp/common/kqp_event_impl.cpp index 665764f7e234..5396e7c0d6f3 100644 --- a/ydb/core/kqp/common/kqp_event_impl.cpp +++ b/ydb/core/kqp/common/kqp_event_impl.cpp @@ -90,14 +90,7 @@ void TEvKqp::TEvQueryRequest::PrepareRemote() const { Record.MutableRequest()->SetPoolId(PoolId); } -<<<<<<< HEAD -======= - if (!DatabaseId.empty()) { - Record.MutableRequest()->SetDatabaseId(DatabaseId); - } - Record.MutableRequest()->SetUsePublicResponseDataFormat(true); ->>>>>>> a491b73df3 (get rid of mkql results in scripting (#9997)) Record.MutableRequest()->SetSessionId(SessionId); Record.MutableRequest()->SetAction(QueryAction); Record.MutableRequest()->SetType(QueryType); diff --git a/ydb/core/kqp/provider/yql_kikimr_gateway.h b/ydb/core/kqp/provider/yql_kikimr_gateway.h index 63683179ba53..ec1c55887246 100644 --- a/ydb/core/kqp/provider/yql_kikimr_gateway.h +++ b/ydb/core/kqp/provider/yql_kikimr_gateway.h @@ -858,7 +858,6 @@ class IKikimrGateway : public TThrRefBase { TString SessionId; TVector Results; TMaybe Profile; // TODO: Deprecate. - a491b73df3 (get rid of mkql results in scripting (#9997)) NKqpProto::TKqpStatsQuery QueryStats; std::unique_ptr PreparingQuery; std::shared_ptr PreparedQuery; diff --git a/ydb/core/viewer/viewer_query.h b/ydb/core/viewer/viewer_query.h index b42dcb4001ec..75292362865c 100644 --- a/ydb/core/viewer/viewer_query.h +++ b/ydb/core/viewer/viewer_query.h @@ -546,14 +546,8 @@ class TJsonQuery : public TViewerPipeClient { void MakeOkReply(NJson::TJsonValue& jsonResponse, NKikimrKqp::TEvQueryResponse& record) { const auto& response = record.GetResponse(); - if (response.YdbResultsSize() > 0 || response.ResultsSize() > 0) { + if (response.YdbResultsSize() > 0) { try { - for (const auto& result : response.GetResults()) { - Ydb::ResultSet resultSet; - NKqp::ConvertKqpQueryResultToDbResult(result, &resultSet); - ResultSets.emplace_back().emplace_back(std::move(resultSet)); - } - for (const auto& result : response.GetYdbResults()) { ResultSets.emplace_back().emplace_back(result); }