Move storage to libs

Author: yontyon

CMakeLists.txt

@@ -193,7 +193,6 @@ add_subdirectory(kvbc)
 add_subdirectory(performance)
 add_subdirectory(bftengine)
 add_subdirectory(tools)
-add_subdirectory(storage)
 add_subdirectory(scripts)
 add_subdirectory(diagnostics)
 add_subdirectory(reconfiguration)

bftengine/include/bftengine/DbCheckpointManager.hpp

@@ -31,7 +31,7 @@
 #include "DbCheckpointMetadata.hpp"
 #include "util/Metrics.hpp"
 #include "InternalBFTClient.hpp"
-#include "storage/db_interface.h"
+#include "storage/utils/db_interface.hpp"
 #include "util/filesystem.hpp"
 #include "kv_types.hpp"
 namespace _fs = fs;

bftengine/include/bftengine/DbMetadataStorage.hpp

@@ -19,8 +19,8 @@
 
 #include "log/logger.hpp"
 #include "bftengine/MetadataStorage.hpp"
-#include "storage/db_interface.h"
-#include "storage/key_manipulator_interface.h"
+#include "storage/utils/db_interface.hpp"
+#include "storage/utils/key_manipulator_interface.hpp"
 #include "util/sliver.hpp"
 
 namespace concord {

bftengine/src/bcstatetransfer/BCStateTran.cpp

@@ -27,9 +27,9 @@
 #include "util/json_output.hpp"
 #include "ReservedPagesClient.hpp"
 #include "DBDataStore.hpp"
-#include "storage/db_interface.h"
-#include "storage/key_manipulator_interface.h"
-#include "memorydb/client.h"
+#include "storage/utils/db_interface.hpp"
+#include "storage/utils/key_manipulator_interface.hpp"
+#include "storage/memorydb/client.hpp"
 #include "client/reconfiguration/client_reconfiguration_engine.hpp"
 #include "client/reconfiguration/poll_based_state_client.hpp"
 #include "RVBManager.hpp"

bftengine/src/bcstatetransfer/DBDataStore.cpp

@@ -1,6 +1,6 @@
 #include <algorithm>
 #include "DBDataStore.hpp"
-#include "storage/db_interface.h"
+#include "storage/utils/db_interface.hpp"
 #include "util/serializable.hpp"
 
 using concord::serialize::Serializable;

bftengine/src/bcstatetransfer/DBDataStore.hpp

@@ -20,7 +20,7 @@
 #include "log/logger.hpp"
 #include "util/string.hpp"
 #include "InMemoryDataStore.hpp"
-#include "storage/key_manipulator_interface.h"
+#include "storage/utils/key_manipulator_interface.hpp"
 
 namespace bftEngine {
 namespace bcst {

bftengine/src/bcstatetransfer/DataStore.hpp

@@ -19,7 +19,7 @@
 
 #include "log/logger.hpp"
 #include "util/assertUtils.hpp"
-#include "storage/db_interface.h"
+#include "storage/utils/db_interface.hpp"
 #include "crypto/digest.hpp"
 
 using std::set;

bftengine/src/simplestatetransfer/SimpleStateTran.cpp

@@ -21,9 +21,9 @@
 #include "util/assertUtils.hpp"
 #include "SimpleStateTransfer.hpp"
 #include "SimpleBCStateTransfer.hpp"
-#include "memorydb/client.h"
-#include "memorydb/key_comparator.h"
-#include "storage/direct_kv_key_manipulator.h"
+#include "storage/memorydb/client.hpp"
+#include "storage/memorydb/key_comparator.hpp"
+#include "storage/utils/direct_kv_key_manipulator.hpp"
 #include "util/Timers.hpp"
 
 namespace bftEngine {

bftengine/tests/bcstatetransfer/bcstatetransfer_tests.cpp

@@ -33,8 +33,8 @@
 #include "test_replica.hpp"
 #include "DBDataStore.hpp"
 #include "direct_kv_db_adapter.h"
-#include "memorydb/client.h"
-#include "storage/direct_kv_key_manipulator.h"
+#include "storage/memorydb/client.hpp"
+#include "storage/utils/direct_kv_key_manipulator.hpp"
 #include "ReservedPagesMock.hpp"
 #include "EpochManager.hpp"
 #include "Messages.hpp"
@@ -45,8 +45,8 @@
 #include "messages/StateTransferMsg.hpp"
 
 #ifdef USE_ROCKSDB
-#include "rocksdb/client.h"
-#include "rocksdb/key_comparator.h"
+#include "storage/rocksdb/client.hpp"
+#include "storage/rocksdb/key_comparator.hpp"
 using concord::storage::rocksdb::Client;
 using concord::storage::rocksdb::KeyComparator;
 #endif

bftengine/tests/metadataStorage/metadataStorage_test.cpp

@@ -7,11 +7,11 @@
 
 #include "log/logger.hpp"
 #include "gtest/gtest.h"
-#include "rocksdb/key_comparator.h"
-#include "rocksdb/client.h"
+#include "storage/rocksdb/key_comparator.hpp"
+#include "storage/rocksdb/client.hpp"
 #include "DbMetadataStorage.hpp"
 #include "direct_kv_db_adapter.h"
-#include "storage/direct_kv_key_manipulator.h"
+#include "storage/utils/direct_kv_key_manipulator.hpp"
 
 #include <util/filesystem.hpp>