Move block cache in to separate lib. Fix missed blobstorage PEERDIRs.

12 files changed, 54 insertions, 30 deletions

diff --git a/ydb/core/blobstorage/vdisk/hulldb/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/CMakeLists.txt
index dc79806422f..436e74b5701 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/CMakeLists.txt
@@ -8,11 +8,11 @@
 
 add_subdirectory(barriers)
 add_subdirectory(base)
+add_subdirectory(cache_block)
 add_subdirectory(compstrat)
 add_subdirectory(fresh)
 add_subdirectory(generic)
 add_subdirectory(test)
-add_subdirectory(ut)
 
 add_library(blobstorage-vdisk-hulldb)
 target_link_libraries(blobstorage-vdisk-hulldb PUBLIC
@@ -32,5 +32,4 @@ target_sources(blobstorage-vdisk-hulldb PRIVATE
   ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/vdisk/hulldb/hulldb_bulksst_add.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/vdisk/hulldb/hulldb_bulksstmngr.cpp
   ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/vdisk/hulldb/hulldb_recovery.cpp
-  ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/vdisk/hulldb/hullds_cache_block.cpp
 )
diff --git a/ydb/core/blobstorage/vdisk/hulldb/cache_block/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/cache_block/CMakeLists.txt
new file mode 100644
index 00000000000..debd7973f93
--- /dev/null
+++ b/ydb/core/blobstorage/vdisk/hulldb/cache_block/CMakeLists.txt
@@ -0,0 +1,21 @@
+
+# This file was gererated by the build system used internally in the Yandex monorepo.
+# Only simple modifications are allowed (adding source-files to targets, adding simple properties
+# like target_include_directories). These modifications will be ported to original
+# ya.make files by maintainers. Any complex modifications which can't be ported back to the
+# original buildsystem will not be accepted.
+
+
+add_subdirectory(ut)
+
+add_library(vdisk-hulldb-cache_block)
+target_link_libraries(vdisk-hulldb-cache_block PUBLIC
+  contrib-libs-cxxsupp
+  yutil
+  vdisk-hulldb-base
+  blobstorage-vdisk-protos
+  ydb-core-protos
+)
+target_sources(vdisk-hulldb-cache_block PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/vdisk/hulldb/cache_block/cache_block.cpp
+)
diff --git a/ydb/core/blobstorage/vdisk/hulldb/hullds_cache_block.cpp b/ydb/core/blobstorage/vdisk/hulldb/cache_block/cache_block.cpp
index 0518901777b..c73c6a0805f 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/hullds_cache_block.cpp
+++ b/ydb/core/blobstorage/vdisk/hulldb/cache_block/cache_block.cpp
@@ -1,4 +1,4 @@
-#include "hullds_cache_block.h"
+#include "cache_block.h"
 #include <util/stream/output.h>
 
 template<>
diff --git a/ydb/core/blobstorage/vdisk/hulldb/hullds_cache_block.h b/ydb/core/blobstorage/vdisk/hulldb/cache_block/cache_block.h
index 2c207a89542..3a1e06a87b8 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/hullds_cache_block.h
+++ b/ydb/core/blobstorage/vdisk/hulldb/cache_block/cache_block.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "defs.h"
-#include "hull_ds_all.h"
+#include <ydb/core/blobstorage/vdisk/hulldb/defs.h>
+#include <ydb/core/blobstorage/vdisk/hulldb/hull_ds_all.h>
 
 namespace NKikimr {
 
diff --git a/ydb/core/blobstorage/vdisk/hulldb/hullds_cache_block_ut.cpp b/ydb/core/blobstorage/vdisk/hulldb/cache_block/cache_block_ut.cpp
index 1af113c2aab..30872c57912 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/hullds_cache_block_ut.cpp
+++ b/ydb/core/blobstorage/vdisk/hulldb/cache_block/cache_block_ut.cpp
@@ -1,4 +1,4 @@
-#include "hullds_cache_block.h"
+#include "cache_block.h"
 #include <library/cpp/testing/unittest/registar.h>
 
 #include <util/stream/null.h>
diff --git a/ydb/core/blobstorage/vdisk/hulldb/ut/CMakeLists.darwin.txt b/ydb/core/blobstorage/vdisk/hulldb/cache_block/ut/CMakeLists.darwin.txt
index 86bc36f8415..98958035de0 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/ut/CMakeLists.darwin.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/cache_block/ut/CMakeLists.darwin.txt
@@ -7,23 +7,23 @@
 
 
 
-add_executable(ydb-core-blobstorage-vdisk-hulldb-ut)
-target_include_directories(ydb-core-blobstorage-vdisk-hulldb-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/vdisk/hulldb
+add_executable(ydb-core-blobstorage-vdisk-hulldb-cache_block-ut)
+target_include_directories(ydb-core-blobstorage-vdisk-hulldb-cache_block-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/vdisk/hulldb/cache_block
 )
-target_link_libraries(ydb-core-blobstorage-vdisk-hulldb-ut PUBLIC
+target_link_libraries(ydb-core-blobstorage-vdisk-hulldb-cache_block-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
   library-cpp-cpuid_check
   cpp-testing-unittest_main
-  blobstorage-vdisk-hulldb
+  vdisk-hulldb-cache_block
   library-cpp-getopt
   library-cpp-svnversion
   ydb-core-base
   ydb-core-blobstorage
   ydb-core-erasure
 )
-target_link_options(ydb-core-blobstorage-vdisk-hulldb-ut PRIVATE
+target_link_options(ydb-core-blobstorage-vdisk-hulldb-cache_block-ut PRIVATE
   -Wl,-no_deduplicate
   -Wl,-sdk_version,10.15
   -fPIC
@@ -31,18 +31,18 @@ target_link_options(ydb-core-blobstorage-vdisk-hulldb-ut PRIVATE
   -framework
   CoreFoundation
 )
-target_sources(ydb-core-blobstorage-vdisk-hulldb-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/vdisk/hulldb/hullds_cache_block_ut.cpp
+target_sources(ydb-core-blobstorage-vdisk-hulldb-cache_block-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/vdisk/hulldb/cache_block/cache_block_ut.cpp
 )
 add_test(
   NAME
-  ydb-core-blobstorage-vdisk-hulldb-ut
+  ydb-core-blobstorage-vdisk-hulldb-cache_block-ut
   COMMAND
-  ydb-core-blobstorage-vdisk-hulldb-ut
+  ydb-core-blobstorage-vdisk-hulldb-cache_block-ut
   --print-before-suite
   --print-before-test
   --fork-tests
   --print-times
   --show-fails
 )
-vcs_info(ydb-core-blobstorage-vdisk-hulldb-ut)
+vcs_info(ydb-core-blobstorage-vdisk-hulldb-cache_block-ut)
diff --git a/ydb/core/blobstorage/vdisk/hulldb/ut/CMakeLists.linux.txt b/ydb/core/blobstorage/vdisk/hulldb/cache_block/ut/CMakeLists.linux.txt
index 0ba5d33fb4c..1bc8b29660b 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/ut/CMakeLists.linux.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/cache_block/ut/CMakeLists.linux.txt
@@ -7,25 +7,25 @@
 
 
 
-add_executable(ydb-core-blobstorage-vdisk-hulldb-ut)
-target_include_directories(ydb-core-blobstorage-vdisk-hulldb-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/vdisk/hulldb
+add_executable(ydb-core-blobstorage-vdisk-hulldb-cache_block-ut)
+target_include_directories(ydb-core-blobstorage-vdisk-hulldb-cache_block-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/vdisk/hulldb/cache_block
 )
-target_link_libraries(ydb-core-blobstorage-vdisk-hulldb-ut PUBLIC
+target_link_libraries(ydb-core-blobstorage-vdisk-hulldb-cache_block-ut PUBLIC
   contrib-libs-cxxsupp
   yutil
   cpp-malloc-tcmalloc
   libs-tcmalloc-no_percpu_cache
   library-cpp-cpuid_check
   cpp-testing-unittest_main
-  blobstorage-vdisk-hulldb
+  vdisk-hulldb-cache_block
   library-cpp-getopt
   library-cpp-svnversion
   ydb-core-base
   ydb-core-blobstorage
   ydb-core-erasure
 )
-target_link_options(ydb-core-blobstorage-vdisk-hulldb-ut PRIVATE
+target_link_options(ydb-core-blobstorage-vdisk-hulldb-cache_block-ut PRIVATE
   -ldl
   -lrt
   -Wl,--no-as-needed
@@ -35,18 +35,18 @@ target_link_options(ydb-core-blobstorage-vdisk-hulldb-ut PRIVATE
   -lrt
   -ldl
 )
-target_sources(ydb-core-blobstorage-vdisk-hulldb-ut PRIVATE
-  ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/vdisk/hulldb/hullds_cache_block_ut.cpp
+target_sources(ydb-core-blobstorage-vdisk-hulldb-cache_block-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/ydb/core/blobstorage/vdisk/hulldb/cache_block/cache_block_ut.cpp
 )
 add_test(
   NAME
-  ydb-core-blobstorage-vdisk-hulldb-ut
+  ydb-core-blobstorage-vdisk-hulldb-cache_block-ut
   COMMAND
-  ydb-core-blobstorage-vdisk-hulldb-ut
+  ydb-core-blobstorage-vdisk-hulldb-cache_block-ut
   --print-before-suite
   --print-before-test
   --fork-tests
   --print-times
   --show-fails
 )
-vcs_info(ydb-core-blobstorage-vdisk-hulldb-ut)
+vcs_info(ydb-core-blobstorage-vdisk-hulldb-cache_block-ut)
diff --git a/ydb/core/blobstorage/vdisk/hulldb/ut/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/cache_block/ut/CMakeLists.txt
index dbfe6fa2c47..dbfe6fa2c47 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/ut/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/cache_block/ut/CMakeLists.txt
diff --git a/ydb/core/blobstorage/vdisk/hulldb/generic/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hulldb/generic/CMakeLists.txt
index eb37c474a95..fdd02dad556 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/generic/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/hulldb/generic/CMakeLists.txt
@@ -13,6 +13,7 @@ target_link_libraries(vdisk-hulldb-generic PUBLIC
   contrib-libs-cxxsupp
   yutil
   vdisk-hulldb-base
+  vdisk-hulldb-fresh
   blobstorage-vdisk-protos
   ydb-core-protos
 )
diff --git a/ydb/core/blobstorage/vdisk/hulldb/hulldb_recovery.h b/ydb/core/blobstorage/vdisk/hulldb/hulldb_recovery.h
index 7ad57c73695..66a124aec86 100644
--- a/ydb/core/blobstorage/vdisk/hulldb/hulldb_recovery.h
+++ b/ydb/core/blobstorage/vdisk/hulldb/hulldb_recovery.h
@@ -2,8 +2,8 @@
 #include "defs.h"
 
 #include <ydb/core/blobstorage/vdisk/hulldb/barriers/hullds_cache_barrier.h>
+#include <ydb/core/blobstorage/vdisk/hulldb/cache_block/cache_block.h>
 #include <ydb/core/blobstorage/vdisk/protos/events.pb.h>
-#include "hullds_cache_block.h"
 #include "hulldb_bulksst_add.h"
 
 namespace NKikimr {
diff --git a/ydb/core/blobstorage/vdisk/hullop/CMakeLists.txt b/ydb/core/blobstorage/vdisk/hullop/CMakeLists.txt
index ffdbfe07345..9c956ec2d05 100644
--- a/ydb/core/blobstorage/vdisk/hullop/CMakeLists.txt
+++ b/ydb/core/blobstorage/vdisk/hullop/CMakeLists.txt
@@ -15,6 +15,9 @@ target_link_libraries(blobstorage-vdisk-hullop PUBLIC
   vdisk-hulldb-barriers
   vdisk-hulldb-base
   vdisk-hulldb-generic
+  vdisk-hulldb-cache_block
+  blobstorage-vdisk-handoff
+  blobstorage-vdisk-synclog
   ydb-core-protos
 )
 target_sources(blobstorage-vdisk-hullop PRIVATE
diff --git a/ydb/core/blobstorage/vdisk/hullop/blobstorage_hull.h b/ydb/core/blobstorage/vdisk/hullop/blobstorage_hull.h
index f77c6d83df2..604c84c2bcd 100644
--- a/ydb/core/blobstorage/vdisk/hullop/blobstorage_hull.h
+++ b/ydb/core/blobstorage/vdisk/hullop/blobstorage_hull.h
@@ -1,7 +1,7 @@
 #pragma once
 #include "defs.h"
 #include <ydb/core/blobstorage/vdisk/common/vdisk_hulllogctx.h>
-#include <ydb/core/blobstorage/vdisk/hulldb/hullds_cache_block.h>
+#include <ydb/core/blobstorage/vdisk/hulldb/cache_block/cache_block.h>
 #include <ydb/core/blobstorage/vdisk/hulldb/hulldb_recovery.h>
 #include <ydb/core/blobstorage/vdisk/hulldb/hulldb_bulksst_add.h>
 #include <ydb/core/blobstorage/vdisk/synclog/blobstorage_synclog_public_events.h>