Merge pull request #31874 from tchaikov/wip-crimson-cyanstore-restructure

crimson: move os/cyan_* down to os/cyanstore/*

Reviewed-by: Radoslaw Zarzynski <rzarzyns@redhat.com>

src/crimson/os/CMakeLists.txt

@@ -1,8 +1,7 @@
 add_library(crimson-os
-  cyan_store.cc
-  cyan_collection.cc
-  cyan_object.cc
   futurized_store.cc
   ${PROJECT_SOURCE_DIR}/src/os/Transaction.cc)
+add_subdirectory(cyanstore)
 target_link_libraries(crimson-os
+  crimson-cyanstore
   crimson)

src/crimson/os/cyanstore/CMakeLists.txt

@@ -0,0 +1,6 @@
+add_library(crimson-cyanstore
+  cyan_store.cc
+  cyan_collection.cc
+  cyan_object.cc)
+target_link_libraries(crimson-cyanstore
+  crimson)

src/crimson/os/cyanstore/cyan_collection.h

@@ -11,7 +11,7 @@
 #include "include/buffer.h"
 #include "osd/osd_types.h"
 
-#include "futurized_collection.h"
+#include "crimson/os/futurized_collection.h"
 
 namespace crimson::os {
 

src/crimson/os/cyanstore/cyan_store.cc

@@ -12,8 +12,8 @@
 
 #include "crimson/common/buffer_io.h"
 #include "crimson/common/config_proxy.h"
-#include "crimson/os/cyan_collection.h"
-#include "crimson/os/cyan_object.h"
+#include "cyan_collection.h"
+#include "cyan_object.h"
 
 namespace {
   seastar::logger& logger() {

src/crimson/os/cyanstore/cyan_store.h

@@ -15,7 +15,7 @@
 #include "osd/osd_types.h"
 #include "include/uuid.h"
 
-#include "futurized_store.h"
+#include "crimson/os/futurized_store.h"
 
 namespace ceph::os {
 class Transaction;

src/crimson/os/futurized_store.cc

@@ -1,5 +1,5 @@
 #include "futurized_store.h"
-#include "cyan_store.h"
+#include "cyanstore/cyan_store.h"
 
 namespace crimson::os {
 

src/crimson/osd/osd.cc

@@ -27,8 +27,8 @@
 #include "crimson/mon/MonClient.h"
 #include "crimson/net/Connection.h"
 #include "crimson/net/Messenger.h"
+#include "crimson/os/cyanstore/cyan_object.h"
 #include "crimson/os/futurized_collection.h"
-#include "crimson/os/cyan_object.h"
 #include "crimson/os/futurized_store.h"
 #include "crimson/osd/heartbeat.h"
 #include "crimson/osd/osd_meta.h"

src/crimson/osd/pg.cc

@@ -30,7 +30,7 @@
 
 #include "crimson/net/Connection.h"
 #include "crimson/net/Messenger.h"
-#include "crimson/os/cyan_store.h"
+#include "crimson/os/cyanstore/cyan_store.h"
 #include "crimson/os/futurized_collection.h"
 #include "crimson/osd/exceptions.h"
 #include "crimson/osd/pg_meta.h"

src/crimson/osd/pg_backend.cc

@@ -14,8 +14,8 @@
 #include "messages/MOSDOp.h"
 #include "os/Transaction.h"
 
+#include "crimson/os/cyanstore/cyan_object.h"
 #include "crimson/os/futurized_collection.h"
-#include "crimson/os/cyan_object.h"
 #include "crimson/os/futurized_store.h"
 #include "replicated_backend.h"
 #include "ec_backend.h"

src/crimson/osd/replicated_backend.cc

@@ -3,7 +3,7 @@
 #include "messages/MOSDRepOpReply.h"
 
 #include "crimson/common/log.h"
-#include "crimson/os/cyan_object.h"
+#include "crimson/os/cyanstore/cyan_object.h"
 #include "crimson/os/futurized_store.h"
 #include "crimson/osd/shard_services.h"
 

src/crimson/osd/shard_services.cc

@@ -5,13 +5,12 @@
 
 #include "osd/osd_perf_counters.h"
 #include "osd/PeeringState.h"
-#include "crimson/osd/osdmap_service.h"
-#include "crimson/os/cyan_store.h"
 #include "crimson/mgr/client.h"
 #include "crimson/mon/MonClient.h"
 #include "crimson/net/Messenger.h"
 #include "crimson/net/Connection.h"
-#include "crimson/os/cyan_store.h"
+#include "crimson/os/cyanstore/cyan_store.h"
+#include "crimson/osd/osdmap_service.h"
 #include "messages/MOSDPGTemp.h"
 #include "messages/MOSDPGCreated.h"
 #include "messages/MOSDPGNotify.h"

src/osd/PGLog.h

@@ -25,7 +25,7 @@
 #ifdef WITH_SEASTAR
 #include <seastar/core/future.hh>
 #include "crimson/os/futurized_store.h"
-#include "crimson/os/cyan_collection.h"
+#include "crimson/os/cyanstore/cyan_collection.h"
 #endif
 
 constexpr auto PGLOG_INDEXED_OBJECTS          = 1 << 0;