Remove legacy method (ydb-platform#3501)

dcherednik · Apr 5, 2024 · d6ef09c · d6ef09c
1 parent 8594ffc
commit d6ef09c
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 72 deletions.
diff --git 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<TYdbIssueMessageType>& message) = 0;
-    // Legacy, do not use for modern code
-    virtual void SendResult(Ydb::StatusIds::StatusCode status,
-        const google::protobuf::RepeatedPtrField<TYdbIssueMessageType>& 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<TYdbIssueMessageType>& 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<TYdbIssueMessageType>& message) override

diff --git 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<NGRpcService::TYdbIssueMessageType>& 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
@@ -202,7 +202,10 @@ class TRpcOperationRequestActor : public TRpcRequestWithOperationParamsActor<TDe
     void Reply(Ydb::StatusIds::StatusCode status,
         const google::protobuf::RepeatedPtrField<TYdbIssueMessageType>& 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 TRpcRequestWithOperationParamsActor<TDe
         this->Die(ctx);
     }
 
-    void ReplyWithResult(Ydb::StatusIds::StatusCode status,
-        const google::protobuf::RepeatedPtrField<TYdbIssueMessageType>& message, const TActorContext &ctx)
-    {
-        Request_->SendResult(status, message);
-        NWilson::EndSpanWithStatus(Span_, status);
-        this->Die(ctx);
-    }
-
     template<typename TResult>
     void ReplyWithResult(Ydb::StatusIds::StatusCode status,
         const google::protobuf::RepeatedPtrField<TYdbIssueMessageType>& message,

diff --git a/ydb/core/grpc_services/rpc_discovery.cpp b/ydb/core/grpc_services/rpc_discovery.cpp
@@ -87,9 +87,8 @@ class TListEndpointsRPC : public TActorBootstrapped<TListEndpointsRPC> {
         Discoverer = {};
 
         auto issue = MakeIssue(ErrorToIssueCode(ev->Get()->Status), ev->Get()->Error);
-        google::protobuf::RepeatedPtrField<TYdbIssueMessageType> 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<TListEndpointsRPC> {
         PassAway();
     }
 
-    template <typename... Args>
-    void Reply(Args&&... args) {
-        Request->SendResult(std::forward<Args>(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
@@ -84,7 +84,7 @@ class TExecuteSchemeQueryRPC : public TRpcKqpRequestActor<TExecuteSchemeQueryRPC
             const auto& kqpResponse = record.GetResponse();
             const auto& issueMessage = kqpResponse.GetQueryIssues();
 
-            ReplyWithResult(Ydb::StatusIds::SUCCESS, issueMessage, ctx);
+            Reply(Ydb::StatusIds::SUCCESS, issueMessage, ctx);
         } else {
             return OnGenericQueryResponseError(record, ctx);
         }

diff --git a/ydb/core/grpc_services/rpc_load_rows.cpp b/ydb/core/grpc_services/rpc_load_rows.cpp
@@ -132,7 +132,7 @@ class TUploadRowsRPCPublic : public NTxProxy::TUploadRowsBase<NKikimrServices::T
 
     void OnBeforePoison(const TActorContext&) override {
         // Client is gone, but we need to "reply" anyway?
-        Request->SendResult(Ydb::StatusIds::CANCELLED, {});
+        Request->ReplyWithYdbStatus(Ydb::StatusIds::CANCELLED);
     }
 
     bool ReportCostInfoEnabled() const {
@@ -299,7 +299,7 @@ class TUploadColumnsRPCPublic : public NTxProxy::TUploadRowsBase<NKikimrServices
 
     void OnBeforePoison(const TActorContext&) override {
         // Client is gone, but we need to "reply" anyway?
-        Request->SendResult(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
@@ -93,7 +93,10 @@ class TRollbackTransactionRPC : public TRpcKqpRequestActor<TRollbackTransactionR
     void ReplyWithResult(StatusIds::StatusCode status,
                          const google::protobuf::RepeatedPtrField<TYdbIssueMessageType>& 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
@@ -60,9 +60,9 @@ class TRpcSchemeRequestActor : public TRpcOperationRequestActor<TDerived, TReque
 
         Ydb::StatusIds::StatusCode ydbStatus = NKikimr::YdbStatusFromProxyStatus(msg);
         if (!NKikimr::IsTxProxyInProgress(ydbStatus)) {
-            return this->ReplyWithResult(ydbStatus, issueMessage, ctx);
+            return this->Reply(ydbStatus, issueMessage, ctx);
         }
-    
+
         ui64 schemeShardTabletId = msg->Record.GetSchemeShardTabletId();
         auto request = std::make_unique<NSchemeShard::TEvSchemeShard::TEvNotifyTxCompletion>(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
@@ -351,14 +351,6 @@ class TKafkaTopicModificationRequest : public NKikimr::NGRpcService::IRequestOpC
         ProcessYdbStatusCode(status);
     };
 
-    void SendResult(
-            Ydb::StatusIds::StatusCode status,
-            const google::protobuf::RepeatedPtrField<NKikimr::NGRpcService::TYdbIssueMessageType>& 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
@@ -184,14 +184,6 @@ class TKafkaCreatePartitionsRequest : public NKikimr::NGRpcService::IRequestOpCt
         ProcessYdbStatusCode(status);
     };
 
-    void SendResult(
-            Ydb::StatusIds::StatusCode status,
-            const google::protobuf::RepeatedPtrField<NKikimr::NGRpcService::TYdbIssueMessageType>& 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
@@ -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));