@@ -227,7 +227,7 @@ class TKqpScanQueryRequestHandler : public TRequestHandlerBase<
227227 void HandleResponse (typename TResponse::TPtr &ev, const TActorContext &ctx) {
228228 auto & response = *ev->Get ()->Record .GetRef ().MutableResponse ();
229229
230- NKikimr::ConvertYdbResultToKqpResult (ResultSet,* response.AddResults () );
230+ response.AddYdbResults ()-> CopyFrom (ResultSet );
231231 for (auto & execStats : Executions) {
232232 response.MutableQueryStats ()->AddExecutions ()->Swap (&execStats);
233233 }
@@ -286,20 +286,18 @@ class TKqpStreamRequestHandler : public TRequestHandlerBase<
286286 virtual void HandleResponse (typename TResponse::TPtr &ev, const TActorContext &ctx) {
287287 auto & record = ev->Get ()->Record .GetRef ();
288288 if (record.GetYdbStatus () == Ydb::StatusIds::SUCCESS) {
289- if (record.MutableResponse ()->GetResults ().size ()) {
289+ if (record.MutableResponse ()->GetYdbResults ().size ()) {
290290 // Send result sets to RPC actor TStreamExecuteYqlScriptRPC
291291 auto evStreamPart = MakeHolder<NKqp::TEvKqp::TEvDataQueryStreamPart>();
292292 ActorIdToProto (this ->SelfId (), evStreamPart->Record .MutableGatewayActorId ());
293293
294- for (int i = 0 ; i < record.MutableResponse ()->MutableResults ()->size (); ++i) {
294+ for (int i = 0 ; i < record.MutableResponse ()->MutableYdbResults ()->size (); ++i) {
295295 // Workaround to avoid errors on Pull execution stage which would expect some results
296- Ydb::ResultSet resultSet;
297- NKikimr::ConvertYdbResultToKqpResult (resultSet, *evStreamPart->Record .AddResults ());
296+ evStreamPart->Record .AddResults ();
298297 }
299298
300- evStreamPart->Record .MutableResults ()->Swap (record.MutableResponse ()->MutableResults ());
299+ evStreamPart->Record .MutableResults ()->Swap (record.MutableResponse ()->MutableYdbResults ());
301300 this ->Send (TargetActorId, evStreamPart.Release ());
302-
303301 // Save response without data to send it later
304302 ResponseHandle = ev.Release ();
305303 } else {
@@ -405,7 +403,7 @@ class TKqpForwardStreamRequestHandler : public TRequestHandlerBase<
405403 auto & response = *ev->Get ()->Record .GetRef ().MutableResponse ();
406404
407405 Ydb::ResultSet resultSet;
408- NKikimr::ConvertYdbResultToKqpResult (resultSet, * response.AddResults () );
406+ response.AddYdbResults ()-> CopyFrom (resultSet );
409407 for (auto & execStats : Executions) {
410408 response.MutableQueryStats ()->AddExecutions ()->Swap (&execStats);
411409 }
@@ -511,7 +509,7 @@ class TKqpGenericQueryRequestHandler: public TRequestHandlerBase<
511509 auto & response = *ev->Get ()->Record .GetRef ().MutableResponse ();
512510
513511 for (auto & resultSet : ResultSets) {
514- ConvertYdbResultToKqpResult ( std::move ( resultSet.ResultSet ), *response. AddResults () );
512+ response. AddYdbResults ()-> Swap (& resultSet.ResultSet );
515513 }
516514
517515 TBase::HandleResponse (ev, ctx);
@@ -672,8 +670,8 @@ void KqpResponseToQueryResult(const NKikimrKqp::TEvQueryResponse& response, IKqp
672670 queryResult.AddIssue (NYql::IssueFromMessage (issue));
673671 }
674672
675- for (auto & result : queryResponse.GetResults ()) {
676- auto arenaResult = google::protobuf::Arena::CreateMessage<NKikimrMiniKQL::TResult >(
673+ for (auto & result : queryResponse.GetYdbResults ()) {
674+ auto arenaResult = google::protobuf::Arena::CreateMessage<Ydb::ResultSet >(
677675 queryResult.ProtobufArenaPtr .get ());
678676
679677 arenaResult->CopyFrom (result);
@@ -1419,11 +1417,11 @@ class TKikimrIcGateway : public IKqpGateway {
14191417 if (!CheckCluster (cluster)) {
14201418 return InvalidCluster<TGenericResult>(cluster);
14211419 }
1422-
1420+
14231421 auto analyzePromise = NewPromise<TGenericResult>();
14241422 IActor* analyzeActor = new TAnalyzeActor (settings.TablePath , settings.Columns , analyzePromise);
14251423 RegisterActor (analyzeActor);
1426-
1424+
14271425 return analyzePromise.GetFuture ();
14281426 } catch (yexception& e) {
14291427 return MakeFuture (ResultFromException<TGenericResult>(e));
@@ -1995,7 +1993,7 @@ class TKikimrIcGateway : public IKqpGateway {
19951993 }
19961994
19971995 TFuture<TQueryResult> ExecDataQueryAst (const TString& cluster, const TString& query, TQueryData::TPtr params,
1998- const TAstQuerySettings& settings, const Ydb::Table::TransactionSettings& txSettings,
1996+ const TAstQuerySettings& settings, const Ydb::Table::TransactionSettings& txSettings,
19991997 const TMaybe<TString>& traceId) override
20001998 {
20011999 YQL_ENSURE (cluster == Cluster);
@@ -2075,7 +2073,7 @@ class TKikimrIcGateway : public IKqpGateway {
20752073 }
20762074
20772075 TFuture<TQueryResult> ExecGenericQuery (const TString& cluster, const TString& query, TQueryData::TPtr params,
2078- const TAstQuerySettings& settings, const Ydb::Table::TransactionSettings& txSettings,
2076+ const TAstQuerySettings& settings, const Ydb::Table::TransactionSettings& txSettings,
20792077 const TMaybe<TString>& traceId) override
20802078 {
20812079 YQL_ENSURE (cluster == Cluster);
0 commit comments