summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Rutkovsky <[email protected]>2022-05-13 23:04:01 +0300
committerAlexander Rutkovsky <[email protected]>2022-05-13 23:04:01 +0300
commit9e8ec8dd4b9eb847063977247bbac75637bdafae (patch)
treebcb8e07cf67ae04b2df1bb4e271f7c0bcec13f5c
parentd6e57f2021a52215a03efea66dd91153c01a0ee8 (diff)
Rename blob sack to blob depot KIKIMR-14867
ref:8c2e0a038d857d660b1be56e83d9987e2e35e01d
-rw-r--r--CMakeLists.darwin.txt2
-rw-r--r--CMakeLists.linux.txt2
-rw-r--r--ydb/core/blob_depot/CMakeLists.txt (renamed from ydb/core/blob_sack/CMakeLists.txt)8
-rw-r--r--ydb/core/blob_depot/blob_depot.cpp10
-rw-r--r--ydb/core/blob_depot/blob_depot.h9
-rw-r--r--ydb/core/blob_depot/blob_depot_tablet.h (renamed from ydb/core/blob_sack/blob_sack_tablet.h)10
-rw-r--r--ydb/core/blob_depot/defs.h (renamed from ydb/core/blob_sack/defs.h)0
-rw-r--r--ydb/core/blob_sack/blob_sack.cpp10
-rw-r--r--ydb/core/blob_sack/blob_sack.h9
-rw-r--r--ydb/core/driver_lib/run/CMakeLists.txt2
-rw-r--r--ydb/core/driver_lib/run/kikimr_services_initializers.cpp6
-rw-r--r--ydb/core/mind/configured_tablet_bootstrapper.cpp6
-rw-r--r--ydb/core/mind/hive/monitoring.cpp6
-rw-r--r--ydb/core/protos/tablet.proto2
-rw-r--r--ydb/core/viewer/content/v2/tablet_cell.js2
-rw-r--r--ydb/core/viewer/content/viewer.js6
16 files changed, 45 insertions, 45 deletions
diff --git a/CMakeLists.darwin.txt b/CMakeLists.darwin.txt
index c80a1f2e726..310884c77b9 100644
--- a/CMakeLists.darwin.txt
+++ b/CMakeLists.darwin.txt
@@ -413,7 +413,7 @@ add_subdirectory(library/cpp/html/escape)
add_subdirectory(library/cpp/ipmath)
add_subdirectory(library/cpp/ipv6_address)
add_subdirectory(library/cpp/int128)
-add_subdirectory(ydb/core/blob_sack)
+add_subdirectory(ydb/core/blob_depot)
add_subdirectory(ydb/core/tablet_flat)
add_subdirectory(ydb/core/control)
add_subdirectory(ydb/core/tablet)
diff --git a/CMakeLists.linux.txt b/CMakeLists.linux.txt
index 409b480b3dc..b2464cf5c83 100644
--- a/CMakeLists.linux.txt
+++ b/CMakeLists.linux.txt
@@ -493,7 +493,7 @@ add_subdirectory(library/cpp/html/escape)
add_subdirectory(library/cpp/ipmath)
add_subdirectory(library/cpp/ipv6_address)
add_subdirectory(library/cpp/int128)
-add_subdirectory(ydb/core/blob_sack)
+add_subdirectory(ydb/core/blob_depot)
add_subdirectory(ydb/core/tablet_flat)
add_subdirectory(ydb/core/control)
add_subdirectory(ydb/core/tablet)
diff --git a/ydb/core/blob_sack/CMakeLists.txt b/ydb/core/blob_depot/CMakeLists.txt
index 850dedfbed1..d69c3a3d369 100644
--- a/ydb/core/blob_sack/CMakeLists.txt
+++ b/ydb/core/blob_depot/CMakeLists.txt
@@ -7,12 +7,12 @@
-add_library(ydb-core-blob_sack)
-target_link_libraries(ydb-core-blob_sack PUBLIC
+add_library(ydb-core-blob_depot)
+target_link_libraries(ydb-core-blob_depot PUBLIC
contrib-libs-cxxsupp
yutil
ydb-core-tablet_flat
)
-target_sources(ydb-core-blob_sack PRIVATE
- ${CMAKE_SOURCE_DIR}/ydb/core/blob_sack/blob_sack.cpp
+target_sources(ydb-core-blob_depot PRIVATE
+ ${CMAKE_SOURCE_DIR}/ydb/core/blob_depot/blob_depot.cpp
)
diff --git a/ydb/core/blob_depot/blob_depot.cpp b/ydb/core/blob_depot/blob_depot.cpp
new file mode 100644
index 00000000000..ee70e4b323a
--- /dev/null
+++ b/ydb/core/blob_depot/blob_depot.cpp
@@ -0,0 +1,10 @@
+#include "blob_depot.h"
+#include "blob_depot_tablet.h"
+
+namespace NKikimr::NBlobDepot {
+
+ IActor *CreateBlobDepot(const TActorId& tablet, TTabletStorageInfo *info) {
+ return new TBlobDepot(tablet, info);
+ }
+
+} // NKikimr::NBlobDepot
diff --git a/ydb/core/blob_depot/blob_depot.h b/ydb/core/blob_depot/blob_depot.h
new file mode 100644
index 00000000000..19d51e7e263
--- /dev/null
+++ b/ydb/core/blob_depot/blob_depot.h
@@ -0,0 +1,9 @@
+#pragma once
+
+#include "defs.h"
+
+namespace NKikimr::NBlobDepot {
+
+ IActor *CreateBlobDepot(const TActorId& tablet, TTabletStorageInfo *info);
+
+} // NKikimr::NBlobDepot
diff --git a/ydb/core/blob_sack/blob_sack_tablet.h b/ydb/core/blob_depot/blob_depot_tablet.h
index d719ab3569c..89f0dd215f6 100644
--- a/ydb/core/blob_sack/blob_sack_tablet.h
+++ b/ydb/core/blob_depot/blob_depot_tablet.h
@@ -2,16 +2,16 @@
#include "defs.h"
-namespace NKikimr::NBlobSack {
+namespace NKikimr::NBlobDepot {
using NTabletFlatExecutor::TTabletExecutedFlat;
- class TBlobSack
- : public TActor<TBlobSack>
+ class TBlobDepot
+ : public TActor<TBlobDepot>
, public TTabletExecutedFlat
{
public:
- TBlobSack(TActorId tablet, TTabletStorageInfo *info)
+ TBlobDepot(TActorId tablet, TTabletStorageInfo *info)
: TActor(&TThis::StateFunc)
, TTabletExecutedFlat(info, tablet, new NMiniKQL::TMiniKQLFactory)
{}
@@ -33,4 +33,4 @@ namespace NKikimr::NBlobSack {
}
};
-} // NKikimr::NBlobSack
+} // NKikimr::NBlobDepot
diff --git a/ydb/core/blob_sack/defs.h b/ydb/core/blob_depot/defs.h
index ad5b5531b8b..ad5b5531b8b 100644
--- a/ydb/core/blob_sack/defs.h
+++ b/ydb/core/blob_depot/defs.h
diff --git a/ydb/core/blob_sack/blob_sack.cpp b/ydb/core/blob_sack/blob_sack.cpp
deleted file mode 100644
index befb33470df..00000000000
--- a/ydb/core/blob_sack/blob_sack.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "blob_sack.h"
-#include "blob_sack_tablet.h"
-
-namespace NKikimr::NBlobSack {
-
- IActor *CreateBlobSack(const TActorId& tablet, TTabletStorageInfo *info) {
- return new TBlobSack(tablet, info);
- }
-
-} // NKikimr::NBlobSack
diff --git a/ydb/core/blob_sack/blob_sack.h b/ydb/core/blob_sack/blob_sack.h
deleted file mode 100644
index 858e6493c9d..00000000000
--- a/ydb/core/blob_sack/blob_sack.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#pragma once
-
-#include "defs.h"
-
-namespace NKikimr::NBlobSack {
-
- IActor *CreateBlobSack(const TActorId& tablet, TTabletStorageInfo *info);
-
-} // NKikimr::NBlobSack
diff --git a/ydb/core/driver_lib/run/CMakeLists.txt b/ydb/core/driver_lib/run/CMakeLists.txt
index 6a446efb7a8..0b81a7dff49 100644
--- a/ydb/core/driver_lib/run/CMakeLists.txt
+++ b/ydb/core/driver_lib/run/CMakeLists.txt
@@ -36,7 +36,7 @@ target_link_libraries(run PUBLIC
library-cpp-svnversion
ydb-core-actorlib_impl
ydb-core-base
- ydb-core-blob_sack
+ ydb-core-blob_depot
ydb-core-blobstorage
core-blobstorage-backpressure
core-blobstorage-nodewarden
diff --git a/ydb/core/driver_lib/run/kikimr_services_initializers.cpp b/ydb/core/driver_lib/run/kikimr_services_initializers.cpp
index 34e702f875d..52a3a941e34 100644
--- a/ydb/core/driver_lib/run/kikimr_services_initializers.cpp
+++ b/ydb/core/driver_lib/run/kikimr_services_initializers.cpp
@@ -55,7 +55,7 @@
#include <ydb/core/test_tablet/test_tablet.h>
#include <ydb/core/test_tablet/state_server_interface.h>
-#include <ydb/core/blob_sack/blob_sack.h>
+#include <ydb/core/blob_depot/blob_depot.h>
#include <ydb/core/health_check/health_check.h>
@@ -975,8 +975,8 @@ void TLocalServiceInitializer::InitializeServices(
new TTabletSetupInfo(&NSequenceShard::CreateSequenceShard, TMailboxType::ReadAsFilled, appData->UserPoolId, TMailboxType::ReadAsFilled, appData->SystemPoolId));
localConfig->TabletClassInfo[TTabletTypes::ReplicationController] = TLocalConfig::TTabletClassInfo(
new TTabletSetupInfo(&NReplication::CreateController, TMailboxType::ReadAsFilled, appData->UserPoolId, TMailboxType::ReadAsFilled, appData->SystemPoolId));
- localConfig->TabletClassInfo[TTabletTypes::BlobSack] = TLocalConfig::TTabletClassInfo(
- new TTabletSetupInfo(&NBlobSack::CreateBlobSack, TMailboxType::ReadAsFilled, appData->UserPoolId, TMailboxType::ReadAsFilled, appData->SystemPoolId));
+ localConfig->TabletClassInfo[TTabletTypes::BlobDepot] = TLocalConfig::TTabletClassInfo(
+ new TTabletSetupInfo(&NBlobDepot::CreateBlobDepot, TMailboxType::ReadAsFilled, appData->UserPoolId, TMailboxType::ReadAsFilled, appData->SystemPoolId));
TTenantPoolConfig::TPtr tenantPoolConfig = new TTenantPoolConfig(Config.GetTenantPoolConfig(), localConfig);
if (!tenantPoolConfig->IsEnabled
diff --git a/ydb/core/mind/configured_tablet_bootstrapper.cpp b/ydb/core/mind/configured_tablet_bootstrapper.cpp
index 734be11a62f..1b23e44e942 100644
--- a/ydb/core/mind/configured_tablet_bootstrapper.cpp
+++ b/ydb/core/mind/configured_tablet_bootstrapper.cpp
@@ -22,7 +22,7 @@
#include <ydb/core/kesus/tablet/tablet.h>
#include <ydb/core/sys_view/processor/processor.h>
#include <ydb/core/test_tablet/test_tablet.h>
-#include <ydb/core/blob_sack/blob_sack.h>
+#include <ydb/core/blob_depot/blob_depot.h>
#include <library/cpp/actors/core/hfunc.h>
@@ -224,8 +224,8 @@ TIntrusivePtr<TTabletSetupInfo> MakeTabletSetupInfo(
case TTabletTypes::ReplicationController:
createFunc = &NReplication::CreateController;
break;
- case TTabletTypes::BlobSack:
- createFunc = &NBlobSack::CreateBlobSack;
+ case TTabletTypes::BlobDepot:
+ createFunc = &NBlobDepot::CreateBlobDepot;
break;
default:
return nullptr;
diff --git a/ydb/core/mind/hive/monitoring.cpp b/ydb/core/mind/hive/monitoring.cpp
index 3d3c0f68f55..46df5add560 100644
--- a/ydb/core/mind/hive/monitoring.cpp
+++ b/ydb/core/mind/hive/monitoring.cpp
@@ -683,7 +683,7 @@ public:
TTabletTypes::PersQueueReadBalancer,
TTabletTypes::NodeBroker,
TTabletTypes::TestShard,
- TTabletTypes::BlobSack}) {
+ TTabletTypes::BlobDepot}) {
if (shortType == LongToShortTabletName(TTabletTypes::TypeToStr(tabletType))) {
return tabletType;
}
@@ -932,7 +932,7 @@ public:
TTabletTypes::PersQueueReadBalancer,
TTabletTypes::NodeBroker,
TTabletTypes::TestShard,
- TTabletTypes::BlobSack}) {
+ TTabletTypes::BlobDepot}) {
const TVector<i64>& allowedMetrics = Self->GetTabletTypeAllowedMetricIds(tabletType);
out << "<tr>"
"<td>" << LongToShortTabletName(TTabletTypes::TypeToStr(tabletType)) << "</td>";
@@ -1098,7 +1098,7 @@ public:
return "S";
case TTabletTypes::ReplicationController:
return "RC";
- case TTabletTypes::BlobSack:
+ case TTabletTypes::BlobDepot:
return "BS";
default:
return Sprintf("%d", (int)type);
diff --git a/ydb/core/protos/tablet.proto b/ydb/core/protos/tablet.proto
index 653cf692b0a..98f84828ff6 100644
--- a/ydb/core/protos/tablet.proto
+++ b/ydb/core/protos/tablet.proto
@@ -46,7 +46,7 @@ message TTabletTypes {
TestShard = 36;
SequenceShard = 37;
ReplicationController = 38;
- BlobSack = 39;
+ BlobDepot = 39;
// when adding a new tablet type and keeping parse compatibility with the old version
// rename existing reserved item to desired one, and add new reserved item to
diff --git a/ydb/core/viewer/content/v2/tablet_cell.js b/ydb/core/viewer/content/v2/tablet_cell.js
index f0896818b9e..74054dd7a64 100644
--- a/ydb/core/viewer/content/v2/tablet_cell.js
+++ b/ydb/core/viewer/content/v2/tablet_cell.js
@@ -26,7 +26,7 @@ TabletCell.prototype.tabletTypes = {
'SequenceShard': 'S',
'ReplicationController': 'RC',
'TestShard': 'TS',
- 'BlobSack': 'BL',
+ 'BlobDepot': 'BD',
};
TabletCell.prototype.getTabletType = function() {
diff --git a/ydb/core/viewer/content/viewer.js b/ydb/core/viewer/content/viewer.js
index 1a2f142dc14..eab8b9d7b16 100644
--- a/ydb/core/viewer/content/viewer.js
+++ b/ydb/core/viewer/content/viewer.js
@@ -1508,8 +1508,8 @@ function tabletTypeToSymbol(type) {
return "RC";
case "TestShard":
return "TS";
- case "BlobSack":
- return "BL";
+ case "BlobDepot":
+ return "BD";
}
return "XX";
}
@@ -1913,7 +1913,7 @@ function getTabletTypeFromHiveTabletType(type) {
case 36:
return "TestShard";
case 39:
- return "BlobSack";
+ return "BlobDepot";
}
return type;
}