merge fixs

This commit is contained in:
weisd
2024-11-20 17:50:29 +08:00
6 changed files with 496 additions and 134 deletions
+7 -2
View File
@@ -550,6 +550,10 @@ pub struct ObjectOptions {
pub src_pool_idx: usize,
pub user_defined: HashMap<String, String>,
pub preserve_etag: Option<String>,
pub metadata_chg: bool,
pub replication_request: bool,
pub delete_marker: bool,
}
// impl Default for ObjectOptions {
@@ -604,7 +608,7 @@ impl From<s3s::dto::CompletedPart> for CompletePart {
}
}
#[derive(Debug, Default)]
#[derive(Debug, Default, Clone)]
pub struct ObjectInfo {
pub bucket: String,
pub name: String,
@@ -625,7 +629,7 @@ pub struct ObjectInfo {
pub content_encoding: Option<String>,
pub num_versions: usize,
pub successor_mod_time: Option<OffsetDateTime>,
pub put_object_reader: Option<PutObjReader>,
// pub put_object_reader: Option<PutObjReader>,
pub etag: Option<String>,
pub inlined: bool,
}
@@ -984,6 +988,7 @@ pub trait StorageAPI: ObjectIO {
// CheckAbandonedParts
// Health
// PutObjectMetadata
async fn put_object_metadata(&self, bucket: &str, object: &str, opts: &ObjectOptions) -> Result<ObjectInfo>;
// DecomTieredObject
async fn get_object_tags(&self, bucket: &str, object: &str, opts: &ObjectOptions) -> Result<String>;
async fn put_object_tags(&self, bucket: &str, object: &str, tags: &str, opts: &ObjectOptions) -> Result<ObjectInfo>;