apply for layers

apache · Oct 25, 2024 · 1ebb0bc · 1ebb0bc
1 parent da92d4c
commit 1ebb0bc
Show file tree

Hide file tree

Showing 5 changed files with 44 additions and 41 deletions.
diff --git a/core/src/layers/blocking.rs b/core/src/layers/blocking.rs
@@ -174,9 +174,13 @@ impl<A: Access> LayeredAccess for BlockingAccessor<A> {
     }
 
     fn metadata(&self) -> Arc<AccessorInfo> {
-        let mut meta = self.inner.info().as_ref().clone();
-        meta.full_capability_mut().blocking = true;
-        meta.into()
+        let info = self.inner.info().as_ref().clone();
+        let cap = info.full_capability();
+        info.set_full_capability(Capability {
+            blocking: true,
+            ..cap
+        })
+        .into()
     }
 
     async fn create_dir(&self, path: &str, args: OpCreateDir) -> Result<RpCreateDir> {

diff --git a/core/src/layers/complete.rs b/core/src/layers/complete.rs
@@ -378,12 +378,13 @@ impl<A: Access> LayeredAccess for CompleteAccessor<A> {
 
     // Todo: May move the logic to the implement of Layer::layer of CompleteAccessor<A>
     fn metadata(&self) -> Arc<AccessorInfo> {
-        let mut meta = (*self.meta).clone();
-        let cap = meta.full_capability_mut();
-        if cap.list && cap.write_can_empty {
-            cap.create_dir = true;
-        }
-        meta.into()
+        let info = (*self.meta).clone();
+        let cap = info.full_capability();
+        info.set_full_capability(Capability {
+            create_dir: cap.list && cap.write_can_empty,
+            ..cap
+        })
+        .into()
     }
 
     async fn create_dir(&self, path: &str, args: OpCreateDir) -> Result<RpCreateDir> {
@@ -728,10 +729,9 @@ mod tests {
         type BlockingLister = oio::BlockingLister;
 
         fn info(&self) -> Arc<AccessorInfo> {
-            let mut info = AccessorInfo::default();
-            info.set_native_capability(self.capability);
-
-            info.into()
+            AccessorInfo::default()
+                .set_native_capability(self.capability)
+                .into()
         }
 
         async fn create_dir(&self, _: &str, _: OpCreateDir) -> Result<RpCreateDir> {

diff --git a/core/src/layers/immutable_index.rs b/core/src/layers/immutable_index.rs
@@ -150,13 +150,14 @@ impl<A: Access> LayeredAccess for ImmutableIndexAccessor<A> {
 
     /// Add list capabilities for underlying storage services.
     fn metadata(&self) -> Arc<AccessorInfo> {
-        let mut meta = (*self.inner.info()).clone();
-
-        let cap = meta.full_capability_mut();
-        cap.list = true;
-        cap.list_with_recursive = true;
-
-        meta.into()
+        let info = (*self.inner.info()).clone();
+        let cap = info.full_capability();
+        info.set_full_capability(Capability {
+            list: true,
+            list_with_recursive: true,
+            ..cap
+        })
+        .into()
     }
 
     async fn read(&self, path: &str, args: OpRead) -> Result<(RpRead, Self::Reader)> {

diff --git a/core/src/layers/retry.rs b/core/src/layers/retry.rs
@@ -798,19 +798,18 @@ mod tests {
         type BlockingLister = ();
 
         fn info(&self) -> Arc<AccessorInfo> {
-            let mut am = AccessorInfo::default();
-            am.set_native_capability(Capability {
-                read: true,
-                write: true,
-                write_can_multi: true,
-                stat: true,
-                list: true,
-                list_with_recursive: true,
-                batch: true,
-                ..Default::default()
-            });
-
-            am.into()
+            AccessorInfo::default()
+                .set_native_capability(Capability {
+                    read: true,
+                    write: true,
+                    write_can_multi: true,
+                    stat: true,
+                    list: true,
+                    list_with_recursive: true,
+                    batch: true,
+                    ..Default::default()
+                })
+                .into()
         }
 
         async fn stat(&self, _: &str, _: OpStat) -> Result<RpStat> {

diff --git a/core/src/layers/timeout.rs b/core/src/layers/timeout.rs
@@ -410,14 +410,13 @@ mod tests {
         type BlockingLister = ();
 
         fn info(&self) -> Arc<AccessorInfo> {
-            let mut am = AccessorInfo::default();
-            am.set_native_capability(Capability {
-                read: true,
-                delete: true,
-                ..Default::default()
-            });
-
-            am.into()
+            AccessorInfo::default()
+                .set_native_capability(Capability {
+                    read: true,
+                    delete: true,
+                    ..Default::default()
+                })
+                .into()
         }
 
         /// This function will build a reader that always return pending.