aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordcherednik <dcherednik@ydb.tech>2022-09-22 16:16:11 +0300
committerdcherednik <dcherednik@ydb.tech>2022-09-22 16:16:11 +0300
commit2c596b01de64f95da16a4ca5e929ab0abafce384 (patch)
tree5d9347056de425ca1b9a70aa3e055cc1cdf90e16
parent37ddfd3dabecbbb5e026f57212143ea938e8e070 (diff)
downloadydb-2c596b01de64f95da16a4ca5e929ab0abafce384.tar.gz
Move bulksstmng in to generic.
-rw-r--r--ydb/core/blobstorage/vdisk/hulldb/CMakeLists.txt7
-rw-r--r--ydb/core/blobstorage/vdisk/hulldb/generic/CMakeLists.txt1
-rw-r--r--ydb/core/blobstorage/vdisk/hulldb/generic/hulldb_bulksstloaded.h (renamed from ydb/core/blobstorage/vdisk/hulldb/hulldb_bulksstloaded.h)0
-rw-r--r--ydb/core/blobstorage/vdisk/hulldb/generic/hulldb_bulksstmngr.cpp (renamed from ydb/core/blobstorage/vdisk/hulldb/hulldb_bulksstmngr.cpp)0
-rw-r--r--ydb/core/blobstorage/vdisk/hulldb/generic/hulldb_bulksstmngr.h (renamed from ydb/core/blobstorage/vdisk/hulldb/hulldb_bulksstmngr.h)0
-rw-r--r--ydb/core/blobstorage/vdisk/hulldb/generic/hullds_sstslice.h2
-rw-r--r--ydb/core/blobstorage/vdisk/localrecovery/localrecovery_public.cpp2
7 files changed, 5 insertions, 7 deletions
diff --git a/ydb/core/blobstorage/vdisk/hulldb/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/CMakeLists.txt
index fbe4119cb7..2493142223 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/CMakeLists.txt
@@ -16,8 +16,8 @@ add_subdirectory(generic)
add_subdirectory(recovery)
add_subdirectory(test)
-add_library(blobstorage-vdisk-hulldb)
-target_link_libraries(blobstorage-vdisk-hulldb PUBLIC
+add_library(blobstorage-vdisk-hulldb INTERFACE)
+target_link_libraries(blobstorage-vdisk-hulldb INTERFACE
contrib-libs-cxxsupp
yutil
core-blobstorage-base
@@ -31,6 +31,3 @@ target_link_libraries(blobstorage-vdisk-hulldb PUBLIC
vdisk-hulldb-bulksst_add
ydb-core-protos
)
-target_sources(blobstorage-vdisk-hulldb PRIVATE
- ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/vdisk/hulldb/hulldb_bulksstmngr.cpp
-)
diff --git a/ydb/core/blobstorage/vdisk/hulldb/generic/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/generic/CMakeLists.txt
index fdd02dad55..56dece38a7 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/generic/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/generic/CMakeLists.txt
@@ -19,6 +19,7 @@ target_link_libraries(vdisk-hulldb-generic PUBLIC
)
target_sources(vdisk-hulldb-generic PRIVATE
${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/vdisk/hulldb/generic/blobstorage_hulloptlsn.cpp
+ ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/vdisk/hulldb/generic/hulldb_bulksstmngr.cpp
${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/vdisk/hulldb/generic/hullds_idx.cpp
${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/vdisk/hulldb/generic/hullds_idxsnap.cpp
${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/vdisk/hulldb/generic/hullds_sst.cpp
diff --git a/ydb/core/blobstorage/vdisk/hulldb/hulldb_bulksstloaded.h b/ydb/core/blobstorage/vdisk/hulldb/generic/hulldb_bulksstloaded.h
index 516b6df786..516b6df786 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/hulldb_bulksstloaded.h
+++ b/ydb/core/blobstorage/vdisk/hulldb/generic/hulldb_bulksstloaded.h
diff --git a/ydb/core/blobstorage/vdisk/hulldb/hulldb_bulksstmngr.cpp b/ydb/core/blobstorage/vdisk/hulldb/generic/hulldb_bulksstmngr.cpp
index 3cc7d07a19..3cc7d07a19 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/hulldb_bulksstmngr.cpp
+++ b/ydb/core/blobstorage/vdisk/hulldb/generic/hulldb_bulksstmngr.cpp
diff --git a/ydb/core/blobstorage/vdisk/hulldb/hulldb_bulksstmngr.h b/ydb/core/blobstorage/vdisk/hulldb/generic/hulldb_bulksstmngr.h
index 22038ef95c..22038ef95c 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/hulldb_bulksstmngr.h
+++ b/ydb/core/blobstorage/vdisk/hulldb/generic/hulldb_bulksstmngr.h
diff --git a/ydb/core/blobstorage/vdisk/hulldb/generic/hullds_sstslice.h b/ydb/core/blobstorage/vdisk/hulldb/generic/hullds_sstslice.h
index 37fc6fde77..e30e08544c 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/generic/hullds_sstslice.h
+++ b/ydb/core/blobstorage/vdisk/hulldb/generic/hullds_sstslice.h
@@ -3,7 +3,7 @@
#include "defs.h"
#include <ydb/core/blobstorage/vdisk/hulldb/fresh/fresh_data.h>
#include "hullds_sstvec.h"
-#include <ydb/core/blobstorage/vdisk/hulldb/hulldb_bulksstmngr.h>
+#include "hulldb_bulksstmngr.h"
#include <ydb/core/blobstorage/vdisk/hullop/hullcompdelete/blobstorage_hullcompdelete.h>
diff --git a/ydb/core/blobstorage/vdisk/localrecovery/localrecovery_public.cpp b/ydb/core/blobstorage/vdisk/localrecovery/localrecovery_public.cpp
index 9a8e64f1ef..f48a118528 100644
--- a/ydb/core/blobstorage/vdisk/localrecovery/localrecovery_public.cpp
+++ b/ydb/core/blobstorage/vdisk/localrecovery/localrecovery_public.cpp
@@ -2,7 +2,7 @@
#include "localrecovery_logreplay.h"
#include <ydb/core/blobstorage/vdisk/common/vdisk_lsnmngr.h>
#include <ydb/core/blobstorage/vdisk/hulldb/recovery/hulldb_recovery.h>
-#include <ydb/core/blobstorage/vdisk/hulldb/hulldb_bulksstloaded.h>
+#include <ydb/core/blobstorage/vdisk/hulldb/generic/hulldb_bulksstloaded.h>
#include <ydb/core/blobstorage/vdisk/hullop/blobstorage_hullload.h>
#include <ydb/core/blobstorage/vdisk/hullop/hullop_entryserialize.h>
#include <ydb/core/blobstorage/vdisk/huge/blobstorage_hullhugeheap.h>