diff options
| author | xenoxeno <xeno@ydb.tech> | 2023-08-17 16:11:14 +0300 |
|---|---|---|
| committer | xenoxeno <xeno@ydb.tech> | 2023-08-17 17:52:25 +0300 |
| commit | b5ebf0f8b199ddf8e17bf6c82e99a60db16e67fe (patch) | |
| tree | 9d86050dd2df2bbf03c765a2faa1fb8e160625ce | |
| parent | 02247a5d08cf5ed33f2db3c2cbfce4b9e4c84bd4 (diff) | |
| download | ydb-b5ebf0f8b199ddf8e17bf6c82e99a60db16e67fe.tar.gz | |
Revert commit rXXXXXX, PR from branch users/makostrov/remove_mkql_from_json_query
| -rw-r--r-- | ydb/core/viewer/json_query.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/ydb/core/viewer/json_query.h b/ydb/core/viewer/json_query.h index 4cdc82aaab..ef51e3479d 100644 --- a/ydb/core/viewer/json_query.h +++ b/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) { |