Skip to content

Commit

Permalink
Merge rebase
Browse files Browse the repository at this point in the history
  • Loading branch information
G-D-Petrov committed Feb 7, 2025
1 parent 359ea68 commit 46e1d3a
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions cpp/arcticdb/storage/s3/s3_client_wrapper.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,15 @@ folly::Future<S3Result<Segment>> S3ClientTestWrapper::get_object_async(

S3Result<std::monostate> S3ClientTestWrapper::put_object(
const std::string &s3_object_name,
Segment &&segment,
Segment &segment,
const std::string &bucket_name,
PutHeader header) {
auto maybe_error = has_failure_trigger(bucket_name);
if (maybe_error.has_value()) {
return {*maybe_error};
}

return actual_client_->put_object(s3_object_name, std::move(segment), bucket_name, header);
return actual_client_->put_object(s3_object_name, segment, bucket_name, header);
}

S3Result<DeleteOutput> S3ClientTestWrapper::delete_objects(
Expand Down
2 changes: 1 addition & 1 deletion cpp/arcticdb/storage/s3/s3_client_wrapper.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ class S3ClientTestWrapper : public S3ClientInterface {

S3Result<std::monostate> put_object(
const std::string& s3_object_name,
Segment&& segment,
Segment& segment,
const std::string& bucket_name,
PutHeader header = PutHeader::NONE) override;

Expand Down

0 comments on commit 46e1d3a

Please sign in to comment.