updated CMakeLists.txt after merge, fixed includes

ydb-platform · Sep 30, 2024 · 5428bf6 · 5428bf6
1 parent 8f67987
commit 5428bf6
Show file tree

Hide file tree

Showing 17 changed files with 17 additions and 1 deletion.
diff --git a/cloud/filestore/libs/storage/service/service_actor_actions_unsafe_node_ops.cpp b/cloud/filestore/libs/storage/service/service_actor_actions_unsafe_node_ops.cpp
@@ -6,7 +6,7 @@
 #include <cloud/filestore/libs/storage/core/public.h>
 #include <cloud/filestore/private/api/protos/tablet.pb.h>
 
-#include <contrib/ydb/library/actors/core/actor_bootstrapped.h>
+#include <library/cpp/actors/core/actor_bootstrapped.h>
 
 #include <google/protobuf/util/json_util.h>
 

diff --git a/cloud/filestore/libs/storage/tablet/CMakeLists.darwin-x86_64.txt b/cloud/filestore/libs/storage/tablet/CMakeLists.darwin-x86_64.txt
@@ -117,6 +117,7 @@ target_sources(libs-storage-tablet PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_throttling.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_truncate.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_unlinknode.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_unsafe_node_ops.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_updateconfig.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_waitready.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_writebatch.cpp

diff --git a/cloud/filestore/libs/storage/tablet/CMakeLists.linux-aarch64.txt b/cloud/filestore/libs/storage/tablet/CMakeLists.linux-aarch64.txt
@@ -118,6 +118,7 @@ target_sources(libs-storage-tablet PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_throttling.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_truncate.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_unlinknode.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_unsafe_node_ops.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_updateconfig.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_waitready.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_writebatch.cpp

diff --git a/cloud/filestore/libs/storage/tablet/CMakeLists.linux-x86_64.txt b/cloud/filestore/libs/storage/tablet/CMakeLists.linux-x86_64.txt
@@ -118,6 +118,7 @@ target_sources(libs-storage-tablet PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_throttling.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_truncate.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_unlinknode.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_unsafe_node_ops.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_updateconfig.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_waitready.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_writebatch.cpp

diff --git a/cloud/filestore/libs/storage/tablet/CMakeLists.windows-x86_64.txt b/cloud/filestore/libs/storage/tablet/CMakeLists.windows-x86_64.txt
@@ -117,6 +117,7 @@ target_sources(libs-storage-tablet PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_throttling.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_truncate.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_unlinknode.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_unsafe_node_ops.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_updateconfig.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_waitready.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/storage/tablet/tablet_actor_writebatch.cpp

diff --git a/cloud/filestore/libs/vfs_fuse/CMakeLists.darwin-x86_64.txt b/cloud/filestore/libs/vfs_fuse/CMakeLists.darwin-x86_64.txt
@@ -31,6 +31,7 @@ target_link_libraries(filestore-libs-vfs_fuse PUBLIC
 target_sources(filestore-libs-vfs_fuse PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/cache.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/config.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/file_ring_buffer.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs_impl.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs_impl_attr.cpp

diff --git a/cloud/filestore/libs/vfs_fuse/CMakeLists.linux-aarch64.txt b/cloud/filestore/libs/vfs_fuse/CMakeLists.linux-aarch64.txt
@@ -32,6 +32,7 @@ target_link_libraries(filestore-libs-vfs_fuse PUBLIC
 target_sources(filestore-libs-vfs_fuse PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/cache.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/config.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/file_ring_buffer.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs_impl.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs_impl_attr.cpp

diff --git a/cloud/filestore/libs/vfs_fuse/CMakeLists.linux-x86_64.txt b/cloud/filestore/libs/vfs_fuse/CMakeLists.linux-x86_64.txt
@@ -33,6 +33,7 @@ target_link_libraries(filestore-libs-vfs_fuse PUBLIC
 target_sources(filestore-libs-vfs_fuse PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/cache.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/config.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/file_ring_buffer.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs_impl.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs_impl_attr.cpp

diff --git a/cloud/filestore/libs/vfs_fuse/CMakeLists.windows-x86_64.txt b/cloud/filestore/libs/vfs_fuse/CMakeLists.windows-x86_64.txt
@@ -31,6 +31,7 @@ target_link_libraries(filestore-libs-vfs_fuse PUBLIC
 target_sources(filestore-libs-vfs_fuse PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/cache.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/config.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/file_ring_buffer.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs_impl.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs_impl_attr.cpp

diff --git a/cloud/filestore/libs/vfs_fuse/ut/CMakeLists.darwin-x86_64.txt b/cloud/filestore/libs/vfs_fuse/ut/CMakeLists.darwin-x86_64.txt
@@ -25,6 +25,7 @@ target_link_options(cloud-filestore-libs-vfs_fuse-ut PRIVATE
   CoreFoundation
 )
 target_sources(cloud-filestore-libs-vfs_fuse-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/file_ring_buffer_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs_ut.cpp
 )
 set_property(

diff --git a/cloud/filestore/libs/vfs_fuse/ut/CMakeLists.linux-aarch64.txt b/cloud/filestore/libs/vfs_fuse/ut/CMakeLists.linux-aarch64.txt
@@ -28,6 +28,7 @@ target_link_options(cloud-filestore-libs-vfs_fuse-ut PRIVATE
   -ldl
 )
 target_sources(cloud-filestore-libs-vfs_fuse-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/file_ring_buffer_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs_ut.cpp
 )
 set_property(

diff --git a/cloud/filestore/libs/vfs_fuse/ut/CMakeLists.linux-x86_64.txt b/cloud/filestore/libs/vfs_fuse/ut/CMakeLists.linux-x86_64.txt
@@ -29,6 +29,7 @@ target_link_options(cloud-filestore-libs-vfs_fuse-ut PRIVATE
   -ldl
 )
 target_sources(cloud-filestore-libs-vfs_fuse-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/file_ring_buffer_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs_ut.cpp
 )
 set_property(

diff --git a/cloud/filestore/libs/vfs_fuse/ut/CMakeLists.windows-x86_64.txt b/cloud/filestore/libs/vfs_fuse/ut/CMakeLists.windows-x86_64.txt
@@ -18,6 +18,7 @@ target_link_libraries(cloud-filestore-libs-vfs_fuse-ut PUBLIC
   filestore-libs-vhost
 )
 target_sources(cloud-filestore-libs-vfs_fuse-ut PRIVATE
+  ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/file_ring_buffer_ut.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs_ut.cpp
 )
 set_property(

diff --git a/cloud/filestore/libs/vfs_fuse/vhost/CMakeLists.darwin-x86_64.txt b/cloud/filestore/libs/vfs_fuse/vhost/CMakeLists.darwin-x86_64.txt
@@ -30,6 +30,7 @@ target_link_libraries(libs-vfs_fuse-vhost PUBLIC
 target_sources(libs-vfs_fuse-vhost PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/cache.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/config.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/file_ring_buffer.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs_impl.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs_impl_attr.cpp

diff --git a/cloud/filestore/libs/vfs_fuse/vhost/CMakeLists.linux-aarch64.txt b/cloud/filestore/libs/vfs_fuse/vhost/CMakeLists.linux-aarch64.txt
@@ -32,6 +32,7 @@ target_link_libraries(libs-vfs_fuse-vhost PUBLIC
 target_sources(libs-vfs_fuse-vhost PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/cache.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/config.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/file_ring_buffer.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs_impl.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs_impl_attr.cpp

diff --git a/cloud/filestore/libs/vfs_fuse/vhost/CMakeLists.linux-x86_64.txt b/cloud/filestore/libs/vfs_fuse/vhost/CMakeLists.linux-x86_64.txt
@@ -32,6 +32,7 @@ target_link_libraries(libs-vfs_fuse-vhost PUBLIC
 target_sources(libs-vfs_fuse-vhost PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/cache.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/config.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/file_ring_buffer.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs_impl.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs_impl_attr.cpp

diff --git a/cloud/filestore/libs/vfs_fuse/vhost/CMakeLists.windows-x86_64.txt b/cloud/filestore/libs/vfs_fuse/vhost/CMakeLists.windows-x86_64.txt
@@ -30,6 +30,7 @@ target_link_libraries(libs-vfs_fuse-vhost PUBLIC
 target_sources(libs-vfs_fuse-vhost PRIVATE
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/cache.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/config.cpp
+  ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/file_ring_buffer.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs_impl.cpp
   ${CMAKE_SOURCE_DIR}/cloud/filestore/libs/vfs_fuse/fs_impl_attr.cpp