Skip to content

Commit 5e51b67

Browse files
niksavelievniksaveliev
committed
fix includes
1 parent 30608b4 commit 5e51b67

File tree

3 files changed

+37
-37
lines changed

3 files changed

+37
-37
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
#include "kafka_consumer_members_metadata_initializers.h"
66
#include "kqp_balance_transaction.h"
77

8-
#include <ydb/library/actors/core/actor_bootstrapped.h>
9-
#include <ydb/library/actors/core/actor.h>
108
#include <ydb/core/base/tablet_pipe.h>
119
#include <ydb/core/kafka_proxy/kafka_events.h>
1210
#include <ydb/core/kqp/common/events/events.h>
1311
#include <ydb/core/persqueue/events/internal.h>
1412
#include <ydb/core/persqueue/fetch_request_actor.h>
1513
#include <ydb/core/protos/kafka.pb.h>
1614
#include <ydb/library/aclib/aclib.h>
15+
#include <ydb/library/actors/core/actor_bootstrapped.h>
16+
#include <ydb/library/actors/core/actor.h>
1717
#include <ydb/services/metadata/service.h>
1818
#include <ydb/services/persqueue_v1/actors/read_init_auth_actor.h>
1919
#include <util/datetime/base.h>
@@ -372,7 +372,7 @@ class TKafkaBalancerActor : public NActors::TActorBootstrapped<TKafkaBalancerAct
372372

373373
bool IsMaster = false;
374374

375-
std::unique_ptr<NKikimr::NGRpcProxy::V1::TKqpTxHelper> Kqp;
375+
std::unique_ptr<NKafka::TKqpTxHelper> Kqp;
376376

377377
TMessagePtr<TJoinGroupRequestData> JoinGroupRequestData;
378378
TMessagePtr<TSyncGroupRequestData> SyncGroupRequestData;

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

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,31 @@
11
#include "kqp_balance_transaction.h"
2-
#include "ydb/core/kqp/common/simple/services.h"
32
#include "kafka_consumer_groups_metadata_initializers.h"
43
#include "kafka_consumer_members_metadata_initializers.h"
54

65

7-
namespace NKikimr::NGRpcProxy::V1 {
6+
namespace NKafka {
87

98
TKqpTxHelper::TKqpTxHelper(TString database)
109
: DataBase(database)
1110
{}
1211

13-
void TKqpTxHelper::SendCreateSessionRequest(const TActorContext& ctx) {
12+
void TKqpTxHelper::SendCreateSessionRequest(const NActors::TActorContext& ctx) {
1413
auto ev = MakeCreateSessionRequest();
15-
ctx.Send(NKqp::MakeKqpProxyID(ctx.SelfID.NodeId()), ev.Release(), 0, 0);
14+
ctx.Send(NKikimr::NKqp::MakeKqpProxyID(ctx.SelfID.NodeId()), ev.Release(), 0, 0);
1615
}
1716

1817
void TKqpTxHelper::BeginTransaction(ui64 cookie, const NActors::TActorContext& ctx) {
19-
auto begin = MakeHolder<NKqp::TEvKqp::TEvQueryRequest>();
18+
auto begin = MakeHolder<NKikimr::NKqp::TEvKqp::TEvQueryRequest>();
2019

2120
begin->Record.MutableRequest()->SetAction(NKikimrKqp::QUERY_ACTION_BEGIN_TX);
2221
begin->Record.MutableRequest()->MutableTxControl()->mutable_begin_tx()->mutable_serializable_read_write();
2322
begin->Record.MutableRequest()->SetSessionId(KqpSessionId);
2423
begin->Record.MutableRequest()->SetDatabase(DataBase);
2524

26-
ctx.Send(NKqp::MakeKqpProxyID(ctx.SelfID.NodeId()), begin.Release(), 0, cookie);
25+
ctx.Send(NKikimr::NKqp::MakeKqpProxyID(ctx.SelfID.NodeId()), begin.Release(), 0, cookie);
2726
}
2827

29-
bool TKqpTxHelper::HandleCreateSessionResponse(NKqp::TEvKqp::TEvCreateSessionResponse::TPtr& ev, const TActorContext&) {
28+
bool TKqpTxHelper::HandleCreateSessionResponse(NKikimr::NKqp::TEvKqp::TEvCreateSessionResponse::TPtr& ev, const NActors::TActorContext&) {
3029
const auto& record = ev->Get()->Record;
3130

3231
if (record.GetYdbStatus() != Ydb::StatusIds::SUCCESS) {
@@ -39,32 +38,32 @@ bool TKqpTxHelper::HandleCreateSessionResponse(NKqp::TEvKqp::TEvCreateSessionRes
3938
return true;
4039
}
4140

42-
void TKqpTxHelper::CloseKqpSession(const TActorContext& ctx) {
41+
void TKqpTxHelper::CloseKqpSession(const NActors::TActorContext& ctx) {
4342
if (KqpSessionId) {
4443
auto ev = MakeCloseSessionRequest();
45-
ctx.Send(NKqp::MakeKqpProxyID(ctx.SelfID.NodeId()), ev.Release(), 0, 0);
44+
ctx.Send(NKikimr::NKqp::MakeKqpProxyID(ctx.SelfID.NodeId()), ev.Release(), 0, 0);
4645
KqpSessionId = "";
4746
}
4847
}
4948

50-
THolder<NKqp::TEvKqp::TEvCreateSessionRequest> TKqpTxHelper::MakeCreateSessionRequest() {
51-
auto ev = MakeHolder<NKqp::TEvKqp::TEvCreateSessionRequest>();
49+
THolder<NKikimr::NKqp::TEvKqp::TEvCreateSessionRequest> TKqpTxHelper::MakeCreateSessionRequest() {
50+
auto ev = MakeHolder<NKikimr::NKqp::TEvKqp::TEvCreateSessionRequest>();
5251
ev->Record.MutableRequest()->SetDatabase(DataBase);
5352
return ev;
5453
}
5554

56-
THolder<NKqp::TEvKqp::TEvCloseSessionRequest> TKqpTxHelper::MakeCloseSessionRequest() {
57-
auto ev = MakeHolder<NKqp::TEvKqp::TEvCloseSessionRequest>();
55+
THolder<NKikimr::NKqp::TEvKqp::TEvCloseSessionRequest> TKqpTxHelper::MakeCloseSessionRequest() {
56+
auto ev = MakeHolder<NKikimr::NKqp::TEvKqp::TEvCloseSessionRequest>();
5857
ev->Record.MutableRequest()->SetSessionId(KqpSessionId);
5958
return ev;
6059
}
6160

62-
void TKqpTxHelper::SendRequest(THolder<NKqp::TEvKqp::TEvQueryRequest> request, ui64 cookie, const NActors::TActorContext& ctx) {
63-
ctx.Send(NKqp::MakeKqpProxyID(ctx.SelfID.NodeId()), request.Release(), 0, cookie);
61+
void TKqpTxHelper::SendRequest(THolder<NKikimr::NKqp::TEvKqp::TEvQueryRequest> request, ui64 cookie, const NActors::TActorContext& ctx) {
62+
ctx.Send(NKikimr::NKqp::MakeKqpProxyID(ctx.SelfID.NodeId()), request.Release(), 0, cookie);
6463
}
6564

6665
void TKqpTxHelper::SendYqlRequest(const TString& yqlRequest, NYdb::TParams sqlParams, ui64 cookie, const NActors::TActorContext& ctx, bool commit) {
67-
auto ev = MakeHolder<NKqp::TEvKqp::TEvQueryRequest>();
66+
auto ev = MakeHolder<NKikimr::NKqp::TEvKqp::TEvQueryRequest>();
6867

6968
ev->Record.MutableRequest()->SetAction(NKikimrKqp::QUERY_ACTION_EXECUTE);
7069
ev->Record.MutableRequest()->SetType(NKikimrKqp::QUERY_TYPE_SQL_DML);
@@ -81,30 +80,30 @@ void TKqpTxHelper::SendYqlRequest(const TString& yqlRequest, NYdb::TParams sqlPa
8180
ev->Record.MutableRequest()->MutableQueryCachePolicy()->set_keep_in_cache(true);
8281

8382
ev->Record.MutableRequest()->MutableYdbParameters()->swap(*(NYdb::TProtoAccessor::GetProtoMapPtr(sqlParams)));
84-
ctx.Send(NKqp::MakeKqpProxyID(ctx.SelfID.NodeId()), ev.Release(), 0, cookie);
83+
ctx.Send(NKikimr::NKqp::MakeKqpProxyID(ctx.SelfID.NodeId()), ev.Release(), 0, cookie);
8584
}
8685

8786
void TKqpTxHelper::CommitTx(ui64 cookie, const NActors::TActorContext& ctx) {
88-
auto commit = MakeHolder<NKqp::TEvKqp::TEvQueryRequest>();
87+
auto commit = MakeHolder<NKikimr::NKqp::TEvKqp::TEvQueryRequest>();
8988

9089
commit->Record.MutableRequest()->SetAction(NKikimrKqp::QUERY_ACTION_COMMIT_TX);
9190
commit->Record.MutableRequest()->MutableTxControl()->set_tx_id(TxId);
9291
commit->Record.MutableRequest()->MutableTxControl()->set_commit_tx(true);
9392
commit->Record.MutableRequest()->SetSessionId(KqpSessionId);
9493
commit->Record.MutableRequest()->SetDatabase(DataBase);
9594

96-
ctx.Send(NKqp::MakeKqpProxyID(ctx.SelfID.NodeId()), commit.Release(), 0, cookie);
95+
ctx.Send(NKikimr::NKqp::MakeKqpProxyID(ctx.SelfID.NodeId()), commit.Release(), 0, cookie);
9796
}
9897

99-
void TKqpTxHelper::SendInitTablesRequest(const TActorContext& ctx) {
98+
void TKqpTxHelper::SendInitTablesRequest(const NActors::TActorContext& ctx) {
10099
ctx.Send(
101-
NMetadata::NProvider::MakeServiceId(ctx.SelfID.NodeId()),
102-
new NMetadata::NProvider::TEvPrepareManager(NGRpcProxy::V1::TKafkaConsumerMembersMetaInitManager::GetInstant())
100+
NKikimr::NMetadata::NProvider::MakeServiceId(ctx.SelfID.NodeId()),
101+
new NKikimr::NMetadata::NProvider::TEvPrepareManager(NKikimr::NGRpcProxy::V1::TKafkaConsumerMembersMetaInitManager::GetInstant())
103102
);
104103

105104
ctx.Send(
106-
NMetadata::NProvider::MakeServiceId(ctx.SelfID.NodeId()),
107-
new NMetadata::NProvider::TEvPrepareManager(NGRpcProxy::V1::TKafkaConsumerGroupsMetaInitManager::GetInstant())
105+
NKikimr::NMetadata::NProvider::MakeServiceId(ctx.SelfID.NodeId()),
106+
new NKikimr::NMetadata::NProvider::TEvPrepareManager(NKikimr::NGRpcProxy::V1::TKafkaConsumerGroupsMetaInitManager::GetInstant())
108107
);
109108
}
110109

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

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
#pragma once
22

3-
#include <ydb/core/kqp/common/events/events.h>
4-
#include <ydb/core/grpc_services/rpc_deferrable.h>
53
#include <ydb/core/client/server/msgbus_server_pq_metacache.h>
4+
#include <ydb/core/grpc_services/rpc_deferrable.h>
5+
#include <ydb/core/kqp/common/events/events.h>
6+
#include "ydb/core/kqp/common/simple/services.h"
67
#include <ydb/core/persqueue/events/global.h>
78

8-
namespace NKikimr::NGRpcProxy::V1 {
9+
namespace NKafka {
910

1011
using namespace NKikimr::NGRpcService;
1112

1213
class TKqpTxHelper {
1314
public:
1415
TKqpTxHelper(TString database);
15-
void SendCreateSessionRequest(const TActorContext& ctx);
16+
void SendCreateSessionRequest(const NActors::TActorContext& ctx);
1617
void BeginTransaction(ui64 cookie, const NActors::TActorContext& ctx);
17-
bool HandleCreateSessionResponse(NKqp::TEvKqp::TEvCreateSessionResponse::TPtr& ev, const TActorContext& ctx);
18-
void CloseKqpSession(const TActorContext& ctx);
19-
void SendRequest(THolder<NKqp::TEvKqp::TEvQueryRequest> request, ui64 cookie, const NActors::TActorContext& ctx);
18+
bool HandleCreateSessionResponse(NKikimr::NKqp::TEvKqp::TEvCreateSessionResponse::TPtr& ev, const NActors::TActorContext& ctx);
19+
void CloseKqpSession(const NActors::TActorContext& ctx);
20+
void SendRequest(THolder<NKikimr::NKqp::TEvKqp::TEvQueryRequest> request, ui64 cookie, const NActors::TActorContext& ctx);
2021
void CommitTx(ui64 cookie, const NActors::TActorContext& ctx);
2122
void SendYqlRequest(const TString& yqlRequest, NYdb::TParams sqlParams, ui64 cookie, const NActors::TActorContext& ctx, bool commit = false);
22-
void SendInitTablesRequest(const TActorContext& ctx);
23+
void SendInitTablesRequest(const NActors::TActorContext& ctx);
2324
void SetTxId(const TString& txId);
2425
void ResetTxId();
2526

@@ -28,8 +29,8 @@ class TKqpTxHelper {
2829
TString TxId;
2930

3031
private:
31-
THolder<NKqp::TEvKqp::TEvCreateSessionRequest> MakeCreateSessionRequest();
32-
THolder<NKqp::TEvKqp::TEvCloseSessionRequest> MakeCloseSessionRequest();
32+
THolder<NKikimr::NKqp::TEvKqp::TEvCreateSessionRequest> MakeCreateSessionRequest();
33+
THolder<NKikimr::NKqp::TEvKqp::TEvCloseSessionRequest> MakeCloseSessionRequest();
3334

3435

3536
private:

0 commit comments

Comments
 (0)