Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions ydb/core/client/server/grpc_server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -445,9 +445,6 @@ void TGRpcService::SetupIncomingRequests() {
ADD_ACTOR_REQUEST(BlobStorageConfig, TBlobStorageConfigRequest, MTYPE_CLIENT_BLOB_STORAGE_CONFIG_REQUEST)
ADD_ACTOR_REQUEST(HiveCreateTablet, THiveCreateTablet, MTYPE_CLIENT_HIVE_CREATE_TABLET)
ADD_ACTOR_REQUEST(TabletStateRequest, TTabletStateRequest, MTYPE_CLIENT_TABLET_STATE_REQUEST)
ADD_ACTOR_REQUEST(LocalMKQL, TLocalMKQL, MTYPE_CLIENT_LOCAL_MINIKQL)
ADD_ACTOR_REQUEST(LocalSchemeTx, TLocalSchemeTx, MTYPE_CLIENT_LOCAL_SCHEME_TX)
ADD_ACTOR_REQUEST(TabletKillRequest, TTabletKillRequest, MTYPE_CLIENT_TABLET_KILL_REQUEST)
ADD_ACTOR_REQUEST(SchemeOperationStatus, TSchemeOperationStatus, MTYPE_CLIENT_FLAT_TX_STATUS_REQUEST)
ADD_ACTOR_REQUEST(ChooseProxy, TChooseProxyRequest, MTYPE_CLIENT_CHOOSE_PROXY)
ADD_ACTOR_REQUEST(ResolveNode, TResolveNodeRequest, MTYPE_CLIENT_RESOLVE_NODE)
Expand Down
9 changes: 0 additions & 9 deletions ydb/core/client/server/msgbus_server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -104,11 +104,8 @@ class TBusMessageContext::TImplGRpc
MTYPE(TBusOldHiveCreateTablet)
MTYPE(TBusHiveCreateTabletResult)
MTYPE(TBusPersQueue)
MTYPE(TBusTabletKillRequest)
MTYPE(TBusTabletStateRequest)
MTYPE(TBusTabletCountersRequest)
MTYPE(TBusTabletLocalMKQL)
MTYPE(TBusTabletLocalSchemeTx)
MTYPE(TBusSchemeOperation)
MTYPE(TBusSchemeOperationStatus)
MTYPE(TBusSchemeDescribe)
Expand Down Expand Up @@ -510,12 +507,6 @@ void TMessageBusServer::OnMessage(TBusMessageContext &msg) {
return ClientActorRequest(CreateMessageBusTabletStateRequest, msg);
case MTYPE_CLIENT_TABLET_COUNTERS_REQUEST:
return ClientActorRequest(CreateMessageBusTabletCountersRequest, msg);
case MTYPE_CLIENT_LOCAL_MINIKQL:
return ClientActorRequest(CreateMessageBusLocalMKQL, msg);
case MTYPE_CLIENT_LOCAL_SCHEME_TX:
return ClientActorRequest(CreateMessageBusLocalSchemeTx, msg);
case MTYPE_CLIENT_TABLET_KILL_REQUEST:
return ClientActorRequest(CreateMessageBusTabletKillRequest, msg);
case MTYPE_CLIENT_FLAT_TX_REQUEST:
return ClientProxyRequest<TEvBusProxy::TEvFlatTxRequest>(msg);
case MTYPE_CLIENT_FLAT_TX_STATUS_REQUEST:
Expand Down
3 changes: 0 additions & 3 deletions ydb/core/client/server/msgbus_server.h
Original file line number Diff line number Diff line change
Expand Up @@ -273,15 +273,12 @@ IActor* CreateMessageBusServerProxy(TMessageBusServer *server);

//IActor* CreateMessageBusDatashardSetConfig(TBusMessageContext &msg);
IActor* CreateMessageBusTabletCountersRequest(TBusMessageContext &msg);
IActor* CreateMessageBusLocalMKQL(TBusMessageContext &msg);
IActor* CreateMessageBusLocalSchemeTx(TBusMessageContext &msg);
IActor* CreateMessageBusSchemeInitRoot(TBusMessageContext &msg);
IActor* CreateMessageBusGetTypes(TBusMessageContext &msg);
IActor* CreateMessageBusHiveCreateTablet(TBusMessageContext &msg);
IActor* CreateMessageBusPersQueue(TBusMessageContext &msg);
IActor* CreateMessageBusChooseProxy(TBusMessageContext &msg);
IActor* CreateMessageBusTabletStateRequest(TBusMessageContext &msg);
IActor* CreateMessageBusTabletKillRequest(TBusMessageContext &msg);
IActor* CreateMessageBusSchemeOperationStatus(TBusMessageContext &msg);
IActor* CreateMessageBusBlobStorageLoadRequest(TBusMessageContext &msg);
IActor* CreateMessageBusBlobStorageGetRequest(TBusMessageContext &msg);
Expand Down
71 changes: 0 additions & 71 deletions ydb/core/client/server/msgbus_server_local_minikql.cpp

This file was deleted.

64 changes: 0 additions & 64 deletions ydb/core/client/server/msgbus_server_local_scheme_tx.cpp

This file was deleted.

31 changes: 0 additions & 31 deletions ydb/core/client/server/msgbus_server_tablet_kill.cpp

This file was deleted.

3 changes: 0 additions & 3 deletions ydb/core/client/server/ya.make
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,13 @@ SRCS(
msgbus_server_pq_read_session_info.cpp
msgbus_server_resolve_node.cpp
msgbus_server_ic_debug.cpp
msgbus_server_local_minikql.cpp
msgbus_server_local_scheme_tx.cpp
msgbus_server_node_registration.cpp
msgbus_server_proxy.cpp
msgbus_server_proxy.h
msgbus_server_request.h
msgbus_server_scheme_initroot.cpp
msgbus_server_scheme_request.cpp
msgbus_server_tablet_counters.cpp
msgbus_server_tablet_kill.cpp
msgbus_server_tablet_state.cpp
msgbus_server_test_shard_request.cpp
msgbus_server_tx_request.cpp
Expand Down
8 changes: 0 additions & 8 deletions ydb/core/driver_lib/cli_base/cli_kicli.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,6 @@ void PrepareRequest(TClientCommand::TConfig& config, TAutoPtr<NMsgBusProxy::TBus
SetToken(config, request);
}

void PrepareRequest(TClientCommand::TConfig& config, TAutoPtr<NMsgBusProxy::TBusTabletLocalMKQL>& request) {
SetToken(config, request);
}

void PrepareRequest(TClientCommand::TConfig& config, TAutoPtr<NMsgBusProxy::TBusTabletLocalSchemeTx>& request) {
SetToken(config, request);
}

void PrepareRequest(TClientCommand::TConfig& config, TAutoPtr<NMsgBusProxy::TBusFillNode>& request) {
SetToken(config, request);
}
Expand Down
2 changes: 0 additions & 2 deletions ydb/core/driver_lib/cli_base/cli_kicli.h
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ void PrepareRequest(TClientCommand::TConfig& config, TAutoPtr<NMsgBusProxy::TBus
void PrepareRequest(TClientCommand::TConfig& config, TAutoPtr<NMsgBusProxy::TBusSchemeDescribe>& request);
void PrepareRequest(TClientCommand::TConfig& config, TAutoPtr<NMsgBusProxy::TBusCmsRequest>& request);
void PrepareRequest(TClientCommand::TConfig& config, TAutoPtr<NMsgBusProxy::TBusConsoleRequest>& request);
void PrepareRequest(TClientCommand::TConfig& config, TAutoPtr<NMsgBusProxy::TBusTabletLocalMKQL>& request);
void PrepareRequest(TClientCommand::TConfig& config, TAutoPtr<NMsgBusProxy::TBusTabletLocalSchemeTx>& request);
void PrepareRequest(TClientCommand::TConfig& config, TAutoPtr<NMsgBusProxy::TBusFillNode>& request);
void PrepareRequest(TClientCommand::TConfig& config, TAutoPtr<NMsgBusProxy::TBusDrainNode>& request);

Expand Down
3 changes: 0 additions & 3 deletions ydb/core/protos/grpc.proto
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ service TGRpcServer {
/////////////////////////////////////////////////////////////////////////////////////////////////
// INTROSPECTION
/////////////////////////////////////////////////////////////////////////////////////////////////
rpc LocalMKQL(TLocalMKQL) returns (TResponse);
rpc LocalSchemeTx(TLocalSchemeTx) returns (TResponse);
rpc TabletKillRequest(TTabletKillRequest) returns (TResponse);
rpc InterconnectDebug(TInterconnectDebug) returns (TResponse);

// [DEPRECATED]
Expand Down
36 changes: 0 additions & 36 deletions ydb/core/protos/msgbus.proto
Original file line number Diff line number Diff line change
Expand Up @@ -255,38 +255,6 @@ message TTabletCountersRequest {
optional uint64 Timeout = 11;
}

message TLocalMKQL {
message TProgram {
optional bytes Bin = 1;
optional string Text = 2;
};

message TParams {
optional bytes Bin = 1;
optional string Text = 2;
}

optional uint64 TabletID = 1;
optional NKikimrTxUserProxy.TMiniKQLTransaction Program = 2;
optional bool ConnectToFollower = 3;

optional string SecurityToken = 5;

optional bool WithRetry = 10;
optional uint64 Timeout = 11;
}

message TLocalSchemeTx {
optional uint64 TabletID = 1;
optional bool ConnectToFollower = 2;
optional NTabletFlatScheme.TSchemeChanges SchemeChanges = 3;
optional bool DryRun = 4;
optional string SecurityToken = 5;

optional bool WithRetry = 10;
optional uint64 Timeout = 11;
}

message TSchemeNavigate {
optional bytes Path = 1;
optional uint32 ReadMaterializedFamily = 2;
Expand Down Expand Up @@ -393,10 +361,6 @@ message TMessageBusTraceStatus {
optional bytes Path = 2;
};

message TTabletKillRequest {
optional uint64 TabletID = 1;
};

message TTabletStateRequest {
optional NKikimrTabletBase.TTabletTypes.EType TabletType = 1;
optional bool Alive = 2;
Expand Down
12 changes: 3 additions & 9 deletions ydb/public/lib/base/msgbus.h
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ enum {
MTYPE_CLIENT_KEYVALUE_RESPONSE = 10426, // deprecated
/*MTYPE_CLIENT_MESSAGE_BUS_TRACE*/ MTYPE_CLIENT_DEPRECATED_10427 = 10427,
/*MTYPE_CLIENT_MESSAGE_BUS_TRACE_STATUS*/ MTYPE_CLIENT_DEPRECATED_10428 = 10428,
MTYPE_CLIENT_TABLET_KILL_REQUEST = 10429,
MTYPE_CLIENT_DEPRECATED_TABLET_KILL_REQUEST = 10429, // deprecated
MTYPE_CLIENT_TABLET_STATE_REQUEST = 10430,
MTYPE_CLIENT_LOCAL_MINIKQL = 10431,
MTYPE_CLIENT_DEPRECATED_LOCAL_MINIKQL = 10431, // deprecated
MTYPE_CLIENT_FLAT_TX_REQUEST = 10432,
MTYPE_CLIENT_FLAT_TX_STATUS_REQUEST = 10434,
MTYPE_CLIENT_OLD_FLAT_DESCRIBE_REQUEST = 10435, // deprecated
Expand All @@ -59,7 +59,7 @@ enum {
MTYPE_CLIENT_KEYVALUE = 10448,
MTYPE_CLIENT_DB_BATCH = 10449,
MTYPE_CLIENT_FLAT_DESCRIBE_REQUEST = 10450,
MTYPE_CLIENT_LOCAL_SCHEME_TX = 10453,
MTYPE_CLIENT_DEPRECATED_LOCAL_SCHEME_TX = 10453, // deprecated
MTYPE_CLIENT_DB_QUERY = 10456,
MTYPE_CLIENT_TABLET_COUNTERS_REQUEST = 10457,
MTYPE_CLIENT_CANCEL_BACKUP = 10458,
Expand Down Expand Up @@ -104,11 +104,8 @@ struct TBusHiveCreateTablet : TBusMessage<TBusHiveCreateTablet, NKikimrClient::T
struct TBusOldHiveCreateTablet : TBusMessage<TBusOldHiveCreateTablet, NKikimrClient::THiveCreateTablet, MTYPE_CLIENT_OLD_HIVE_CREATE_TABLET> {};
struct TBusHiveCreateTabletResult : TBusMessage<TBusHiveCreateTabletResult, NKikimrClient::THiveCreateTabletResult, MTYPE_CLIENT_HIVE_CREATE_TABLET_RESULT> {};
struct TBusPersQueue : TBusMessage<TBusPersQueue, NKikimrClient::TPersQueueRequest, MTYPE_CLIENT_PERSQUEUE> {};
struct TBusTabletKillRequest : TBusMessage<TBusTabletKillRequest, NKikimrClient::TTabletKillRequest, MTYPE_CLIENT_TABLET_KILL_REQUEST> {};
struct TBusTabletStateRequest : TBusMessage<TBusTabletStateRequest, NKikimrClient::TTabletStateRequest, MTYPE_CLIENT_TABLET_STATE_REQUEST> {};
struct TBusTabletCountersRequest : TBusMessage<TBusTabletCountersRequest, NKikimrClient::TTabletCountersRequest, MTYPE_CLIENT_TABLET_COUNTERS_REQUEST> {};
struct TBusTabletLocalMKQL : TBusMessage<TBusTabletLocalMKQL, NKikimrClient::TLocalMKQL, MTYPE_CLIENT_LOCAL_MINIKQL> {};
struct TBusTabletLocalSchemeTx : TBusMessage<TBusTabletLocalSchemeTx, NKikimrClient::TLocalSchemeTx, MTYPE_CLIENT_LOCAL_SCHEME_TX> {};
struct TBusSchemeOperation : TBusMessage<TBusSchemeOperation, NKikimrClient::TSchemeOperation, MTYPE_CLIENT_FLAT_TX_REQUEST> {};
struct TBusSchemeOperationStatus : TBusMessage<TBusSchemeOperationStatus, NKikimrClient::TSchemeOperationStatus, MTYPE_CLIENT_FLAT_TX_STATUS_REQUEST> {};
struct TBusSchemeDescribe : TBusMessage<TBusSchemeDescribe, NKikimrClient::TSchemeDescribe, MTYPE_CLIENT_FLAT_DESCRIBE_REQUEST> {};
Expand Down Expand Up @@ -181,11 +178,8 @@ class TProtocol : public NBus::TBusBufferProtocol {
RegisterType(new TBusOldHiveCreateTablet);
RegisterType(new TBusHiveCreateTabletResult);
RegisterType(new TBusPersQueue);
RegisterType(new TBusTabletKillRequest);
RegisterType(new TBusTabletStateRequest);
RegisterType(new TBusTabletCountersRequest);
RegisterType(new TBusTabletLocalMKQL);
RegisterType(new TBusTabletLocalSchemeTx);
RegisterType(new TBusSchemeOperation);
RegisterType(new TBusSchemeOperationStatus);
RegisterType(new TBusSchemeDescribe);
Expand Down
3 changes: 0 additions & 3 deletions ydb/public/lib/deprecated/client/grpc_client.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -326,9 +326,6 @@ namespace NKikimr {
IMPL_REQUEST(HiveCreateTablet, THiveCreateTablet, TResponse)
IMPL_REQUEST(RegisterNode, TNodeRegistrationRequest, TNodeRegistrationResponse)
IMPL_REQUEST(CmsRequest, TCmsRequest, TCmsResponse)
IMPL_REQUEST(LocalMKQL, TLocalMKQL, TResponse)
IMPL_REQUEST(LocalSchemeTx, TLocalSchemeTx, TResponse)
IMPL_REQUEST(TabletKillRequest, TTabletKillRequest, TResponse)
IMPL_REQUEST(InterconnectDebug, TInterconnectDebug, TResponse)
IMPL_REQUEST(TabletStateRequest, TTabletStateRequest, TResponse)
IMPL_REQUEST(ChooseProxy, TChooseProxyRequest, TResponse)
Expand Down
3 changes: 0 additions & 3 deletions ydb/public/lib/deprecated/client/grpc_client.h
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,6 @@ namespace NKikimr {
/////////////////////////////////////////////////////////////////////////////////////////////////
// INTROSPECTION
/////////////////////////////////////////////////////////////////////////////////////////////////
void LocalMKQL(const NKikimrClient::TLocalMKQL& request, TResponseCallback callback);
void LocalSchemeTx(const NKikimrClient::TLocalSchemeTx& request, TResponseCallback callback);
void TabletKillRequest(const NKikimrClient::TTabletKillRequest& request, TResponseCallback callback);
void InterconnectDebug(const NKikimrClient::TInterconnectDebug& request, TResponseCallback callback);

/////////////////////////////////////////////////////////////////////////////////////////////////
Expand Down
Loading
Loading