Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions ydb/core/grpc_services/query/rpc_execute_query.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -409,9 +409,7 @@ class TExecuteQueryRPC : public TActorBootstrapped<TExecuteQueryRPC> {
response.mutable_issues()->CopyFrom(issueMessage);
TString out;
Y_PROTOBUF_SUPPRESS_NODISCARD response.SerializeToString(&out);
const auto finishStreamFlag = NYdbGrpc::IRequestContextBase::EStreamCtrl::FINISH;
Request_->SendSerializedResult(std::move(out), record.GetYdbStatus(), finishStreamFlag);
this->PassAway();
ReplySerializedAndFinishStream(record.GetYdbStatus(), std::move(out));
}
}

Expand All @@ -434,6 +432,12 @@ class TExecuteQueryRPC : public TActorBootstrapped<TExecuteQueryRPC> {
ReplyFinishStream(Ydb::StatusIds::INTERNAL_ERROR, issue);
}

void ReplySerializedAndFinishStream(Ydb::StatusIds::StatusCode status, TString&& buf) {
const auto finishStreamFlag = NYdbGrpc::IRequestContextBase::EStreamCtrl::FINISH;
Request_->SendSerializedResult(std::move(buf), status, finishStreamFlag);
this->PassAway();
}

void ReplyFinishStream(Ydb::StatusIds::StatusCode status, const NYql::TIssue& issue) {
google::protobuf::RepeatedPtrField<TYdbIssueMessageType> issuesMessage;
NYql::IssueToMessage(issue, issuesMessage.Add());
Expand Down