v5.x - Remove more dependence on Facebook Folly. (#147)

szmyd · web-flow · commit 44eb93cd5523 · 2025-11-12T08:54:46.000-07:00
* v5.x - Remove more dependence on Facebook Folly.

Remove usage of folly::Expected and folly::Unit in the API. folly::Future remains.
diff --git a/.github/workflows/build_dependencies.yml b/.github/workflows/build_dependencies.yml
@@ -153,80 +153,27 @@ jobs:
         conan export --user oss --channel main import/nuraft_mesg
       if: ${{ inputs.testing == 'True' || steps.restore-cache.outputs.cache-hit != 'true' }}
 
-    - name: Build Cache
+    - name: Create and Test Package
       run: |
-        conan install \
-            -c tools.build:skip_test=True \
+        sanitize=$([[ "${{ inputs.tooling }}" == "Sanitize" ]] && echo "True" || echo "False")
+        conan build \
             -o sisl/*:malloc_impl=${{ inputs.malloc-impl }} \
             -o iomgr/*:testing=off \
             -o homestore/*:testing=off \
+            -o homeblocks/*:sanitize=${sanitize} \
             -s:h build_type=${{ inputs.build-type }} \
-            -c tools.build:skip_test=True \
+            -s:h compiler.cppstd=23 \
             --format=json \
             --build missing \
             . > ~/build.json
         conan list --graph ~/build.json --graph-binaries=build --format=json > ~/pkglist.json
-      if: ${{ steps.restore-cache.outputs.cache-hit != 'true' }}
+      if: ${{ inputs.testing == 'True' && inputs.tooling != 'Coverage' }}
 
     - name: Save Conan Cache
       uses: eBay/sisl/.github/actions/store_conan2@master
       with:
         key_prefix: HomeBlocksDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}
-      if: ${{ github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' }}
-
-    - name: Reload Sisl Cache
-      uses: eBay/sisl/.github/actions/load_conan2@master
-      with:
-        load_any: 'True'
-        key_prefix: SislDeps13-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}
-      if: ${{ inputs.testing == 'True' && github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' }}
-
-    - name: Reload IOMgr Cache
-      uses: eBay/sisl/.github/actions/load_conan2@master
-      with:
-        load_any: 'True'
-        key_prefix: IOMgrDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-False
-      if: ${{ inputs.testing == 'True' && github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' }}
-
-    - name: Reload NuRaftMesg Cache
-      uses: eBay/sisl/.github/actions/load_conan2@master
-      with:
-        testing: 'False'
-        path: import/nuraft_mesg
-        key_prefix: NuMesgDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}
-        fail_on_cache_miss: true
-      if: ${{ inputs.testing == 'True' && github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' }}
-
-    - name: Reload HomeStore Cache
-      uses: eBay/sisl/.github/actions/load_conan2@master
-      with:
-        testing: 'False'
-        path: import/homestore
-        key_prefix: HomestoreDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-False
-        fail_on_cache_miss: true
-      if: ${{ inputs.testing == 'True' && github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' }}
-
-    - uses: actions/checkout@main
-    - name: Setup tmate session
-      uses: mxschmitt/action-tmate@v3
-      with:
-        limit-access-to-actor: true
-        detached: true
-        connect-timeout-seconds: 60
-      if: ${{ inputs.testing == 'True' }}
-
-    - name: Create and Test Package
-      run: |
-        sanitize=$([[ "${{ inputs.tooling }}" == "Sanitize" ]] && echo "True" || echo "False")
-        conan create \
-            -o sisl/*:malloc_impl=${{ inputs.malloc-impl }} \
-            -o iomgr/*:testing=off \
-            -o homestore/*:testing=off \
-            -o homeblocks/*:sanitize=${sanitize} \
-            -s:h build_type=${{ inputs.build-type }} \
-            --build missing \
-            .
-      if: ${{ inputs.testing == 'True' && inputs.tooling != 'Coverage' }}
+      if: ${{ github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' && inputs.tooling != 'Coverage'}}
 
     - name: Code Coverage Run
       run: |
@@ -236,6 +183,7 @@ jobs:
             -o homestore/*:testing=off \
             -o homeblocks/*:coverage=True \
             -s:h build_type=${{ inputs.build-type }} \
+            -s:h compiler.cppstd=23 \
             --build missing \
             .
       if: ${{ inputs.testing == 'True' && inputs.tooling == 'Coverage' }}
diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile
@@ -59,9 +59,9 @@ pipeline {
 
         stage("Compile") {
             steps {
-                sh "conan create ${BUILD_MISSING} -s:h build_type=Debug -o ${PROJECT}/*:sanitize=True ${CONAN_FLAGS} . ; \
-                    conan create ${BUILD_MISSING} -s:h build_type=Debug ${CONAN_FLAGS} . ; \
-                    conan create ${BUILD_MISSING} -s:h build_type=RelWithDebInfo -o sisl/*:malloc_impl=tcmalloc ${CONAN_FLAGS} . ; \
+                sh "conan build -s:h compiler.cppstd=23 ${BUILD_MISSING} -s:h build_type=Debug -o ${PROJECT}/*:sanitize=True ${CONAN_FLAGS} . ; \
+                    conan create -s:h compiler.cppstd=23 ${BUILD_MISSING} -s:h build_type=Debug ${CONAN_FLAGS} . ; \
+                    conan create -s:h compiler.cppstd=23 ${BUILD_MISSING} -s:h build_type=RelWithDebInfo -o sisl/*:malloc_impl=tcmalloc ${CONAN_FLAGS} . ; \
                     "
             }
         }
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 3.11)
 project (homeblocks LANGUAGES CXX)
 
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 23)
 
 if (NOT DEFINED CMAKE_BUILD_TYPE)
     set (CMAKE_BUILD_TYPE "Debug")
diff --git a/conanfile.py b/conanfile.py
@@ -9,7 +9,7 @@
 
 class HomeBlocksConan(ConanFile):
     name = "homeblocks"
-    version = "4.0.1"
+    version = "5.0.0"
 
     homepage = "https://github.com/eBay/HomeBlocks"
     description = "Block Store built on HomeStore"
@@ -52,7 +52,7 @@ def requirements(self):
 
     def validate(self):
         if self.info.settings.compiler.cppstd:
-            check_min_cppstd(self, 20)
+            check_min_cppstd(self, 23)
 
     def layout(self):
         self.folders.source = "."
diff --git a/src/include/homeblks/common.hpp b/src/include/homeblks/common.hpp
@@ -15,10 +15,10 @@
  *********************************************************************************/
 #pragma once
 
+#include <expected>
+
 #include <boost/uuid/uuid.hpp>
 #include <boost/intrusive_ptr.hpp>
-#include <folly/Expected.h>
-#include <folly/Unit.h>
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wuninitialized"
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
@@ -74,12 +74,12 @@ template < class E >
 class Manager {
 public:
     template < typename T >
-    using Result = folly::Expected< T, E >;
+    using Result = std::expected< T, E >;
     template < typename T >
     using AsyncResult = folly::Future< Result< T > >;
 
-    using NullResult = Result< folly::Unit >;
-    using NullAsyncResult = AsyncResult< folly::Unit >;
+    using NullResult = Result< void >;
+    using NullAsyncResult = AsyncResult< void >;
 
     virtual ~Manager() = default;
 };
diff --git a/src/include/homeblks/volume_mgr.hpp b/src/include/homeblks/volume_mgr.hpp
@@ -30,8 +30,8 @@ struct vol_interface_req : public sisl::ObjLifeCounter< vol_interface_req > {
     VolumePtr vol{nullptr};                // back ref to the volume this request is associated with.
     Clock::time_point io_start_time;       // time when the request reaches homeblks.
     Clock::time_point data_svc_start_time; // time when the request to data service starts.
-    Clock::time_point index_start_time; // time when the request to index service starts.
-    Clock::time_point journal_start_time; // time when the request to journal service starts.
+    Clock::time_point index_start_time;    // time when the request to index service starts.
+    Clock::time_point journal_start_time;  // time when the request to journal service starts.
 
     friend void intrusive_ptr_add_ref(vol_interface_req* req) { req->refcount.increment(1); }
     friend void intrusive_ptr_release(vol_interface_req* req);
diff --git a/src/lib/volume/index_fixed_table.hpp b/src/lib/volume/index_fixed_table.hpp
@@ -67,21 +67,21 @@ class VolumeIndexTable {
                 LOGERROR("Failed to put to index {}, error={}", lba, result);
                 // rollback the lbas for which we have already written to the index table
                 rollback_write(start_lba, lba - 1, blocks_info);
-                return folly::makeUnexpected(VolumeError::INDEX_ERROR);
+                return std::unexpected(VolumeError::INDEX_ERROR);
             }
         }
 
         return folly::Unit();
     }
 
-    VolumeManager::Result< folly::Unit > read_from_index(const vol_interface_req_ptr& req, index_kv_list_t& index_kvs) {
+    VolumeManager::NullResult read_from_index(const vol_interface_req_ptr& req, index_kv_list_t& index_kvs) {
         homestore::BtreeQueryRequest< VolumeIndexKey > qreq{
             homestore::BtreeKeyRange< VolumeIndexKey >{VolumeIndexKey{req->lba}, VolumeIndexKey{req->end_lba()}},
             homestore::BtreeQueryType::SWEEP_NON_INTRUSIVE_PAGINATION_QUERY};
         if (auto ret = hs_index_table_->query(qreq, index_kvs); ret != homestore::btree_status_t::success) {
-            return folly::makeUnexpected(VolumeError::INDEX_ERROR);
+            return std::unexpected(VolumeError::INDEX_ERROR);
         }
-        return folly::Unit();
+        return {};
     }
 
     void rollback_write(lba_t start_lba, lba_t end_lba, std::unordered_map< lba_t, BlockInfo >& blocks_info) {
@@ -110,4 +110,4 @@ class VolumeIndexTable {
     }
 };
 
-} // namespace homeblocks
+} // namespace homeblocks
diff --git a/src/lib/volume/index_prefix_table.hpp b/src/lib/volume/index_prefix_table.hpp
@@ -48,7 +48,7 @@ class VolumeIndexTable {
         auto result = hs_index_table_->put(req);
         if (result != homestore::btree_status_t::success) {
             LOGERROR("Failed to put to index range=({},{}) error={}", start_lba, end_lba, result);
-            return folly::makeUnexpected(VolumeError::INDEX_ERROR);
+            return std::unexpected(VolumeError::INDEX_ERROR);
         }
 
         return folly::Unit();
@@ -59,7 +59,7 @@ class VolumeIndexTable {
             homestore::BtreeKeyRange< VolumeIndexKey >{VolumeIndexKey{req->lba}, VolumeIndexKey{req->end_lba()}},
             homestore::BtreeQueryType::SWEEP_NON_INTRUSIVE_PAGINATION_QUERY};
         if (auto ret = hs_index_table_->query(qreq, index_kvs); ret != homestore::btree_status_t::success) {
-            return folly::makeUnexpected(VolumeError::INDEX_ERROR);
+            return std::unexpected(VolumeError::INDEX_ERROR);
         }
         return folly::Unit();
     }
@@ -70,4 +70,4 @@ class VolumeIndexTable {
     }
 };
 
-} // namespace homeblocks
+} // namespace homeblocks
diff --git a/src/lib/volume/tests/test_volume_io.cpp b/src/lib/volume/tests/test_volume_io.cpp
@@ -207,7 +207,7 @@ class VolumeIOImpl {
         vol_mgr->write(m_vol_ptr, req)
             .via(&folly::InlineExecutor::instance())
             .thenValue([this, data, req, latch, expect_failure](auto&& result) {
-                ASSERT_EQ(result.hasError(), expect_failure);
+                ASSERT_EQ(!result.has_value(), expect_failure);
                 {
                     std::lock_guard lock(m_mutex);
                     m_inflight_ios.erase(boost::icl::interval< int >::closed(req->lba, req->lba + req->nlbas - 1));
@@ -245,7 +245,7 @@ class VolumeIOImpl {
         vol_mgr->write(m_vol_ptr, req)
             .via(&folly::InlineExecutor::instance())
             .thenValue([this, req, data](auto&& result) {
-                RELEASE_ASSERT(!result.hasError(), "Write failed with error={}", result.error());
+                RELEASE_ASSERT(result.has_value(), "Write failed with error={}", result.error());
                 {
                     std::lock_guard lock(m_mutex);
                     m_inflight_ios.erase(boost::icl::interval< int >::closed(req->lba, req->lba + req->nlbas - 1));
@@ -262,8 +262,8 @@ class VolumeIOImpl {
         auto buf = read_blob.bytes();
         vol_interface_req_ptr req(new vol_interface_req{buf, start_lba, nlbas, m_vol_ptr});
         auto read_resp = g_helper->inst()->volume_manager()->read(m_vol_ptr, req).get();
-        if (read_resp.hasError()) { LOGERROR("Read failed with error={}", read_resp.error()); }
-        RELEASE_ASSERT(!read_resp.hasError(), "Read failed with error={}", read_resp.error());
+        if (!read_resp.has_value()) { LOGERROR("Read failed with error={}", read_resp.error()); }
+        RELEASE_ASSERT(read_resp.has_value(), "Read failed with error={}", read_resp.error());
     }
 
     void read_and_verify(lba_t start_lba, uint32_t nlbas) {
@@ -273,8 +273,8 @@ class VolumeIOImpl {
         auto buf = read_blob.bytes();
         vol_interface_req_ptr req(new vol_interface_req{buf, start_lba, nlbas, m_vol_ptr});
         auto read_resp = g_helper->inst()->volume_manager()->read(m_vol_ptr, req).get();
-        if (read_resp.hasError()) { LOGERROR("Read failed with error={}", read_resp.error()); }
-        RELEASE_ASSERT(!read_resp.hasError(), "Read failed with error={}", read_resp.error());
+        if (!read_resp.has_value()) { LOGERROR("Read failed with error={}", read_resp.error()); }
+        RELEASE_ASSERT(read_resp.has_value(), "Read failed with error={}", read_resp.error());
         auto read_sz = m_vol_ptr->info()->page_size;
         for (auto lba = start_lba; lba < start_lba + nlbas; lba++, buf += read_sz) {
             uint64_t data_pattern = 0;
@@ -305,7 +305,7 @@ class VolumeIOImpl {
                 ->read(m_vol_ptr, req)
                 .via(&folly::InlineExecutor::instance())
                 .thenValue([this, read_blob = std::move(read_blob), req](auto&& result) {
-                    RELEASE_ASSERT(!result.hasError(), "Read failed with error={}", result.error());
+                    RELEASE_ASSERT(result.has_value(), "Read failed with error={}", result.error());
                     {
                         std::lock_guard lock(m_mutex);
                         m_inflight_ios.erase(boost::icl::interval< int >::closed(req->lba, req->lba + req->nlbas - 1));
diff --git a/src/lib/volume/volume.cpp b/src/lib/volume/volume.cpp
diff --git a/src/lib/volume/volume.hpp b/src/lib/volume/volume.hpp
diff --git a/src/lib/volume_mgr.cpp b/src/lib/volume_mgr.cpp

Original file line number	Diff line number	Diff line change
`@@ -59,9 +59,9 @@ pipeline {`
`59`	`59`
`60`	`60`	`stage("Compile") {`
`61`	`61`	`steps {`
`62`		`- sh "conan create ${BUILD_MISSING} -s:h build_type=Debug -o ${PROJECT}/*:sanitize=True ${CONAN_FLAGS} . ; \`
`63`		`- conan create ${BUILD_MISSING} -s:h build_type=Debug ${CONAN_FLAGS} . ; \`
`64`		`- conan create ${BUILD_MISSING} -s:h build_type=RelWithDebInfo -o sisl/*:malloc_impl=tcmalloc ${CONAN_FLAGS} . ; \`
	`62`	`+ sh "conan build -s:h compiler.cppstd=23 ${BUILD_MISSING} -s:h build_type=Debug -o ${PROJECT}/*:sanitize=True ${CONAN_FLAGS} . ; \`
	`63`	`+ conan create -s:h compiler.cppstd=23 ${BUILD_MISSING} -s:h build_type=Debug ${CONAN_FLAGS} . ; \`
	`64`	`+ conan create -s:h compiler.cppstd=23 ${BUILD_MISSING} -s:h build_type=RelWithDebInfo -o sisl/*:malloc_impl=tcmalloc ${CONAN_FLAGS} . ; \`
`65`	`65`	`"`
`66`	`66`	`}`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -67,21 +67,21 @@ class VolumeIndexTable {`
`67`	`67`	`LOGERROR("Failed to put to index {}, error={}", lba, result);`
`68`	`68`	`// rollback the lbas for which we have already written to the index table`
`69`	`69`	`rollback_write(start_lba, lba - 1, blocks_info);`
`70`		`- return folly::makeUnexpected(VolumeError::INDEX_ERROR);`
	`70`	`+ return std::unexpected(VolumeError::INDEX_ERROR);`
`71`	`71`	`}`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`return folly::Unit();`
`75`	`75`	`}`
`76`	`76`
`77`		`- VolumeManager::Result< folly::Unit > read_from_index(const vol_interface_req_ptr& req, index_kv_list_t& index_kvs) {`
	`77`	`+ VolumeManager::NullResult read_from_index(const vol_interface_req_ptr& req, index_kv_list_t& index_kvs) {`
`78`	`78`	`homestore::BtreeQueryRequest< VolumeIndexKey > qreq{`
`79`	`79`	`homestore::BtreeKeyRange< VolumeIndexKey >{VolumeIndexKey{req->lba}, VolumeIndexKey{req->end_lba()}},`
`80`	`80`	`homestore::BtreeQueryType::SWEEP_NON_INTRUSIVE_PAGINATION_QUERY};`
`81`	`81`	`if (auto ret = hs_index_table_->query(qreq, index_kvs); ret != homestore::btree_status_t::success) {`
`82`		`- return folly::makeUnexpected(VolumeError::INDEX_ERROR);`
	`82`	`+ return std::unexpected(VolumeError::INDEX_ERROR);`
`83`	`83`	`}`
`84`		`- return folly::Unit();`
	`84`	`+ return {};`
`85`	`85`	`}`
`86`	`86`
`87`	`87`	`void rollback_write(lba_t start_lba, lba_t end_lba, std::unordered_map< lba_t, BlockInfo >& blocks_info) {`
`@@ -110,4 +110,4 @@ class VolumeIndexTable {`
`110`	`110`	`}`
`111`	`111`	`};`
`112`	`112`
`113`		`-} // namespace homeblocks`
	`113`	`+} // namespace homeblocks`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ class VolumeIndexTable {`
`48`	`48`	`auto result = hs_index_table_->put(req);`
`49`	`49`	`if (result != homestore::btree_status_t::success) {`
`50`	`50`	`LOGERROR("Failed to put to index range=({},{}) error={}", start_lba, end_lba, result);`
`51`		`- return folly::makeUnexpected(VolumeError::INDEX_ERROR);`
	`51`	`+ return std::unexpected(VolumeError::INDEX_ERROR);`
`52`	`52`	`}`
`53`	`53`
`54`	`54`	`return folly::Unit();`
`@@ -59,7 +59,7 @@ class VolumeIndexTable {`
`59`	`59`	`homestore::BtreeKeyRange< VolumeIndexKey >{VolumeIndexKey{req->lba}, VolumeIndexKey{req->end_lba()}},`
`60`	`60`	`homestore::BtreeQueryType::SWEEP_NON_INTRUSIVE_PAGINATION_QUERY};`
`61`	`61`	`if (auto ret = hs_index_table_->query(qreq, index_kvs); ret != homestore::btree_status_t::success) {`
`62`		`- return folly::makeUnexpected(VolumeError::INDEX_ERROR);`
	`62`	`+ return std::unexpected(VolumeError::INDEX_ERROR);`
`63`	`63`	`}`
`64`	`64`	`return folly::Unit();`
`65`	`65`	`}`
`@@ -70,4 +70,4 @@ class VolumeIndexTable {`
`70`	`70`	`}`
`71`	`71`	`};`
`72`	`72`
`73`		`-} // namespace homeblocks`
	`73`	`+} // namespace homeblocks`