diff options
author | makostrov <makostrov@yandex-team.com> | 2023-08-15 13:10:21 +0300 |
---|---|---|
committer | makostrov <makostrov@yandex-team.com> | 2023-08-15 15:30:59 +0300 |
commit | e3f385067226dbe3c7a475438f35a9e1e8032a1c (patch) | |
tree | 6a6c51d135d4325bfc72c119f1dfdd0a31d54283 | |
parent | 83bd95e896e785d5379bed229b3fb981ee2d1bdd (diff) | |
download | ydb-e3f385067226dbe3c7a475438f35a9e1e8032a1c.tar.gz |
PR from branch users/makostrov/remove_mkql_from_json_query
-rw-r--r-- | ydb/core/viewer/json_query.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/ydb/core/viewer/json_query.h b/ydb/core/viewer/json_query.h index ef51e3479d2..4cdc82aaaba 100644 --- a/ydb/core/viewer/json_query.h +++ b/ydb/core/viewer/json_query.h @@ -160,6 +160,7 @@ 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); @@ -473,12 +474,12 @@ private: void MakeOkReply(TStringBuilder& out, NJson::TJsonValue& jsonResponse, NKikimrKqp::TEvQueryResponse& record) { const auto& response = record.GetResponse(); - if (response.ResultsSize() > 0) { + if (response.YdbResultsSize() > 0) { try { - for (const auto& result : response.GetResults()) { - Ydb::ResultSet resultSet; - NKqp::ConvertKqpQueryResultToDbResult(result, &resultSet); - ResultSets.emplace_back(std::move(resultSet)); + for (auto& result : response.GetYdbResults()) { + // Ydb::ResultSet resultSet; + // NKqp::ConvertKqpQueryResultToDbResult(result, &resultSet); + ResultSets.emplace_back(std::move(result)); } } catch (const std::exception& ex) { |