v4.x - Remove folly::Expected from API.

Author: szmyd

.github/workflows/build_dependencies.yml

@@ -164,89 +164,36 @@ 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: |
+        sanitize=$([[ "${{ inputs.tooling }}" == "Sanitize" ]] && echo "True" || echo "False")
         pre=$([[ "${{ inputs.build-type }}" != "Debug" ]] && echo "-o iomgr/*:prerelease=${{ inputs.prerelease }}" || echo "")
         echo "Disk space usage"
         sudo df -h
         sudo ls -l /tmp
         sudo rm -rf $ANDROID_HOME
         echo "Disk space usage after cleanup"
         sudo df -h
-        conan install \
-            -c tools.build:skip_test=True \
+        conan build \
             ${pre} \
             -o sisl/*:malloc_impl=${{ inputs.malloc-impl }} \
             -o iomgr/*:testing=off \
             -o homestore/*:testing=off \
+            -o homeobject/*: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: HomeObjectDeps-${{ inputs.platform }}-${{ inputs.build-type }}-${{ inputs.malloc-impl }}-${{ inputs.prerelease }}
       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 }}-${{ inputs.prerelease }}
-      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 }}-${{ inputs.prerelease }}
-        fail_on_cache_miss: true
-      if: ${{ inputs.testing == 'True' && github.event_name != 'pull_request' && steps.restore-cache.outputs.cache-hit != 'true' }}
-
-    - name: Setup tmate session
-      uses: mxschmitt/action-tmate@v3
-      with:
-        limit-access-to-actor: true
-        detached: true
-      if: ${{ inputs.testing == 'True' }}
-
-    - name: Create and Test Package
-      run: |
-        sanitize=$([[ "${{ inputs.tooling }}" == "Sanitize" ]] && echo "True" || echo "False")
-        pre=$([[ "${{ inputs.build-type }}" != "Debug" ]] && echo "-o iomgr/*:prerelease=${{ inputs.prerelease }}" || echo "")
-        conan create \
-            ${pre} \
-            -o sisl/*:malloc_impl=${{ inputs.malloc-impl }} \
-            -o iomgr/*:testing=off \
-            -o homestore/*:testing=off \
-            -o homeobject/*:sanitize=${sanitize} \
-            -s:h build_type=${{ inputs.build-type }} \
-            --build missing \
-            .
-      if: ${{ inputs.testing == 'True' && inputs.tooling != 'Coverage' }}
-
     - name: Code Coverage Run
       run: |
         pre=$([[ "${{ inputs.build-type }}" != "Debug" ]] && echo "-o iomgr/*:prerelease=${{ inputs.prerelease }}" || echo "")
@@ -257,6 +204,7 @@ jobs:
             -o homestore/*:testing=off \
             -o homeobject/*:coverage=True \
             -s:h build_type=${{ inputs.build-type }} \
+            -s:h compiler.cppstd=23 \
             --build missing \
             .
       if: ${{ inputs.testing == 'True' && inputs.tooling == 'Coverage' }}

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required (VERSION 3.11)
 project (homeobject LANGUAGES CXX)
 
-set(CMAKE_CXX_STANDARD 20)
+set(CMAKE_CXX_STANDARD 23)
 
 if (NOT DEFINED CMAKE_BUILD_TYPE)
     set (CMAKE_BUILD_TYPE "Debug")

conanfile.py

@@ -10,7 +10,7 @@
 
 class HomeObjectConan(ConanFile):
     name = "homeobject"
-    version = "3.0.6"
+    version = "4.0.0"
 
     homepage = "https://github.com/eBay/HomeObject"
     description = "Blob Store built on HomeReplication"
@@ -55,7 +55,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 = "."

src/include/homeobject/common.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
+#include <expected>
+
 #include <boost/uuid/uuid.hpp>
-#include <folly/Expected.h>
-#include <folly/Unit.h>
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wuninitialized"
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
@@ -49,12 +49,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::SemiFuture< Result< T > >;
 
-    using NullResult = Result< folly::Unit >;
-    using NullAsyncResult = AsyncResult< folly::Unit >;
+    using NullResult = Result< void >;
+    using NullAsyncResult = AsyncResult< void >;
 
     virtual ~Manager() = default;
 };

src/lib/blob_manager.cpp

@@ -6,26 +6,27 @@ std::shared_ptr< BlobManager > HomeObjectImpl::blob_manager() { return shared_fr
 
 BlobManager::AsyncResult< Blob > HomeObjectImpl::get(shard_id_t shard, blob_id_t const& blob_id, uint64_t off,
                                                      uint64_t len, trace_id_t tid) const {
-    return _get_shard(shard, tid).thenValue(
-        [this, blob_id, off, len, tid](auto const e) -> BlobManager::AsyncResult< Blob > {
-            if (!e) return folly::makeUnexpected(BlobError(BlobErrorCode::UNKNOWN_SHARD));
+    return _get_shard(shard, tid)
+        .thenValue([this, blob_id, off, len, tid](auto const e) -> BlobManager::AsyncResult< Blob > {
+            if (!e) return std::unexpected(BlobError(BlobErrorCode::UNKNOWN_SHARD));
             return _get_blob(e.value(), blob_id, off, len, tid);
         });
 }
 
 BlobManager::AsyncResult< blob_id_t > HomeObjectImpl::put(shard_id_t shard, Blob&& blob, trace_id_t tid) {
-    return _get_shard(shard, tid).thenValue(
-        [this, blob = std::move(blob), tid](auto const e) mutable -> BlobManager::AsyncResult< blob_id_t > {
-            if (!e) return folly::makeUnexpected(BlobError(BlobErrorCode::UNKNOWN_SHARD));
-            if (ShardInfo::State::SEALED == e.value().state) return folly::makeUnexpected(BlobError(BlobErrorCode::SEALED_SHARD));
-            if (blob.body.size() == 0) return folly::makeUnexpected(BlobError(BlobErrorCode::INVALID_ARG));
+    return _get_shard(shard, tid)
+        .thenValue([this, blob = std::move(blob), tid](auto const e) mutable -> BlobManager::AsyncResult< blob_id_t > {
+            if (!e) return std::unexpected(BlobError(BlobErrorCode::UNKNOWN_SHARD));
+            if (ShardInfo::State::SEALED == e.value().state)
+                return std::unexpected(BlobError(BlobErrorCode::SEALED_SHARD));
+            if (blob.body.size() == 0) return std::unexpected(BlobError(BlobErrorCode::INVALID_ARG));
             return _put_blob(e.value(), std::move(blob), tid);
         });
 }
 
 BlobManager::NullAsyncResult HomeObjectImpl::del(shard_id_t shard, blob_id_t const& blob, trace_id_t tid) {
     return _get_shard(shard, tid).thenValue([this, blob, tid](auto const e) mutable -> BlobManager::NullAsyncResult {
-        if (!e) return folly::makeUnexpected(BlobError(BlobErrorCode::UNKNOWN_SHARD));
+        if (!e) return std::unexpected(BlobError(BlobErrorCode::UNKNOWN_SHARD));
         return _del_blob(e.value(), blob, tid);
     });
 }