Skip to content

Commit fbe6aca

Browse files
dcherednikdcherednik
authored
[refactoring] Get rid of "GetPeer()" grpc request implementation copy paste and unused functions (#9814)
1 parent 5dc2621 commit fbe6aca

File tree

14 files changed

+25
-82
lines changed

14 files changed

+25
-82
lines changed

‎ydb/core/client/server/grpc_server.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ class TSimpleRequest
239239
}
240240

241241
TString GetPeer() const override {
242-
return GetPeerName();
242+
return TGrpcBaseAsyncContext::GetPeer();
243243
}
244244

245245
TVector<TStringBuf> FindClientCert() const override {
@@ -253,7 +253,7 @@ class TSimpleRequest
253253

254254
void Finish(const TOut& resp, ui32 status) {
255255
LOG_DEBUG(ActorSystem, NKikimrServices::GRPC_SERVER, "[%p] issuing response Name# %s data# %s peer# %s", this,
256-
Name, NYdbGrpc::FormatMessage<TOut>(resp).data(), GetPeerName().c_str());
256+
Name, NYdbGrpc::FormatMessage<TOut>(resp).data(), GetPeer().c_str());
257257
ResponseSize = resp.ByteSize();
258258
ResponseStatus = status;
259259
StateFunc = &TSimpleRequest::FinishDone;
@@ -266,7 +266,7 @@ class TSimpleRequest
266266
TOut resp;
267267
TString msg = "no resource";
268268
LOG_DEBUG(ActorSystem, NKikimrServices::GRPC_SERVER, "[%p] issuing response Name# %s nodata (no resources) peer# %s", this,
269-
Name, GetPeerName().c_str());
269+
Name, GetPeer().c_str());
270270

271271
StateFunc = &TSimpleRequest::FinishDoneWithoutProcessing;
272272
OnBeforeCall();
@@ -280,7 +280,7 @@ class TSimpleRequest
280280
OnAfterCall();
281281

282282
LOG_DEBUG(ActorSystem, NKikimrServices::GRPC_SERVER, "[%p] received request Name# %s ok# %s data# %s peer# %s current inflight# %li", this,
283-
Name, ok ? "true" : "false", NYdbGrpc::FormatMessage<TIn>(Request, ok).data(), GetPeerName().c_str(), Server->GetCurrentInFlight());
283+
Name, ok ? "true" : "false", NYdbGrpc::FormatMessage<TIn>(Request, ok).data(), GetPeer().c_str(), Server->GetCurrentInFlight());
284284

285285
if (Context.c_call() == nullptr) {
286286
Y_ABORT_UNLESS(!ok);
@@ -318,7 +318,7 @@ class TSimpleRequest
318318
bool FinishDone(bool ok) {
319319
OnAfterCall();
320320
LOG_DEBUG(ActorSystem, NKikimrServices::GRPC_SERVER, "[%p] finished request Name# %s ok# %s peer# %s", this,
321-
Name, ok ? "true" : "false", GetPeerName().c_str());
321+
Name, ok ? "true" : "false", GetPeer().c_str());
322322
Counters->FinishProcessing(RequestSize, ResponseSize, ok, ResponseStatus,
323323
TDuration::Seconds(RequestTimer.Passed()));
324324
Server->DecRequest();
@@ -330,7 +330,7 @@ class TSimpleRequest
330330
bool FinishDoneWithoutProcessing(bool ok) {
331331
OnAfterCall();
332332
LOG_DEBUG(ActorSystem, NKikimrServices::GRPC_SERVER, "[%p] finished request without processing Name# %s ok# %s peer# %s", this,
333-
Name, ok ? "true" : "false", GetPeerName().c_str());
333+
Name, ok ? "true" : "false", GetPeer().c_str());
334334

335335
return false;
336336
}

‎ydb/core/grpc_services/base/base.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,6 @@ class IRequestCtx
439439
friend class TProtoResponseHelper;
440440
public:
441441
using EStreamCtrl = NYdbGrpc::IRequestContextBase::EStreamCtrl;
442-
virtual google::protobuf::Message* GetRequestMut() = 0;
443442

444443
virtual void SetRuHeader(ui64 ru) = 0;
445444
virtual void AddServerHint(const TString& hint) = 0;
@@ -1166,13 +1165,6 @@ class TGRpcRequestWrapperImpl
11661165
return request;
11671166
}
11681167

1169-
template <typename T>
1170-
static TRequest* GetProtoRequestMut(const T& req) {
1171-
auto request = dynamic_cast<TRequest*>(req->GetRequestMut());
1172-
Y_ABORT_UNLESS(request != nullptr, "Wrong using of TGRpcRequestWrapper");
1173-
return request;
1174-
}
1175-
11761168
const TRequest* GetProtoRequest() const {
11771169
return GetProtoRequest(this);
11781170
}
@@ -1272,10 +1264,6 @@ class TGRpcRequestWrapperImpl
12721264
return Ctx_->GetRequest();
12731265
}
12741266

1275-
google::protobuf::Message* GetRequestMut() override {
1276-
return Ctx_->GetRequestMut();
1277-
}
1278-
12791267
void SetRespHook(TRespHook&& hook) override {
12801268
RespHook = std::move(hook);
12811269
}

‎ydb/core/grpc_services/local_grpc/local_grpc.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,6 @@ class TContext
130130
return &Request_;
131131
}
132132

133-
//! Get mutable pointer to the request's message.
134-
NProtoBuf::Message* GetRequestMut() override {
135-
return &Request_;
136-
}
137-
138133
void Reply(NProtoBuf::Message* proto, ui32 status = 0) override {
139134
Y_UNUSED(status);
140135
TResp* resp = dynamic_cast<TResp*>(proto);

‎ydb/core/grpc_services/local_rpc/local_rpc.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -196,10 +196,6 @@ class TLocalRpcCtx : public TLocalRpcCtxImpl<TRpc, TCbWrapper, IsOperation> {
196196
return &Request;
197197
}
198198

199-
google::protobuf::Message* GetRequestMut() override {
200-
return &Request;
201-
}
202-
203199
void SetFinishAction(std::function<void()>&&) override {}
204200

205201
bool IsClientLost() const override { return false; }
@@ -417,10 +413,6 @@ class TStreamReadProcessor : public NGRpcService::NLocalGrpc::TContextBase {
417413
return GetBaseRequest().GetRequest();
418414
}
419415

420-
NProtoBuf::Message* GetRequestMut() override {
421-
return GetBaseRequest().GetRequestMut();
422-
}
423-
424416
TAsyncFinishResult GetFinishFuture() override {
425417
return FinishPromise.GetFuture();
426418
}

‎ydb/core/grpc_services/rpc_deferrable.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,6 @@ class TRpcRequestWithOperationParamsActor : public TActorBootstrapped<TDerived>
6464
return TRequest::GetProtoRequest(Request_);
6565
}
6666

67-
typename TRequest::TRequest* GetProtoRequestMut() {
68-
return TRequest::GetProtoRequestMut(Request_);
69-
}
70-
7167
Ydb::Operations::OperationParams::OperationMode GetOperationMode() const {
7268
return GetProtoRequest()->operation_params().operation_mode();
7369
}

‎ydb/core/grpc_services/ydb_over_fq/rpc_base.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,6 @@ class TRpcStreamingBase : public TActorBootstrapped<TDerived> {
7171
return TReq::GetProtoRequest(Request_);
7272
}
7373

74-
TRequest* GetProtoRequestMut() noexcept {
75-
return TReq::GetProtoRequestMut(Request_);
76-
}
77-
7874
IRequestNoOpCtx& Request() noexcept { return *Request_; }
7975

8076
private:

‎ydb/core/grpc_streaming/grpc_streaming.h

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ class TGRpcStreamingRequest final
224224
LOG_DEBUG(ActorSystem, LoggerServiceId, "[%p] stream accepted Name# %s ok# %s peer# %s",
225225
this, Name,
226226
status == NYdbGrpc::EQueueEventStatus::OK ? "true" : "false",
227-
this->GetPeerName().c_str());
227+
this->GetPeer().c_str());
228228

229229
if (status == NYdbGrpc::EQueueEventStatus::ERROR) {
230230
// Don't bother registering if accept failed
@@ -265,7 +265,7 @@ class TGRpcStreamingRequest final
265265
LOG_DEBUG(ActorSystem, LoggerServiceId, "[%p] stream done notification Name# %s ok# %s peer# %s",
266266
this, Name,
267267
status == NYdbGrpc::EQueueEventStatus::OK ? "true" : "false",
268-
this->GetPeerName().c_str());
268+
this->GetPeer().c_str());
269269

270270
bool success = status == NYdbGrpc::EQueueEventStatus::OK;
271271

@@ -285,7 +285,7 @@ class TGRpcStreamingRequest final
285285
void Cancel() {
286286
LOG_DEBUG(ActorSystem, LoggerServiceId, "[%p] facade cancel Name# %s peer# %s",
287287
this, Name,
288-
this->GetPeerName().c_str());
288+
this->GetPeer().c_str());
289289

290290
this->Context.TryCancel();
291291
}
@@ -298,7 +298,7 @@ class TGRpcStreamingRequest final
298298
LOG_DEBUG(ActorSystem, LoggerServiceId, "[%p] facade attach Name# %s actor# %s peer# %s",
299299
this, Name,
300300
actor.ToString().c_str(),
301-
this->GetPeerName().c_str());
301+
this->GetPeer().c_str());
302302

303303
auto guard = SingleThreaded.Enforce();
304304

@@ -322,7 +322,7 @@ class TGRpcStreamingRequest final
322322
bool Read() {
323323
LOG_DEBUG(ActorSystem, LoggerServiceId, "[%p] facade read Name# %s peer# %s",
324324
this, Name,
325-
this->GetPeerName().c_str());
325+
this->GetPeer().c_str());
326326

327327
auto guard = SingleThreaded.Enforce();
328328

@@ -350,7 +350,7 @@ class TGRpcStreamingRequest final
350350
this, Name,
351351
status == NYdbGrpc::EQueueEventStatus::OK ? "true" : "false",
352352
NYdbGrpc::FormatMessage<TIn>(ReadInProgress->Record, status == NYdbGrpc::EQueueEventStatus::OK).c_str(),
353-
this->GetPeerName().c_str());
353+
this->GetPeer().c_str());
354354

355355
// Take current in-progress read first
356356
auto read = std::move(ReadInProgress);
@@ -373,7 +373,7 @@ class TGRpcStreamingRequest final
373373
Y_DEBUG_ABORT_UNLESS(flags & FlagFinishCalled);
374374
if (Flags.compare_exchange_weak(flags, flags & ~FlagRegistered, std::memory_order_acq_rel)) {
375375
LOG_DEBUG(ActorSystem, LoggerServiceId, "[%p] deregistering request Name# %s peer# %s (read done)",
376-
this, Name, this->GetPeerName().c_str());
376+
this, Name, this->GetPeer().c_str());
377377
Server->DeregisterRequestCtx(this);
378378
break;
379379
}
@@ -391,14 +391,14 @@ class TGRpcStreamingRequest final
391391
LOG_DEBUG(ActorSystem, LoggerServiceId, "[%p] facade write Name# %s data# %s peer# %s grpc status# (%d) message# %s",
392392
this, Name,
393393
NYdbGrpc::FormatMessage<TOut>(message).c_str(),
394-
this->GetPeerName().c_str(),
394+
this->GetPeer().c_str(),
395395
static_cast<int>(status->error_code()),
396396
status->error_message().c_str());
397397
} else {
398398
LOG_DEBUG(ActorSystem, LoggerServiceId, "[%p] facade write Name# %s data# %s peer# %s",
399399
this, Name,
400400
NYdbGrpc::FormatMessage<TOut>(message).c_str(),
401-
this->GetPeerName().c_str());
401+
this->GetPeer().c_str());
402402
}
403403

404404
Y_ABORT_UNLESS(!options.is_corked(),
@@ -453,7 +453,7 @@ class TGRpcStreamingRequest final
453453
LOG_DEBUG(ActorSystem, LoggerServiceId, "[%p] write finished Name# %s ok# %s peer# %s",
454454
this, Name,
455455
status == NYdbGrpc::EQueueEventStatus::OK ? "true" : "false",
456-
this->GetPeerName().c_str());
456+
this->GetPeer().c_str());
457457

458458
auto event = MakeHolder<typename IContext::TEvWriteFinished>();
459459
event->Success = status == NYdbGrpc::EQueueEventStatus::OK;
@@ -506,7 +506,7 @@ class TGRpcStreamingRequest final
506506
bool Finish(const grpc::Status& status) {
507507
LOG_DEBUG(ActorSystem, LoggerServiceId, "[%p] facade finish Name# %s peer# %s grpc status# (%d) message# %s",
508508
this, Name,
509-
this->GetPeerName().c_str(),
509+
this->GetPeer().c_str(),
510510
static_cast<int>(status.error_code()),
511511
status.error_message().c_str());
512512

@@ -542,7 +542,7 @@ class TGRpcStreamingRequest final
542542
LOG_DEBUG(ActorSystem, LoggerServiceId, "[%p] stream finished Name# %s ok# %s peer# %s grpc status# (%d) message# %s",
543543
this, Name,
544544
status == NYdbGrpc::EQueueEventStatus::OK ? "true" : "false",
545-
this->GetPeerName().c_str(),
545+
this->GetPeer().c_str(),
546546
static_cast<int>(Status->error_code()),
547547
Status->error_message().c_str());
548548

@@ -577,7 +577,7 @@ class TGRpcStreamingRequest final
577577
while ((flags & FlagRegistered) && ReadQueue.load() == 0) {
578578
if (Flags.compare_exchange_weak(flags, flags & ~FlagRegistered, std::memory_order_acq_rel)) {
579579
LOG_DEBUG(ActorSystem, LoggerServiceId, "[%p] deregistering request Name# %s peer# %s (finish done)",
580-
this, Name, this->GetPeerName().c_str());
580+
this, Name, this->GetPeer().c_str());
581581
Server->DeregisterRequestCtx(this);
582582
break;
583583
}
@@ -646,7 +646,7 @@ class TGRpcStreamingRequest final
646646
}
647647

648648
TString GetPeerName() const override {
649-
return Self->GetPeerName();
649+
return Self->GetPeer();
650650
}
651651

652652
TVector<TStringBuf> GetPeerMetaValues(TStringBuf key) const override {

‎ydb/core/kafka_proxy/actors/control_plane_common.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -292,10 +292,6 @@ class TKafkaTopicModificationRequest : public NKikimr::NGRpcService::IRequestOpC
292292
return DummyAuditLogParts;
293293
};
294294

295-
google::protobuf::Message* GetRequestMut() override {
296-
return nullptr;
297-
};
298-
299295
void SetRuHeader(ui64 ru) override {
300296
Y_UNUSED(ru);
301297
};

‎ydb/core/kafka_proxy/actors/kafka_create_partitions_actor.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,6 @@ class TKafkaCreatePartitionsRequest : public NKikimr::NGRpcService::IRequestOpCt
127127
return DummyAuditLogParts;
128128
};
129129

130-
google::protobuf::Message* GetRequestMut() override {
131-
return nullptr;
132-
};
133-
134130
void SetRuHeader(ui64 ru) override {
135131
Y_UNUSED(ru);
136132
};

‎ydb/core/public_http/grpc_request_context_wrapper.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ namespace NKikimr::NPublicHttp {
1919
return Request.get();
2020
}
2121

22-
NProtoBuf::Message* TGrpcRequestContextWrapper::GetRequestMut() {
23-
return Request.get();
24-
}
25-
2622
NYdbGrpc::TAuthState& TGrpcRequestContextWrapper::GetAuthState() {
2723
return AuthState;
2824
}

0 commit comments

Comments
 (0)