Skip to content

Commit e891645

Browse files
snaurysnaury
authored
Merge 21f1297 into 8de51e6 
2 parents 8de51e6 + 21f1297 commit e891645

16 files changed

+3
-264
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -443,9 +443,6 @@ void TGRpcService::SetupIncomingRequests() {
443443
ADD_ACTOR_REQUEST(LocalEnumerateTablets, TLocalEnumerateTablets, MTYPE_CLIENT_LOCAL_ENUMERATE_TABLETS)
444444
ADD_ACTOR_REQUEST(KeyValue, TKeyValueRequest, MTYPE_CLIENT_KEYVALUE)
445445
ADD_ACTOR_REQUEST(TabletStateRequest, TTabletStateRequest, MTYPE_CLIENT_TABLET_STATE_REQUEST)
446-
ADD_ACTOR_REQUEST(LocalMKQL, TLocalMKQL, MTYPE_CLIENT_LOCAL_MINIKQL)
447-
ADD_ACTOR_REQUEST(LocalSchemeTx, TLocalSchemeTx, MTYPE_CLIENT_LOCAL_SCHEME_TX)
448-
ADD_ACTOR_REQUEST(TabletKillRequest, TTabletKillRequest, MTYPE_CLIENT_TABLET_KILL_REQUEST)
449446
ADD_ACTOR_REQUEST(SchemeOperationStatus, TSchemeOperationStatus, MTYPE_CLIENT_FLAT_TX_STATUS_REQUEST)
450447
ADD_ACTOR_REQUEST(ChooseProxy, TChooseProxyRequest, MTYPE_CLIENT_CHOOSE_PROXY)
451448
ADD_ACTOR_REQUEST(ResolveNode, TResolveNodeRequest, MTYPE_CLIENT_RESOLVE_NODE)

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

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,8 @@ class TBusMessageContext::TImplGRpc
102102
MTYPE(TBusOldKeyValue)
103103
MTYPE(TBusKeyValueResponse)
104104
MTYPE(TBusPersQueue)
105-
MTYPE(TBusTabletKillRequest)
106105
MTYPE(TBusTabletStateRequest)
107106
MTYPE(TBusTabletCountersRequest)
108-
MTYPE(TBusTabletLocalMKQL)
109-
MTYPE(TBusTabletLocalSchemeTx)
110107
MTYPE(TBusSchemeOperation)
111108
MTYPE(TBusSchemeOperationStatus)
112109
MTYPE(TBusSchemeDescribe)
@@ -511,12 +508,6 @@ void TMessageBusServer::OnMessage(TBusMessageContext &msg) {
511508
return ClientActorRequest(CreateMessageBusTabletStateRequest, msg);
512509
case MTYPE_CLIENT_TABLET_COUNTERS_REQUEST:
513510
return ClientActorRequest(CreateMessageBusTabletCountersRequest, msg);
514-
case MTYPE_CLIENT_LOCAL_MINIKQL:
515-
return ClientActorRequest(CreateMessageBusLocalMKQL, msg);
516-
case MTYPE_CLIENT_LOCAL_SCHEME_TX:
517-
return ClientActorRequest(CreateMessageBusLocalSchemeTx, msg);
518-
case MTYPE_CLIENT_TABLET_KILL_REQUEST:
519-
return ClientActorRequest(CreateMessageBusTabletKillRequest, msg);
520511
case MTYPE_CLIENT_FLAT_TX_REQUEST:
521512
return ClientProxyRequest<TEvBusProxy::TEvFlatTxRequest>(msg);
522513
case MTYPE_CLIENT_FLAT_TX_STATUS_REQUEST:

‎ydb/core/client/server/msgbus_server.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -272,8 +272,6 @@ IActor* CreateMessageBusServerProxy(TMessageBusServer *server);
272272

273273
//IActor* CreateMessageBusDatashardSetConfig(TBusMessageContext &msg);
274274
IActor* CreateMessageBusTabletCountersRequest(TBusMessageContext &msg);
275-
IActor* CreateMessageBusLocalMKQL(TBusMessageContext &msg);
276-
IActor* CreateMessageBusLocalSchemeTx(TBusMessageContext &msg);
277275
IActor* CreateMessageBusSchemeInitRoot(TBusMessageContext &msg);
278276
IActor* CreateMessageBusGetTypes(TBusMessageContext &msg);
279277
IActor* CreateMessageBusHiveCreateTablet(TBusMessageContext &msg);
@@ -282,7 +280,6 @@ IActor* CreateMessageBusKeyValue(TBusMessageContext &msg);
282280
IActor* CreateMessageBusPersQueue(TBusMessageContext &msg);
283281
IActor* CreateMessageBusChooseProxy(TBusMessageContext &msg);
284282
IActor* CreateMessageBusTabletStateRequest(TBusMessageContext &msg);
285-
IActor* CreateMessageBusTabletKillRequest(TBusMessageContext &msg);
286283
IActor* CreateMessageBusSchemeOperationStatus(TBusMessageContext &msg);
287284
IActor* CreateMessageBusBlobStorageLoadRequest(TBusMessageContext &msg);
288285
IActor* CreateMessageBusBlobStorageGetRequest(TBusMessageContext &msg);

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

Lines changed: 0 additions & 70 deletions
This file was deleted.

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

Lines changed: 0 additions & 63 deletions
This file was deleted.

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

Lines changed: 0 additions & 31 deletions
This file was deleted.

‎ydb/core/client/server/ya.make

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ SRCS(
2626
msgbus_server_resolve_node.cpp
2727
msgbus_server_ic_debug.cpp
2828
msgbus_server_local_enumerate_tablets.cpp
29-
msgbus_server_local_minikql.cpp
30-
msgbus_server_local_scheme_tx.cpp
3129
msgbus_server_node_registration.cpp
3230
msgbus_server_proxy.cpp
3331
msgbus_server_proxy.h
@@ -37,7 +35,6 @@ SRCS(
3735
msgbus_server_scheme_request.cpp
3836
msgbus_server_sqs.cpp
3937
msgbus_server_tablet_counters.cpp
40-
msgbus_server_tablet_kill.cpp
4138
msgbus_server_tablet_state.cpp
4239
msgbus_server_test_shard_request.cpp
4340
msgbus_server_tx_request.cpp

‎ydb/core/driver_lib/cli_base/cli_kicli.cpp

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,6 @@ void PrepareRequest(TClientCommand::TConfig& config, TAutoPtr<NMsgBusProxy::TBus
3838
SetToken(config, request);
3939
}
4040

41-
void PrepareRequest(TClientCommand::TConfig& config, TAutoPtr<NMsgBusProxy::TBusTabletLocalMKQL>& request) {
42-
SetToken(config, request);
43-
}
44-
45-
void PrepareRequest(TClientCommand::TConfig& config, TAutoPtr<NMsgBusProxy::TBusTabletLocalSchemeTx>& request) {
46-
SetToken(config, request);
47-
}
48-
4941
void PrepareRequest(TClientCommand::TConfig& config, TAutoPtr<NMsgBusProxy::TBusFillNode>& request) {
5042
SetToken(config, request);
5143
}

‎ydb/core/driver_lib/cli_base/cli_kicli.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,6 @@ void PrepareRequest(TClientCommand::TConfig& config, TAutoPtr<NMsgBusProxy::TBus
5656
void PrepareRequest(TClientCommand::TConfig& config, TAutoPtr<NMsgBusProxy::TBusSchemeDescribe>& request);
5757
void PrepareRequest(TClientCommand::TConfig& config, TAutoPtr<NMsgBusProxy::TBusCmsRequest>& request);
5858
void PrepareRequest(TClientCommand::TConfig& config, TAutoPtr<NMsgBusProxy::TBusConsoleRequest>& request);
59-
void PrepareRequest(TClientCommand::TConfig& config, TAutoPtr<NMsgBusProxy::TBusTabletLocalMKQL>& request);
60-
void PrepareRequest(TClientCommand::TConfig& config, TAutoPtr<NMsgBusProxy::TBusTabletLocalSchemeTx>& request);
6159
void PrepareRequest(TClientCommand::TConfig& config, TAutoPtr<NMsgBusProxy::TBusFillNode>& request);
6260
void PrepareRequest(TClientCommand::TConfig& config, TAutoPtr<NMsgBusProxy::TBusDrainNode>& request);
6361

‎ydb/core/protos/grpc.proto

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,6 @@ service TGRpcServer {
8080
/////////////////////////////////////////////////////////////////////////////////////////////////
8181
// INTROSPECTION
8282
/////////////////////////////////////////////////////////////////////////////////////////////////
83-
rpc LocalMKQL(TLocalMKQL) returns (TResponse);
84-
rpc LocalSchemeTx(TLocalSchemeTx) returns (TResponse);
85-
rpc TabletKillRequest(TTabletKillRequest) returns (TResponse);
8683
rpc InterconnectDebug(TInterconnectDebug) returns (TResponse);
8784

8885
// [DEPRECATED]

‎ydb/core/protos/msgbus.proto

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -255,38 +255,6 @@ message TTabletCountersRequest {
255255
optional uint64 Timeout = 11;
256256
}
257257

258-
message TLocalMKQL {
259-
message TProgram {
260-
optional bytes Bin = 1;
261-
optional string Text = 2;
262-
};
263-
264-
message TParams {
265-
optional bytes Bin = 1;
266-
optional string Text = 2;
267-
}
268-
269-
optional uint64 TabletID = 1;
270-
optional NKikimrTxUserProxy.TMiniKQLTransaction Program = 2;
271-
optional bool ConnectToFollower = 3;
272-
273-
optional string SecurityToken = 5;
274-
275-
optional bool WithRetry = 10;
276-
optional uint64 Timeout = 11;
277-
}
278-
279-
message TLocalSchemeTx {
280-
optional uint64 TabletID = 1;
281-
optional bool ConnectToFollower = 2;
282-
optional NTabletFlatScheme.TSchemeChanges SchemeChanges = 3;
283-
optional bool DryRun = 4;
284-
optional string SecurityToken = 5;
285-
286-
optional bool WithRetry = 10;
287-
optional uint64 Timeout = 11;
288-
}
289-
290258
message TSchemeNavigate {
291259
optional bytes Path = 1;
292260
optional uint32 ReadMaterializedFamily = 2;
@@ -393,10 +361,6 @@ message TMessageBusTraceStatus {
393361
optional bytes Path = 2;
394362
};
395363

396-
message TTabletKillRequest {
397-
optional uint64 TabletID = 1;
398-
};
399-
400364
message TTabletStateRequest {
401365
optional NKikimrTabletBase.TTabletTypes.EType TabletType = 1;
402366
optional bool Alive = 2;

‎ydb/public/lib/base/msgbus.h

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ enum {
4141
MTYPE_CLIENT_KEYVALUE_RESPONSE = 10426, // deprecated
4242
/*MTYPE_CLIENT_MESSAGE_BUS_TRACE*/ MTYPE_CLIENT_DEPRECATED_10427 = 10427,
4343
/*MTYPE_CLIENT_MESSAGE_BUS_TRACE_STATUS*/ MTYPE_CLIENT_DEPRECATED_10428 = 10428,
44-
MTYPE_CLIENT_TABLET_KILL_REQUEST = 10429,
44+
MTYPE_CLIENT_DEPRECATED_TABLET_KILL_REQUEST = 10429, // deprecated
4545
MTYPE_CLIENT_TABLET_STATE_REQUEST = 10430,
46-
MTYPE_CLIENT_LOCAL_MINIKQL = 10431,
46+
MTYPE_CLIENT_DEPRECATED_LOCAL_MINIKQL = 10431, // deprecated
4747
MTYPE_CLIENT_FLAT_TX_REQUEST = 10432,
4848
MTYPE_CLIENT_FLAT_TX_STATUS_REQUEST = 10434,
4949
MTYPE_CLIENT_OLD_FLAT_DESCRIBE_REQUEST = 10435, // deprecated
@@ -59,7 +59,7 @@ enum {
5959
MTYPE_CLIENT_KEYVALUE = 10448,
6060
MTYPE_CLIENT_DB_BATCH = 10449,
6161
MTYPE_CLIENT_FLAT_DESCRIBE_REQUEST = 10450,
62-
MTYPE_CLIENT_LOCAL_SCHEME_TX = 10453,
62+
MTYPE_CLIENT_DEPRECATED_LOCAL_SCHEME_TX = 10453, // deprecated
6363
MTYPE_CLIENT_DB_QUERY = 10456,
6464
MTYPE_CLIENT_TABLET_COUNTERS_REQUEST = 10457,
6565
MTYPE_CLIENT_CANCEL_BACKUP = 10458,
@@ -110,11 +110,8 @@ struct TBusKeyValue : TBusMessage<TBusKeyValue, NKikimrClient::TKeyValueRequest,
110110
struct TBusOldKeyValue : TBusMessage<TBusOldKeyValue, NKikimrClient::TKeyValueRequest, MTYPE_CLIENT_OLD_KEYVALUE> {};
111111
struct TBusKeyValueResponse : TBusMessage<TBusKeyValueResponse, NKikimrClient::TKeyValueResponse, MTYPE_CLIENT_KEYVALUE_RESPONSE> {};
112112
struct TBusPersQueue : TBusMessage<TBusPersQueue, NKikimrClient::TPersQueueRequest, MTYPE_CLIENT_PERSQUEUE> {};
113-
struct TBusTabletKillRequest : TBusMessage<TBusTabletKillRequest, NKikimrClient::TTabletKillRequest, MTYPE_CLIENT_TABLET_KILL_REQUEST> {};
114113
struct TBusTabletStateRequest : TBusMessage<TBusTabletStateRequest, NKikimrClient::TTabletStateRequest, MTYPE_CLIENT_TABLET_STATE_REQUEST> {};
115114
struct TBusTabletCountersRequest : TBusMessage<TBusTabletCountersRequest, NKikimrClient::TTabletCountersRequest, MTYPE_CLIENT_TABLET_COUNTERS_REQUEST> {};
116-
struct TBusTabletLocalMKQL : TBusMessage<TBusTabletLocalMKQL, NKikimrClient::TLocalMKQL, MTYPE_CLIENT_LOCAL_MINIKQL> {};
117-
struct TBusTabletLocalSchemeTx : TBusMessage<TBusTabletLocalSchemeTx, NKikimrClient::TLocalSchemeTx, MTYPE_CLIENT_LOCAL_SCHEME_TX> {};
118115
struct TBusSchemeOperation : TBusMessage<TBusSchemeOperation, NKikimrClient::TSchemeOperation, MTYPE_CLIENT_FLAT_TX_REQUEST> {};
119116
struct TBusSchemeOperationStatus : TBusMessage<TBusSchemeOperationStatus, NKikimrClient::TSchemeOperationStatus, MTYPE_CLIENT_FLAT_TX_STATUS_REQUEST> {};
120117
struct TBusSchemeDescribe : TBusMessage<TBusSchemeDescribe, NKikimrClient::TSchemeDescribe, MTYPE_CLIENT_FLAT_DESCRIBE_REQUEST> {};
@@ -193,11 +190,8 @@ class TProtocol : public NBus::TBusBufferProtocol {
193190
RegisterType(new TBusOldKeyValue);
194191
RegisterType(new TBusKeyValueResponse);
195192
RegisterType(new TBusPersQueue);
196-
RegisterType(new TBusTabletKillRequest);
197193
RegisterType(new TBusTabletStateRequest);
198194
RegisterType(new TBusTabletCountersRequest);
199-
RegisterType(new TBusTabletLocalMKQL);
200-
RegisterType(new TBusTabletLocalSchemeTx);
201195
RegisterType(new TBusSchemeOperation);
202196
RegisterType(new TBusSchemeOperationStatus);
203197
RegisterType(new TBusSchemeDescribe);

‎ydb/public/lib/deprecated/client/grpc_client.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -330,9 +330,6 @@ namespace NKikimr {
330330
IMPL_REQUEST(RegisterNode, TNodeRegistrationRequest, TNodeRegistrationResponse)
331331
IMPL_REQUEST(CmsRequest, TCmsRequest, TCmsResponse)
332332
IMPL_REQUEST(SqsRequest, TSqsRequest, TSqsResponse)
333-
IMPL_REQUEST(LocalMKQL, TLocalMKQL, TResponse)
334-
IMPL_REQUEST(LocalSchemeTx, TLocalSchemeTx, TResponse)
335-
IMPL_REQUEST(TabletKillRequest, TTabletKillRequest, TResponse)
336333
IMPL_REQUEST(InterconnectDebug, TInterconnectDebug, TResponse)
337334
IMPL_REQUEST(TabletStateRequest, TTabletStateRequest, TResponse)
338335
IMPL_REQUEST(ChooseProxy, TChooseProxyRequest, TResponse)

‎ydb/public/lib/deprecated/client/grpc_client.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,6 @@ namespace NKikimr {
9999
/////////////////////////////////////////////////////////////////////////////////////////////////
100100
// INTROSPECTION
101101
/////////////////////////////////////////////////////////////////////////////////////////////////
102-
void LocalMKQL(const NKikimrClient::TLocalMKQL& request, TResponseCallback callback);
103-
void LocalSchemeTx(const NKikimrClient::TLocalSchemeTx& request, TResponseCallback callback);
104-
void TabletKillRequest(const NKikimrClient::TTabletKillRequest& request, TResponseCallback callback);
105102
void InterconnectDebug(const NKikimrClient::TInterconnectDebug& request, TResponseCallback callback);
106103

107104
/////////////////////////////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)