From d6ef09c0f142d651ec0a842abcebcbd7a03344e7 Mon Sep 17 00:00:00 2001 From: Daniil Cherednik Date: Fri, 5 Apr 2024 18:56:29 +0200 Subject: [PATCH] Remove legacy method (#3501) --- ydb/core/grpc_services/base/base.h | 19 ------------------- ydb/core/grpc_services/local_rpc/local_rpc.h | 14 -------------- ydb/core/grpc_services/rpc_deferrable.h | 13 ++++--------- ydb/core/grpc_services/rpc_discovery.cpp | 10 ++++------ .../rpc_execute_scheme_query.cpp | 2 +- ydb/core/grpc_services/rpc_load_rows.cpp | 4 ++-- .../rpc_rollback_transaction.cpp | 5 ++++- ydb/core/grpc_services/rpc_scheme_base.h | 4 ++-- .../kafka_proxy/actors/control_plane_common.h | 8 -------- .../actors/kafka_create_partitions_actor.cpp | 8 -------- ydb/services/persqueue_v1/grpc_pq_read.cpp | 10 ++++++++-- 11 files changed, 25 insertions(+), 72 deletions(-) diff --git a/ydb/core/grpc_services/base/base.h b/ydb/core/grpc_services/base/base.h index 35b8980d503e..66155cce6bdf 100644 --- a/ydb/core/grpc_services/base/base.h +++ b/ydb/core/grpc_services/base/base.h @@ -450,9 +450,6 @@ class IRequestOpCtx : public IRequestCtx { // Legacy, do not use for modern code virtual void SendResult(const google::protobuf::Message& result, Ydb::StatusIds::StatusCode status, const google::protobuf::RepeatedPtrField& message) = 0; - // Legacy, do not use for modern code - virtual void SendResult(Ydb::StatusIds::StatusCode status, - const google::protobuf::RepeatedPtrField& message) = 0; }; class IRequestNoOpCtx : public IRequestCtx { @@ -936,22 +933,6 @@ class TGrpcResponseSenderImpl : public IRequestOpCtx { self->Reply(resp, operation.status()); } - void SendResult(Ydb::StatusIds::StatusCode status, - const google::protobuf::RepeatedPtrField& message) override - { - auto self = Derived(); - self->FinishRequest(); - auto resp = self->CreateResponseMessage(); - auto deferred = resp->mutable_operation(); - deferred->set_ready(true); - deferred->set_status(status); - deferred->mutable_issues()->MergeFrom(message); - if (self->CostInfo) { - deferred->mutable_cost_info()->Swap(self->CostInfo); - } - self->Reply(resp, status); - } - void SendResult(const google::protobuf::Message& result, Ydb::StatusIds::StatusCode status, const google::protobuf::RepeatedPtrField& message) override diff --git a/ydb/core/grpc_services/local_rpc/local_rpc.h b/ydb/core/grpc_services/local_rpc/local_rpc.h index d93b624609b1..1b28bfcb4cf1 100644 --- a/ydb/core/grpc_services/local_rpc/local_rpc.h +++ b/ydb/core/grpc_services/local_rpc/local_rpc.h @@ -121,20 +121,6 @@ class TLocalRpcCtx : public NGRpcService::IRequestOpCtx { CbWrapper(resp); } - void SendResult(Ydb::StatusIds::StatusCode status, - const google::protobuf::RepeatedPtrField& message) override - { - TResp resp; - auto deferred = resp.mutable_operation(); - deferred->set_ready(true); - deferred->set_status(status); - deferred->mutable_issues()->MergeFrom(message); - if (CostInfo) { - deferred->mutable_cost_info()->CopyFrom(*CostInfo); - } - CbWrapper(resp); - } - void SendOperation(const Ydb::Operations::Operation& operation) override { TResp resp; resp.mutable_operation()->CopyFrom(operation); diff --git a/ydb/core/grpc_services/rpc_deferrable.h b/ydb/core/grpc_services/rpc_deferrable.h index 11652e54322c..8de3a317cdd0 100644 --- a/ydb/core/grpc_services/rpc_deferrable.h +++ b/ydb/core/grpc_services/rpc_deferrable.h @@ -202,7 +202,10 @@ class TRpcOperationRequestActor : public TRpcRequestWithOperationParamsActor& message, const TActorContext& ctx) { - Request_->SendResult(status, message); + NYql::TIssues issues; + IssuesFromMessage(message, issues); + Request_->RaiseIssues(issues); + Request_->ReplyWithYdbStatus(status); NWilson::EndSpanWithStatus(Span_, status); this->Die(ctx); } @@ -226,14 +229,6 @@ class TRpcOperationRequestActor : public TRpcRequestWithOperationParamsActorDie(ctx); } - void ReplyWithResult(Ydb::StatusIds::StatusCode status, - const google::protobuf::RepeatedPtrField& message, const TActorContext &ctx) - { - Request_->SendResult(status, message); - NWilson::EndSpanWithStatus(Span_, status); - this->Die(ctx); - } - template void ReplyWithResult(Ydb::StatusIds::StatusCode status, const google::protobuf::RepeatedPtrField& message, diff --git a/ydb/core/grpc_services/rpc_discovery.cpp b/ydb/core/grpc_services/rpc_discovery.cpp index 84c26fe124fe..bfa4adc83056 100644 --- a/ydb/core/grpc_services/rpc_discovery.cpp +++ b/ydb/core/grpc_services/rpc_discovery.cpp @@ -87,9 +87,8 @@ class TListEndpointsRPC : public TActorBootstrapped { Discoverer = {}; auto issue = MakeIssue(ErrorToIssueCode(ev->Get()->Status), ev->Get()->Error); - google::protobuf::RepeatedPtrField issueMessages; - NYql::IssueToMessage(issue, issueMessages.Add()); - Reply(ErrorToStatusCode(ev->Get()->Status), issueMessages); + Request->RaiseIssue(issue); + Reply(ErrorToStatusCode(ev->Get()->Status)); } static NKikimrIssues::TIssuesIds::EIssueCode ErrorToIssueCode(TEvDiscovery::TEvError::EStatus status) { @@ -159,9 +158,8 @@ class TListEndpointsRPC : public TActorBootstrapped { PassAway(); } - template - void Reply(Args&&... args) { - Request->SendResult(std::forward(args)...); + void Reply(Ydb::StatusIds::StatusCode status) { + Request->ReplyWithYdbStatus(status); PassAway(); } }; diff --git a/ydb/core/grpc_services/rpc_execute_scheme_query.cpp b/ydb/core/grpc_services/rpc_execute_scheme_query.cpp index 00a12287f49d..9a3e690da822 100644 --- a/ydb/core/grpc_services/rpc_execute_scheme_query.cpp +++ b/ydb/core/grpc_services/rpc_execute_scheme_query.cpp @@ -84,7 +84,7 @@ class TExecuteSchemeQueryRPC : public TRpcKqpRequestActorSendResult(Ydb::StatusIds::CANCELLED, {}); + Request->ReplyWithYdbStatus(Ydb::StatusIds::CANCELLED); } bool ReportCostInfoEnabled() const { @@ -299,7 +299,7 @@ class TUploadColumnsRPCPublic : public NTxProxy::TUploadRowsBaseSendResult(Ydb::StatusIds::CANCELLED, {}); + Request->ReplyWithYdbStatus(Ydb::StatusIds::CANCELLED); } bool ReportCostInfoEnabled() const { diff --git a/ydb/core/grpc_services/rpc_rollback_transaction.cpp b/ydb/core/grpc_services/rpc_rollback_transaction.cpp index 9d17fa77dd0e..2cc918e0bf0f 100644 --- a/ydb/core/grpc_services/rpc_rollback_transaction.cpp +++ b/ydb/core/grpc_services/rpc_rollback_transaction.cpp @@ -93,7 +93,10 @@ class TRollbackTransactionRPC : public TRpcKqpRequestActor& message, const TActorContext& ctx) { - Request_->SendResult(status, message); + NYql::TIssues issues; + IssuesFromMessage(message, issues); + Request_->RaiseIssues(issues); + Request_->ReplyWithYdbStatus(status); Die(ctx); } }; diff --git a/ydb/core/grpc_services/rpc_scheme_base.h b/ydb/core/grpc_services/rpc_scheme_base.h index d8d14c2147f4..743b253d6299 100644 --- a/ydb/core/grpc_services/rpc_scheme_base.h +++ b/ydb/core/grpc_services/rpc_scheme_base.h @@ -60,9 +60,9 @@ class TRpcSchemeRequestActor : public TRpcOperationRequestActorReplyWithResult(ydbStatus, issueMessage, ctx); + return this->Reply(ydbStatus, issueMessage, ctx); } - + ui64 schemeShardTabletId = msg->Record.GetSchemeShardTabletId(); auto request = std::make_unique(msg->Record.GetTxId()); SetSchemeShardId(schemeShardTabletId); diff --git a/ydb/core/kafka_proxy/actors/control_plane_common.h b/ydb/core/kafka_proxy/actors/control_plane_common.h index 22bf12d99239..597d808a269e 100644 --- a/ydb/core/kafka_proxy/actors/control_plane_common.h +++ b/ydb/core/kafka_proxy/actors/control_plane_common.h @@ -351,14 +351,6 @@ class TKafkaTopicModificationRequest : public NKikimr::NGRpcService::IRequestOpC ProcessYdbStatusCode(status); }; - void SendResult( - Ydb::StatusIds::StatusCode status, - const google::protobuf::RepeatedPtrField& message) override { - - Y_UNUSED(message); - ProcessYdbStatusCode(status); - }; - const Ydb::Operations::OperationParams& operation_params() const { return DummyParams; } diff --git a/ydb/core/kafka_proxy/actors/kafka_create_partitions_actor.cpp b/ydb/core/kafka_proxy/actors/kafka_create_partitions_actor.cpp index 6a000153eae9..6e13bd61cc7a 100644 --- a/ydb/core/kafka_proxy/actors/kafka_create_partitions_actor.cpp +++ b/ydb/core/kafka_proxy/actors/kafka_create_partitions_actor.cpp @@ -184,14 +184,6 @@ class TKafkaCreatePartitionsRequest : public NKikimr::NGRpcService::IRequestOpCt ProcessYdbStatusCode(status); }; - void SendResult( - Ydb::StatusIds::StatusCode status, - const google::protobuf::RepeatedPtrField& message) override { - - Y_UNUSED(message); - ProcessYdbStatusCode(status); - }; - const Ydb::Operations::OperationParams& operation_params() const { return DummyParams; } diff --git a/ydb/services/persqueue_v1/grpc_pq_read.cpp b/ydb/services/persqueue_v1/grpc_pq_read.cpp index ff92306325c5..d4d88a3dd916 100644 --- a/ydb/services/persqueue_v1/grpc_pq_read.cpp +++ b/ydb/services/persqueue_v1/grpc_pq_read.cpp @@ -175,7 +175,10 @@ void TPQReadService::Handle(NGRpcService::TEvCommitOffsetRequest::TPtr& ev, cons if (HaveClusters && (Clusters.empty() || LocalCluster.empty())) { LOG_INFO_S(ctx, NKikimrServices::PQ_READ_PROXY, "new commit offset request failed - cluster is not known yet"); - ev->Get()->SendResult(ConvertPersQueueInternalCodeToStatus(PersQueue::ErrorCode::INITIALIZING), FillInfoResponse("cluster initializing", PersQueue::ErrorCode::INITIALIZING)); //CANCELLED + NYql::TIssues issues; + IssuesFromMessage(FillInfoResponse("cluster initializing", PersQueue::ErrorCode::INITIALIZING), issues); //CANCELLED + ev->Get()->RaiseIssues(issues); + ev->Get()->ReplyWithYdbStatus(ConvertPersQueueInternalCodeToStatus(PersQueue::ErrorCode::INITIALIZING)); return; } else { ctx.Register(new TCommitOffsetActor(ev->Release().Release(), *TopicsHandler, SchemeCache, NewSchemeCache, Counters)); @@ -189,7 +192,10 @@ void TPQReadService::Handle(NGRpcService::TEvPQReadInfoRequest::TPtr& ev, const if (HaveClusters && (Clusters.empty() || LocalCluster.empty())) { LOG_INFO_S(ctx, NKikimrServices::PQ_READ_PROXY, "new read info request failed - cluster is not known yet"); - ev->Get()->SendResult(ConvertPersQueueInternalCodeToStatus(PersQueue::ErrorCode::INITIALIZING), FillInfoResponse("cluster initializing", PersQueue::ErrorCode::INITIALIZING)); //CANCELLED + NYql::TIssues issues; + IssuesFromMessage(FillInfoResponse("cluster initializing", PersQueue::ErrorCode::INITIALIZING), issues); //CANCELLED + ev->Get()->RaiseIssues(issues); + ev->Get()->ReplyWithYdbStatus(ConvertPersQueueInternalCodeToStatus(PersQueue::ErrorCode::INITIALIZING)); return; } else { //ctx.Register(new TReadInfoActor(ev->Release().Release(), Clusters, LocalCluster, SchemeCache, NewSchemeCache, Counters));