snapshot support state and block seperate

bxq2011hust · Jul 26, 2024 · b107604 · b107604
1 parent 59199c8
commit b107604
Show file tree

Hide file tree

Showing 10 changed files with 419 additions and 150 deletions.
diff --git a/.github/workflows/workflow-self-hosted-arm.yml b/.github/workflows/workflow-self-hosted-arm.yml
@@ -58,7 +58,6 @@ jobs:
 
       - name: Remove cache if correspond dir change
         run: ./tools/.ci/clear_build_cache.sh
-
       - name: update vcpkg
         run: |
           cd vcpkg && git fetch origin master

diff --git a/.github/workflows/workflow-self-hosted-centos-static-build.yml b/.github/workflows/workflow-self-hosted-centos-static-build.yml
@@ -43,7 +43,6 @@ jobs:
 
       - name: Remove cache if correspond dir change
         run: ./tools/.ci/clear_build_cache.sh
-
       - name: update vcpkg
         run: |
           cd ${{ env.VCPKG_ROOT }} && git fetch --all && git checkout master && git pull

diff --git a/bcos-framework/bcos-framework/storage/Common.h b/bcos-framework/bcos-framework/storage/Common.h
@@ -28,13 +28,18 @@
 #include <map>
 #include <memory>
 #include <string>
+#include <string_view>
 #include <utility>
 #include <vector>
 
 #define STORAGE_LOG(LEVEL) BCOS_LOG(LEVEL) << "[STORAGE]"
 
 namespace bcos::storage
 {
+
+const std::string ROCKSDB = "rocksDB";
+const std::string TiKV = "TiKV";
+
 enum StorageError
 {
     UnknownError = -60000,

diff --git a/bcos-ledger/src/libledger/Ledger.cpp b/bcos-ledger/src/libledger/Ledger.cpp
@@ -1359,7 +1359,6 @@ void Ledger::asyncGetBlockTransactionHashes(bcos::protocol::BlockNumber blockNum
 void Ledger::asyncBatchGetTransactions(std::shared_ptr<std::vector<std::string>> hashes,
     std::function<void(Error::Ptr&&, std::vector<protocol::Transaction::Ptr>&&)> callback)
 {
-    // FIXME: adapt the getBlockStorage()
     std::vector<std::string_view> hashesView;
     hashesView.reserve(hashes->size());
     for (auto& hash : *hashes)

diff --git a/bcos-tool/bcos-tool/NodeConfig.cpp b/bcos-tool/bcos-tool/NodeConfig.cpp
@@ -715,6 +715,13 @@ void NodeConfig::loadStorageConfig(boost::property_tree::ptree const& _pt)
     m_pdKeyPath = _pt.get<std::string>("storage.pd_ssl_key_path", "");
     m_enableArchive = _pt.get<bool>("storage.enable_archive", false);
     m_enableSeparateBlockAndState = _pt.get<bool>("storage.enable_separate_block_state", false);
+    if (boost::iequals(m_storageType, bcos::storage::TiKV))
+    {
+        m_enableSeparateBlockAndState = false;
+        NodeConfig_LOG(INFO) << LOG_DESC("Only rocksDB support separate block and state")
+                             << LOG_KV("separateBlockAndState", m_enableSeparateBlockAndState)
+                             << LOG_KV("storageType", m_storageType);
+    }
     m_stateDBPath = m_storagePath;
     m_stateDBPath = m_storagePath + "/state";
     m_blockDBPath = m_storagePath + "/block";

diff --git a/libinitializer/CMakeLists.txt b/libinitializer/CMakeLists.txt
@@ -19,9 +19,16 @@ endif()
 
 add_library(${TXPOOL_INIT_LIB} TxPoolInitializer.cpp)
 target_link_libraries(${TXPOOL_INIT_LIB} PUBLIC ${PROTOCOL_INIT_LIB} ${TOOL_TARGET} ${TXPOOL_TARGET})
+include(FetchContent)
+FetchContent_Declare(
+    tomlplusplus
+    GIT_REPOSITORY https://github.com/marzer/tomlplusplus.git
+    GIT_TAG        v3.4.0
+)
+FetchContent_MakeAvailable(tomlplusplus)
 
 add_library(${INIT_LIB} Initializer.cpp LightNodeInitializer.h BaselineSchedulerInitializer.cpp)
-list(APPEND INIT_LIB_DEPENDS ${PROTOCOL_INIT_LIB} ${FRONTSERVICE_INIT_LIB} ${TXPOOL_INIT_LIB} ${SCHEDULER_TARGET} ${STORAGE_TARGET} ${EXECUTOR_TARGET} ${RPC_TARGET} transaction-scheduler transaction-executor bcos-boostssl)
+list(APPEND INIT_LIB_DEPENDS ${PROTOCOL_INIT_LIB} ${FRONTSERVICE_INIT_LIB} ${TXPOOL_INIT_LIB} ${SCHEDULER_TARGET} ${STORAGE_TARGET} ${EXECUTOR_TARGET} ${RPC_TARGET} transaction-scheduler transaction-executor bcos-boostssl tomlplusplus::tomlplusplus)
 if(WITH_TIKV)
     list(APPEND INIT_LIB_DEPENDS ${LEADER_ELECTION_TARGET})
 endif()