Skip to content

Commit c2244f7

Browse files
authored
Remove legacy kv api (#10614) (#15004)
1 parent 7aed41a commit c2244f7

File tree

11 files changed

+2
-277
lines changed

11 files changed

+2
-277
lines changed

ydb/core/client/server/grpc_server.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -444,8 +444,6 @@ void TGRpcService::SetupIncomingRequests() {
444444
// actor requests
445445
ADD_ACTOR_REQUEST(BlobStorageConfig, TBlobStorageConfigRequest, MTYPE_CLIENT_BLOB_STORAGE_CONFIG_REQUEST)
446446
ADD_ACTOR_REQUEST(HiveCreateTablet, THiveCreateTablet, MTYPE_CLIENT_HIVE_CREATE_TABLET)
447-
ADD_ACTOR_REQUEST(LocalEnumerateTablets, TLocalEnumerateTablets, MTYPE_CLIENT_LOCAL_ENUMERATE_TABLETS)
448-
ADD_ACTOR_REQUEST(KeyValue, TKeyValueRequest, MTYPE_CLIENT_KEYVALUE)
449447
ADD_ACTOR_REQUEST(TabletStateRequest, TTabletStateRequest, MTYPE_CLIENT_TABLET_STATE_REQUEST)
450448
ADD_ACTOR_REQUEST(LocalMKQL, TLocalMKQL, MTYPE_CLIENT_LOCAL_MINIKQL)
451449
ADD_ACTOR_REQUEST(LocalSchemeTx, TLocalSchemeTx, MTYPE_CLIENT_LOCAL_SCHEME_TX)

ydb/core/client/server/msgbus_server.cpp

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,6 @@ class TBusMessageContext::TImplGRpc
103103
MTYPE(TBusHiveCreateTablet)
104104
MTYPE(TBusOldHiveCreateTablet)
105105
MTYPE(TBusHiveCreateTabletResult)
106-
MTYPE(TBusLocalEnumerateTablets)
107-
MTYPE(TBusOldLocalEnumerateTablets)
108-
MTYPE(TBusLocalEnumerateTabletsResult)
109-
MTYPE(TBusKeyValue)
110-
MTYPE(TBusOldKeyValue)
111-
MTYPE(TBusKeyValueResponse)
112106
MTYPE(TBusPersQueue)
113107
MTYPE(TBusTabletKillRequest)
114108
MTYPE(TBusTabletStateRequest)
@@ -508,12 +502,6 @@ void TMessageBusServer::OnMessage(TBusMessageContext &msg) {
508502
case MTYPE_CLIENT_HIVE_CREATE_TABLET:
509503
case MTYPE_CLIENT_OLD_HIVE_CREATE_TABLET:
510504
return ClientActorRequest(CreateMessageBusHiveCreateTablet, msg);
511-
case MTYPE_CLIENT_LOCAL_ENUMERATE_TABLETS:
512-
case MTYPE_CLIENT_OLD_LOCAL_ENUMERATE_TABLETS:
513-
return ClientActorRequest(CreateMessageBusLocalEnumerateTablets, msg);
514-
case MTYPE_CLIENT_KEYVALUE:
515-
case MTYPE_CLIENT_OLD_KEYVALUE:
516-
return ClientActorRequest(CreateMessageBusKeyValue, msg);
517505
case MTYPE_CLIENT_PERSQUEUE:
518506
return ClientProxyRequest<TEvBusProxy::TEvPersQueue>(msg);
519507
case MTYPE_CLIENT_CHOOSE_PROXY:

ydb/core/client/server/msgbus_server.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,8 +278,6 @@ IActor* CreateMessageBusLocalSchemeTx(TBusMessageContext &msg);
278278
IActor* CreateMessageBusSchemeInitRoot(TBusMessageContext &msg);
279279
IActor* CreateMessageBusGetTypes(TBusMessageContext &msg);
280280
IActor* CreateMessageBusHiveCreateTablet(TBusMessageContext &msg);
281-
IActor* CreateMessageBusLocalEnumerateTablets(TBusMessageContext &msg);
282-
IActor* CreateMessageBusKeyValue(TBusMessageContext &msg);
283281
IActor* CreateMessageBusPersQueue(TBusMessageContext &msg);
284282
IActor* CreateMessageBusChooseProxy(TBusMessageContext &msg);
285283
IActor* CreateMessageBusTabletStateRequest(TBusMessageContext &msg);

ydb/core/client/server/msgbus_server_keyvalue.cpp

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

ydb/core/client/server/msgbus_server_local_enumerate_tablets.cpp

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

ydb/core/client/server/ya.make

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ SRCS(
1515
msgbus_server_drain_node.cpp
1616
msgbus_server_fill_node.cpp
1717
msgbus_server_hive_create_tablet.cpp
18-
msgbus_server_keyvalue.cpp
1918
msgbus_server_persqueue.cpp
2019
msgbus_server_persqueue.h
2120
msgbus_server_pq_metacache.h
@@ -25,7 +24,6 @@ SRCS(
2524
msgbus_server_pq_read_session_info.cpp
2625
msgbus_server_resolve_node.cpp
2726
msgbus_server_ic_debug.cpp
28-
msgbus_server_local_enumerate_tablets.cpp
2927
msgbus_server_local_minikql.cpp
3028
msgbus_server_local_scheme_tx.cpp
3129
msgbus_server_node_registration.cpp

ydb/core/driver_lib/cli_utils/cli.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ namespace NKikimr {
2323

2424
namespace NDriverClient {
2525
int SchemeInitRoot(TCommandConfig &cmdConf, int argc, char** argv);
26-
int KeyValueRequest(TCommandConfig &cmdConf, int argc, char **argv);
2726
int PersQueueRequest(TCommandConfig &cmdConf, int argc, char **argv);
2827
int PersQueueStress(TCommandConfig &cmdConf, int argc, char **argv);
2928
int PersQueueDiscoverClustersRequest(TCommandConfig &cmdConf, int argc, char **argv);

ydb/core/protos/grpc.proto

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ service TGRpcServer {
4949
// KV-TABLET INTERNAL INTERFACE
5050
/////////////////////////////////////////////////////////////////////////////////////////////////
5151
rpc HiveCreateTablet(THiveCreateTablet) returns (TResponse);
52-
rpc LocalEnumerateTablets(TLocalEnumerateTablets) returns (TResponse);
53-
rpc KeyValue(TKeyValueRequest) returns (TResponse);
52+
//rpc LocalEnumerateTablets(TLocalEnumerateTablets) returns (TResponse);
53+
//rpc KeyValue(TKeyValueRequest) returns (TResponse);
5454
rpc TestShardControl(TTestShardControlRequest) returns (TResponse);
5555

5656
/////////////////////////////////////////////////////////////////////////////////////////////////

ydb/public/lib/base/msgbus.h

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,6 @@ struct TBusTypesResponse : TBusMessage<TBusTypesResponse, NKikimrClient::TTypeMe
103103
struct TBusHiveCreateTablet : TBusMessage<TBusHiveCreateTablet, NKikimrClient::THiveCreateTablet, MTYPE_CLIENT_HIVE_CREATE_TABLET> {};
104104
struct TBusOldHiveCreateTablet : TBusMessage<TBusOldHiveCreateTablet, NKikimrClient::THiveCreateTablet, MTYPE_CLIENT_OLD_HIVE_CREATE_TABLET> {};
105105
struct TBusHiveCreateTabletResult : TBusMessage<TBusHiveCreateTabletResult, NKikimrClient::THiveCreateTabletResult, MTYPE_CLIENT_HIVE_CREATE_TABLET_RESULT> {};
106-
struct TBusLocalEnumerateTablets : TBusMessage<TBusLocalEnumerateTablets, NKikimrClient::TLocalEnumerateTablets, MTYPE_CLIENT_LOCAL_ENUMERATE_TABLETS> {};
107-
struct TBusOldLocalEnumerateTablets : TBusMessage<TBusOldLocalEnumerateTablets, NKikimrClient::TLocalEnumerateTablets, MTYPE_CLIENT_OLD_LOCAL_ENUMERATE_TABLETS> {};
108-
struct TBusLocalEnumerateTabletsResult : TBusMessage<TBusLocalEnumerateTabletsResult, NKikimrClient::TLocalEnumerateTabletsResult, MTYPE_CLIENT_LOCAL_ENUMERATE_TABLETS_RESULT> {};
109-
struct TBusKeyValue : TBusMessage<TBusKeyValue, NKikimrClient::TKeyValueRequest, MTYPE_CLIENT_KEYVALUE> {};
110-
struct TBusOldKeyValue : TBusMessage<TBusOldKeyValue, NKikimrClient::TKeyValueRequest, MTYPE_CLIENT_OLD_KEYVALUE> {};
111-
struct TBusKeyValueResponse : TBusMessage<TBusKeyValueResponse, NKikimrClient::TKeyValueResponse, MTYPE_CLIENT_KEYVALUE_RESPONSE> {};
112106
struct TBusPersQueue : TBusMessage<TBusPersQueue, NKikimrClient::TPersQueueRequest, MTYPE_CLIENT_PERSQUEUE> {};
113107
struct TBusTabletKillRequest : TBusMessage<TBusTabletKillRequest, NKikimrClient::TTabletKillRequest, MTYPE_CLIENT_TABLET_KILL_REQUEST> {};
114108
struct TBusTabletStateRequest : TBusMessage<TBusTabletStateRequest, NKikimrClient::TTabletStateRequest, MTYPE_CLIENT_TABLET_STATE_REQUEST> {};
@@ -184,12 +178,6 @@ class TProtocol : public NBus::TBusBufferProtocol {
184178
RegisterType(new TBusTypesRequest);
185179
RegisterType(new TBusTypesResponse);
186180
RegisterType(new TBusHiveCreateTablet);
187-
RegisterType(new TBusLocalEnumerateTablets);
188-
RegisterType(new TBusOldLocalEnumerateTablets);
189-
RegisterType(new TBusLocalEnumerateTabletsResult);
190-
RegisterType(new TBusKeyValue);
191-
RegisterType(new TBusOldKeyValue);
192-
RegisterType(new TBusKeyValueResponse);
193181
RegisterType(new TBusOldHiveCreateTablet);
194182
RegisterType(new TBusHiveCreateTabletResult);
195183
RegisterType(new TBusPersQueue);

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -325,8 +325,6 @@ namespace NKikimr {
325325
IMPL_REQUEST(ResolveNode, TResolveNodeRequest, TResponse)
326326
IMPL_REQUEST(HiveCreateTablet, THiveCreateTablet, TResponse)
327327
IMPL_REQUEST(RegisterNode, TNodeRegistrationRequest, TNodeRegistrationResponse)
328-
IMPL_REQUEST(LocalEnumerateTablets, TLocalEnumerateTablets, TResponse)
329-
IMPL_REQUEST(KeyValue, TKeyValueRequest, TResponse)
330328
IMPL_REQUEST(CmsRequest, TCmsRequest, TCmsResponse)
331329
IMPL_REQUEST(LocalMKQL, TLocalMKQL, TResponse)
332330
IMPL_REQUEST(LocalSchemeTx, TLocalSchemeTx, TResponse)

ydb/public/lib/deprecated/kicli/kikimr.cpp

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -245,10 +245,6 @@ class TKikimr::TGRpcImpl : public TKikimr::TImpl {
245245
return ExecuteGRpcRequest<NMsgBusProxy::TBusBlobStorageConfigRequest>(&NGRpcProxy::TGRpcClient::BlobStorageConfig, promise, request);
246246
case NMsgBusProxy::MTYPE_CLIENT_HIVE_CREATE_TABLET:
247247
return ExecuteGRpcRequest<NMsgBusProxy::TBusHiveCreateTablet>(&NGRpcProxy::TGRpcClient::HiveCreateTablet, promise, request);
248-
case NMsgBusProxy::MTYPE_CLIENT_LOCAL_ENUMERATE_TABLETS:
249-
return ExecuteGRpcRequest<NMsgBusProxy::TBusLocalEnumerateTablets>(&NGRpcProxy::TGRpcClient::LocalEnumerateTablets, promise, request);
250-
case NMsgBusProxy::MTYPE_CLIENT_KEYVALUE:
251-
return ExecuteGRpcRequest<NMsgBusProxy::TBusKeyValue>(&NGRpcProxy::TGRpcClient::KeyValue, promise, request);
252248
case NMsgBusProxy::MTYPE_CLIENT_LOCAL_MINIKQL:
253249
return ExecuteGRpcRequest<NMsgBusProxy::TBusTabletLocalMKQL>(&NGRpcProxy::TGRpcClient::LocalMKQL, promise, request);
254250
case NMsgBusProxy::MTYPE_CLIENT_LOCAL_SCHEME_TX:

0 commit comments

Comments
 (0)