merge main

ecstore/src/store_api.rs

@@ -1,3 +1,5 @@
+use std::collections::HashMap;
+
 use crate::error::{Error, Result};
 use http::HeaderMap;
 use rmp_serde::Serializer;
@@ -25,6 +27,10 @@ pub struct FileInfo {
     pub fresh: bool, // indicates this is a first time call to write FileInfo.
     pub parts: Vec<ObjectPartInfo>,
     pub is_latest: bool,
+    // #[serde(skip_serializing_if = "Option::is_none", default)]
+    pub tags: Option<HashMap<String, String>>,
+    pub metadata: Option<HashMap<String, String>>,
+    pub num_versions: usize,
 }
 
 // impl Default for FileInfo {
@@ -92,6 +98,14 @@ impl FileInfo {
         false
     }
 
+    pub fn get_etag(&self) -> Option<String> {
+        if let Some(meta) = &self.metadata {
+            meta.get("etag").cloned()
+        } else {
+            None
+        }
+    }
+
     pub fn write_quorum(&self, quorum: usize) -> usize {
         if self.deleted {
             return quorum;
@@ -137,7 +151,7 @@ impl FileInfo {
         self.parts.sort_by(|a, b| a.number.cmp(&b.number));
     }
 
-    pub fn into_object_info(&self, bucket: &str, object: &str, _versioned: bool) -> ObjectInfo {
+    pub fn to_object_info(&self, bucket: &str, object: &str, _versioned: bool) -> ObjectInfo {
         ObjectInfo {
             bucket: bucket.to_string(),
             name: object.to_string(),
@@ -150,6 +164,7 @@ impl FileInfo {
             size: self.size,
             parts: self.parts.clone(),
             is_latest: self.is_latest,
+            tags: self.tags.clone(),
         }
     }
     // to_part_offset 取offset 所在的part index, 返回part index, offset
@@ -245,6 +260,10 @@ pub struct MakeBucketOptions {
     pub force_create: bool,
 }
 
+pub struct DeleteBucketOptions {
+    pub force: bool, // Force deletion
+}
+
 #[derive(Debug)]
 pub struct PutObjReader {
     pub stream: StreamingBlob,
@@ -426,6 +445,7 @@ pub struct ObjectInfo {
     pub delete_marker: bool,
     pub parts: Vec<ObjectPartInfo>,
     pub is_latest: bool,
+    pub tags: Option<HashMap<String, String>>,
 }
 
 #[derive(Debug, Default)]
@@ -492,7 +512,7 @@ pub struct DeletedObject {
 #[async_trait::async_trait]
 pub trait StorageAPI {
     async fn make_bucket(&self, bucket: &str, opts: &MakeBucketOptions) -> Result<()>;
-    async fn delete_bucket(&self, bucket: &str) -> Result<()>;
+    async fn delete_bucket(&self, bucket: &str, opts: &DeleteBucketOptions) -> Result<()>;
     async fn list_bucket(&self, opts: &BucketOptions) -> Result<Vec<BucketInfo>>;
     async fn get_bucket_info(&self, bucket: &str, opts: &BucketOptions) -> Result<BucketInfo>;
     async fn delete_object(&self, bucket: &str, object: &str, opts: ObjectOptions) -> Result<ObjectInfo>;
@@ -513,6 +533,9 @@ pub trait StorageAPI {
         start_after: &str,
     ) -> Result<ListObjectsV2Info>;
     async fn get_object_info(&self, bucket: &str, object: &str, opts: &ObjectOptions) -> Result<ObjectInfo>;
+
+    async fn put_object_info(&self, bucket: &str, object: &str, info: ObjectInfo, opts: &ObjectOptions) -> Result<()>;
+
     async fn get_object_reader(
         &self,
         bucket: &str,
@@ -521,7 +544,7 @@ pub trait StorageAPI {
         h: HeaderMap,
         opts: &ObjectOptions,
     ) -> Result<GetObjectReader>;
-    async fn put_object(&self, bucket: &str, object: &str, data: PutObjReader, opts: &ObjectOptions) -> Result<()>;
+    async fn put_object(&self, bucket: &str, object: &str, data: PutObjReader, opts: &ObjectOptions) -> Result<ObjectInfo>;
     async fn put_object_part(
         &self,
         bucket: &str,