Browse Source

Revert commit rXXXXXX, PR from branch users/makostrov/remove_mkql_from_json_query

xenoxeno 1 year ago
parent
commit
b5ebf0f8b1
1 changed files with 5 additions and 6 deletions
  1. 5 6
      ydb/core/viewer/json_query.h

+ 5 - 6
ydb/core/viewer/json_query.h

@@ -160,7 +160,6 @@ public:
         auto event = MakeHolder<NKqp::TEvKqp::TEvQueryRequest>();
         NKikimrKqp::TQueryRequest& request = *event->Record.MutableRequest();
         request.SetQuery(Query);
-        request.SetUsePublicResponseDataFormat(true);
         if (Action.empty() || Action == "execute-script" || Action == "execute") {
             request.SetAction(NKikimrKqp::QUERY_ACTION_EXECUTE);
             request.SetType(NKikimrKqp::QUERY_TYPE_SQL_SCRIPT);
@@ -474,12 +473,12 @@ private:
     void MakeOkReply(TStringBuilder& out, NJson::TJsonValue& jsonResponse, NKikimrKqp::TEvQueryResponse& record) {
         const auto& response = record.GetResponse();
 
-        if (response.YdbResultsSize() > 0) {
+        if (response.ResultsSize() > 0) {
             try {
-                for (auto& result : response.GetYdbResults()) {
-                    // Ydb::ResultSet resultSet;
-                    // NKqp::ConvertKqpQueryResultToDbResult(result, &resultSet);
-                    ResultSets.emplace_back(std::move(result));
+                for (const auto& result : response.GetResults()) {
+                    Ydb::ResultSet resultSet;
+                    NKqp::ConvertKqpQueryResultToDbResult(result, &resultSet);
+                    ResultSets.emplace_back(std::move(resultSet));
                 }
             }
             catch (const std::exception& ex) {