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