feat(S3): added compare operator

ecmwf · Dec 30, 2024 · 50e3a25 · 50e3a25
1 parent 25d98c7
commit 50e3a25
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/src/eckit/io/s3/S3BucketName.h b/src/eckit/io/s3/S3BucketName.h
@@ -56,8 +56,6 @@ class S3BucketName : public S3Name {
 
     auto path() const -> const S3BucketPath& { return path_; }
 
-    auto bucket() const -> const std::string& { return path_.bucket; }
-
     /// @todo return S3 object iterator but first add prefix
     auto listObjects() const -> std::vector<std::string>;
 

diff --git a/src/eckit/io/s3/S3BucketPath.h b/src/eckit/io/s3/S3BucketPath.h
@@ -35,6 +35,10 @@ struct S3BucketPath {
 
     operator std::string() const { return asString(); }
 
+    bool operator==(const S3BucketPath& other) const { return bucket == other.bucket; }
+
+    bool operator!=(const S3BucketPath& other) const { return !(*this == other); }
+
     friend std::ostream& operator<<(std::ostream& out, const S3BucketPath& path) {
         out << "bucket=" << path.bucket;
         return out;

diff --git a/src/eckit/io/s3/S3ObjectName.h b/src/eckit/io/s3/S3ObjectName.h
@@ -53,10 +53,6 @@ class S3ObjectName : public S3Name {
 
     auto path() const -> const S3ObjectPath& { return path_; }
 
-    auto name() const -> const std::string& { return path_.object; }
-
-    auto bucket() const -> const std::string& { return path_.bucket; }
-
     auto bucketExists() const -> bool;
 
     // modifiers

diff --git a/src/eckit/io/s3/S3ObjectPath.h b/src/eckit/io/s3/S3ObjectPath.h
@@ -35,6 +35,10 @@ struct S3ObjectPath {
 
     operator std::string() const { return asString(); }
 
+    bool operator==(const S3ObjectPath& other) const { return bucket == other.bucket && object == other.object; }
+
+    bool operator!=(const S3ObjectPath& other) const { return !(*this == other); }
+
     friend std::ostream& operator<<(std::ostream& out, const S3ObjectPath& path) {
         out << "bucket=" << path.bucket << ",object=" << path.object;
         return out;