fix empty results for scan queries and via query service

1 files changed, 6 insertions, 1 deletions

diff --git a/ydb/core/viewer/json_query.h b/ydb/core/viewer/json_query.h
index 21a8907386e..422e5a7916b 100644
--- a/ydb/core/viewer/json_query.h
+++ b/ydb/core/viewer/json_query.h
@@ -392,6 +392,7 @@ private:
         } else {
             TEvViewer::TEvViewerResponse* response = new TEvViewer::TEvViewerResponse();
             response->Record.MutableQueryResponse()->CopyFrom(record);
+            response->Record.MutableQueryResponse()->MutableResponse()->MutableYdbResults()->Add(ResultSets.begin(), ResultSets.end());
             ReplyAndPassAway(response);
         }
     }
@@ -473,13 +474,17 @@ private:
     void MakeOkReply(TStringBuilder& out, NJson::TJsonValue& jsonResponse, NKikimrKqp::TEvQueryResponse& record) {
         const auto& response = record.GetResponse();
 
-        if (response.ResultsSize() > 0) {
+        if (response.ResultsSize() > 0 || response.YdbResultsSize() > 0) {
             try {
                 for (const auto& result : response.GetResults()) {
                     Ydb::ResultSet resultSet;
                     NKqp::ConvertKqpQueryResultToDbResult(result, &resultSet);
                     ResultSets.emplace_back(std::move(resultSet));
                 }
+
+                for (const auto& result : response.GetYdbResults()) {
+                    ResultSets.emplace_back(result);
+                }
             }
             catch (const std::exception& ex) {
                 Ydb::Issue::IssueMessage* issue = record.MutableResponse()->AddQueryIssues();