get rid of mkql results in scripting (#9997)

ydb-platform · Oct 7, 2024 · e33cb20 · e33cb20
1 parent 24eb06b
commit e33cb20
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 15 deletions.
diff --git 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
@@ -858,7 +858,6 @@ class IKikimrGateway : public TThrRefBase {
         TString SessionId;
         TVector<Ydb::ResultSet*> Results;
         TMaybe<NKikimrKqp::TQueryProfile> Profile; // TODO: Deprecate.
-        a491b73df3 (get rid of mkql results in scripting (#9997))
         NKqpProto::TKqpStatsQuery QueryStats;
         std::unique_ptr<NKikimrKqp::TPreparedQuery> PreparingQuery;
         std::shared_ptr<const NKikimrKqp::TPreparedQuery> PreparedQuery;

diff --git 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);
                 }