Skip to content

Commit f9fffcf

Browse files
UgnineSirdisUgnineSirdis
committed
Refactor KQP
1 parent a40175a commit f9fffcf

27 files changed

+66
-66
lines changed

‎ydb/core/grpc_services/query/rpc_execute_script.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class TExecuteScriptRPC : public TRpcRequestActor<TExecuteScriptRPC, TEvExecuteS
137137
SetAuthToken(ev, *Request);
138138
SetDatabase(ev, *Request);
139139
SetRlPath(ev, *Request);
140-
ev->Record.SetPeerName(Request->GetPeerName());
140+
ev->Record.MutableRequest()->SetClientAddress(Request->GetPeerName());
141141

142142
if (traceId) {
143143
ev->Record.SetTraceId(traceId.GetRef());

‎ydb/core/grpc_services/query/rpc_kqp_tx.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ class TBeginTransactionRPC : public TActorBootstrapped<TBeginTransactionRPC> {
6868
auto ev = MakeHolder<NKqp::TEvKqp::TEvQueryRequest>();
6969
SetAuthToken(ev, *Request);
7070
SetDatabase(ev, *Request);
71-
ev->Record.SetPeerName(Request->GetPeerName());
71+
ev->Record.MutableRequest()->SetClientAddress(Request->GetPeerName());
7272

7373
if (CheckSession(req->session_id(), Request.get())) {
7474
ev->Record.MutableRequest()->SetSessionId(req->session_id());
@@ -190,7 +190,7 @@ class TFinishTransactionRPC : public TActorBootstrapped<TFinishTransactionRPC>
190190
auto ev = MakeHolder<NKqp::TEvKqp::TEvQueryRequest>();
191191
SetAuthToken(ev, *Request);
192192
SetDatabase(ev, *Request);
193-
ev->Record.SetPeerName(Request->GetPeerName());
193+
ev->Record.MutableRequest()->SetClientAddress(Request->GetPeerName());
194194

195195
const auto& [sessionId, txId] = GetReqData();
196196

‎ydb/core/grpc_services/rpc_begin_transaction.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class TBeginTransactionRPC : public TRpcKqpRequestActor<TBeginTransactionRPC, TE
5656
auto ev = MakeHolder<NKqp::TEvKqp::TEvQueryRequest>();
5757
SetAuthToken(ev, *Request_);
5858
SetDatabase(ev, *Request_);
59-
ev->Record.SetPeerName(Request_->GetPeerName());
59+
ev->Record.MutableRequest()->SetClientAddress(Request_->GetPeerName());
6060

6161
if (CheckSession(req->session_id(), Request_.get())) {
6262
ev->Record.MutableRequest()->SetSessionId(req->session_id());

‎ydb/core/grpc_services/rpc_commit_transaction.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class TCommitTransactionRPC : public TRpcKqpRequestActor<TCommitTransactionRPC,
5454
auto ev = MakeHolder<NKqp::TEvKqp::TEvQueryRequest>();
5555
SetAuthToken(ev, *Request_);
5656
SetDatabase(ev, *Request_);
57-
ev->Record.SetPeerName(Request_->GetPeerName());
57+
ev->Record.MutableRequest()->SetClientAddress(Request_->GetPeerName());
5858

5959
if (CheckSession(req->session_id(), Request_.get())) {
6060
ev->Record.MutableRequest()->SetSessionId(req->session_id());

‎ydb/core/grpc_services/rpc_execute_scheme_query.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class TExecuteSchemeQueryRPC : public TRpcKqpRequestActor<TExecuteSchemeQueryRPC
5050
auto ev = MakeHolder<NKqp::TEvKqp::TEvQueryRequest>();
5151
SetAuthToken(ev, *Request_);
5252
SetDatabase(ev, *Request_);
53-
ev->Record.SetPeerName(Request_->GetPeerName());
53+
ev->Record.MutableRequest()->SetClientAddress(Request_->GetPeerName());
5454

5555
if (CheckSession(req->session_id(), Request_.get())) {
5656
ev->Record.MutableRequest()->SetSessionId(req->session_id());

‎ydb/core/grpc_services/rpc_explain_data_query.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class TExplainDataQueryRPC : public TRpcKqpRequestActor<TExplainDataQueryRPC, TE
5050
auto ev = MakeHolder<NKqp::TEvKqp::TEvQueryRequest>();
5151
SetAuthToken(ev, *Request_);
5252
SetDatabase(ev, *Request_);
53-
ev->Record.SetPeerName(Request_->GetPeerName());
53+
ev->Record.MutableRequest()->SetClientAddress(Request_->GetPeerName());
5454

5555
if (traceId) {
5656
ev->Record.SetTraceId(traceId.GetRef());

‎ydb/core/grpc_services/rpc_explain_yql_script.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class TExplainYqlScriptRPC : public TRpcKqpRequestActor<TExplainYqlScriptRPC, TE
4242
auto ev = MakeHolder<NKqp::TEvKqp::TEvQueryRequest>();
4343
SetAuthToken(ev, *Request_);
4444
SetDatabase(ev, *Request_);
45-
ev->Record.SetPeerName(Request_->GetPeerName());
45+
ev->Record.MutableRequest()->SetClientAddress(Request_->GetPeerName());
4646

4747
if (traceId) {
4848
ev->Record.SetTraceId(traceId.GetRef());

‎ydb/core/grpc_services/rpc_prepare_data_query.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class TPrepareDataQueryRPC : public TRpcKqpRequestActor<TPrepareDataQueryRPC, TE
5454
auto ev = MakeHolder<NKqp::TEvKqp::TEvQueryRequest>();
5555
SetAuthToken(ev, *Request_);
5656
SetDatabase(ev, *Request_);
57-
ev->Record.SetPeerName(Request_->GetPeerName());
57+
ev->Record.MutableRequest()->SetClientAddress(Request_->GetPeerName());
5858

5959
AuditContextAppend(Request_.get(), *req);
6060

‎ydb/core/grpc_services/rpc_rollback_transaction.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class TRollbackTransactionRPC : public TRpcKqpRequestActor<TRollbackTransactionR
5353
auto ev = MakeHolder<NKqp::TEvKqp::TEvQueryRequest>();
5454
SetAuthToken(ev, *Request_);
5555
SetDatabase(ev, *Request_);
56-
ev->Record.SetPeerName(Request_->GetPeerName());
56+
ev->Record.MutableRequest()->SetClientAddress(Request_->GetPeerName());
5757

5858
if (CheckSession(req->session_id(), Request_.get())) {
5959
ev->Record.MutableRequest()->SetSessionId(req->session_id());

‎ydb/core/kqp/common/compilation/events.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@
1414
namespace NKikimr::NKqp::NPrivateEvents {
1515

1616
struct TEvCompileRequest: public TEventLocal<TEvCompileRequest, TKqpEvents::EvCompileRequest> {
17-
TEvCompileRequest(const TIntrusiveConstPtr<NACLib::TUserToken>& userToken, const TString& peerName, const TMaybe<TString>& uid,
17+
TEvCompileRequest(const TIntrusiveConstPtr<NACLib::TUserToken>& userToken, const TString& clientAddress, const TMaybe<TString>& uid,
1818
TMaybe<TKqpQueryId>&& query, bool keepInCache, bool isQueryActionPrepare, bool perStatementResult, TInstant deadline,
1919
TKqpDbCountersPtr dbCounters, const TGUCSettings::TPtr& gUCSettings, const TMaybe<TString>& applicationName,
2020
std::shared_ptr<std::atomic<bool>> intrestedInResult, const TIntrusivePtr<TUserRequestContext>& userRequestContext, NLWTrace::TOrbit orbit = {},
2121
TKqpTempTablesState::TConstPtr tempTablesState = nullptr, bool collectDiagnostics = false, TMaybe<TQueryAst> queryAst = Nothing(),
2222
bool split = false, NYql::TExprContext* splitCtx = nullptr, NYql::TExprNode::TPtr splitExpr = nullptr)
2323
: UserToken(userToken)
24-
, PeerName(peerName)
24+
, ClientAddress(clientAddress)
2525
, Uid(uid)
2626
, Query(std::move(query))
2727
, KeepInCache(keepInCache)
@@ -45,7 +45,7 @@ struct TEvCompileRequest: public TEventLocal<TEvCompileRequest, TKqpEvents::EvCo
4545
}
4646

4747
TIntrusiveConstPtr<NACLib::TUserToken> UserToken;
48-
TString PeerName;
48+
TString ClientAddress;
4949
TMaybe<TString> Uid;
5050
TMaybe<TKqpQueryId> Query;
5151
bool KeepInCache = false;
@@ -74,14 +74,14 @@ struct TEvCompileRequest: public TEventLocal<TEvCompileRequest, TKqpEvents::EvCo
7474
};
7575

7676
struct TEvRecompileRequest: public TEventLocal<TEvRecompileRequest, TKqpEvents::EvRecompileRequest> {
77-
TEvRecompileRequest(const TIntrusiveConstPtr<NACLib::TUserToken>& userToken, const TString& peerName, const TString& uid,
77+
TEvRecompileRequest(const TIntrusiveConstPtr<NACLib::TUserToken>& userToken, const TString& clientAddress, const TString& uid,
7878
const TMaybe<TKqpQueryId>& query, bool isQueryActionPrepare, TInstant deadline,
7979
TKqpDbCountersPtr dbCounters, const TGUCSettings::TPtr& gUCSettings, const TMaybe<TString>& applicationName,
8080
std::shared_ptr<std::atomic<bool>> intrestedInResult, const TIntrusivePtr<TUserRequestContext>& userRequestContext,
8181
NLWTrace::TOrbit orbit = {}, TKqpTempTablesState::TConstPtr tempTablesState = nullptr, TMaybe<TQueryAst> queryAst = Nothing(),
8282
bool split = false, NYql::TExprContext* splitCtx = nullptr, NYql::TExprNode::TPtr splitExpr = nullptr)
8383
: UserToken(userToken)
84-
, PeerName(peerName)
84+
, ClientAddress(clientAddress)
8585
, Uid(uid)
8686
, Query(query)
8787
, IsQueryActionPrepare(isQueryActionPrepare)
@@ -101,7 +101,7 @@ struct TEvRecompileRequest: public TEventLocal<TEvRecompileRequest, TKqpEvents::
101101
}
102102

103103
TIntrusiveConstPtr<NACLib::TUserToken> UserToken;
104-
TString PeerName;
104+
TString ClientAddress;
105105
TString Uid;
106106
TMaybe<TKqpQueryId> Query;
107107
bool IsQueryActionPrepare = false;

0 commit comments

Comments
 (0)