Compiling

Author: willdealtry

cpp/arcticdb/storage/mock/s3_mock_client.cpp

@@ -80,6 +80,12 @@ S3Result<Segment> MockS3Client::get_object(
     return {pos->second.clone()};
 }
 
+folly::Future<S3Result<Segment>> MockS3Client::get_object_async(
+    const std::string &s3_object_name,
+    const std::string &bucket_name) const {
+    return folly::makeFuture(get_object(s3_object_name, bucket_name));
+}
+
 S3Result<std::monostate> MockS3Client::put_object(
         const std::string &s3_object_name,
         Segment &&segment,

cpp/arcticdb/storage/mock/s3_mock_client.hpp

@@ -40,7 +40,7 @@ struct S3Key {
 // The MockS3Client can simulate storage failures by using the get_failure_trigger for s3_object_names.
 class MockS3Client : public S3ClientInterface {
 public:
-    MockS3Client(){}
+    MockS3Client() {}
 
     // Can be used to trigger a simulated failure inside MockS3Client. For example:
     // auto object_to_trigger_put_failure = get_failure_trigger("test", StorageOperation::WRITE, Aws::S3::S3Errors::NETWORK_FAILURE, false);
@@ -49,28 +49,36 @@ class MockS3Client : public S3ClientInterface {
     // The returned name looks like "{s3_object_name}#Failure_{operation_to_fail}_{error_to_fail_with}_{retryable}".
     // For example: "symbol_1#Failure_Delete_99_1" will trigger a delete failure with code 99 which is retryable.
     static std::string get_failure_trigger(
-            const std::string& s3_object_name,
-            StorageOperation operation_to_fail,
-            Aws::S3::S3Errors error_to_fail_with,
-            bool retryable=true);
+        const std::string& s3_object_name,
+        StorageOperation operation_to_fail,
+        Aws::S3::S3Errors error_to_fail_with,
+        bool retryable = true);
 
-    [[nodiscard]] S3Result<std::monostate> head_object(const std::string& s3_object_name, const std::string& bucket_name) const override;
+    [[nodiscard]] S3Result<std::monostate> head_object(
+        const std::string& s3_object_name,
+        const std::string& bucket_name) const override;
 
-    [[nodiscard]] S3Result<Segment> get_object(const std::string& s3_object_name, const std::string& bucket_name) const override;
+    [[nodiscard]] S3Result<Segment> get_object(
+        const std::string& s3_object_name,
+        const std::string& bucket_name) const override;
+
+    [[nodiscard]] folly::Future<S3Result<Segment>> get_object_async(
+        const std::string& s3_object_name,
+        const std::string& bucket_name) const override;
 
     S3Result<std::monostate> put_object(
-            const std::string& s3_object_name,
-            Segment&& segment,
-            const std::string& bucket_name) override;
+        const std::string& s3_object_name,
+        Segment&& segment,
+        const std::string& bucket_name) override;
 
     S3Result<DeleteOutput> delete_objects(
-            const std::vector<std::string>& s3_object_names,
-            const std::string& bucket_name) override;
+        const std::vector<std::string>& s3_object_names,
+        const std::string& bucket_name) override;
 
     S3Result<ListObjectsOutput> list_objects(
-            const std::string& prefix,
-            const std::string& bucket_name,
-            const std::optional<std::string>& continuation_token) const override;
+        const std::string& prefix,
+        const std::string& bucket_name,
+        const std::optional<std::string>& continuation_token) const override;
 
 private:
     std::map<S3Key, Segment> s3_contents;

cpp/arcticdb/storage/s3/detail-inl.hpp

@@ -45,7 +45,7 @@ static const size_t DELETE_OBJECTS_LIMIT = 1000;
 template<class It>
 using Range = folly::Range<It>;
 
-inline void raise_s3_exception(const Aws::S3::S3Error& err, const std::string& object_name) {
+[[noreturn]] inline void raise_s3_exception(const Aws::S3::S3Error& err, const std::string& object_name) {
     std::string error_message;
     auto type = err.GetErrorType();
 
@@ -190,10 +190,15 @@ folly::Future<KeySegmentPair> do_async_read_impl(
     const std::string& bucket_name,
     const S3ClientInterface& s3_client,
     KeyBucketizer&& bucketizer,
-    ReadKeyOpts opts) {
+    ReadKeyOpts) {
     auto key_type_dir = key_type_folder(root_folder, variant_key_type(variant_key));
     auto s3_object_name = object_path(bucketizer.bucketize(key_type_dir, variant_key), variant_key);
-    return s3_client.get_object_async(bucket_name, s3_object_name);
+    return s3_client.get_object_async(bucket_name, s3_object_name).thenValue([vk=std::move(variant_key)] (auto&& result) mutable -> KeySegmentPair {
+        if(result.is_success())
+            return KeySegmentPair(std::move(vk), std::move(result.get_output()));
+        else
+            raise_s3_exception(result.get_error(), fmt::format("{}", vk));
+    });
 }
 
 template<class KeyBucketizer>

cpp/arcticdb/storage/s3/s3_storage.cpp

@@ -59,7 +59,10 @@ KeySegmentPair S3Storage::do_read(VariantKey&& variant_key, ReadKeyOpts opts) {
 }
 
 folly::Future<folly::Unit> S3Storage::do_async_read(entity::VariantKey&& variant_key, const ReadVisitor& visitor, ReadKeyOpts opts) {
-
+    return detail::do_async_read_impl(std::move(variant_key), root_folder_, bucket_name_, *s3_client_, FlatBucketizer{}, opts).thenValue([&visitor] (auto&& key_seg) {
+        visitor(key_seg.variant_key(), std::move(key_seg.segment()));
+        return folly::Unit{};
+    });
 }
 
 folly::Future<KeySegmentPair> S3Storage::do_async_read(entity::VariantKey&& variant_key, ReadKeyOpts opts) {