refactor: Polish the implement of Query Based Metadata Cache (#1400)

* refactor: Remove unneeded mut requirement Signed-off-by: Xuanwo <[email protected]> * Remove Signed-off-by: Xuanwo <[email protected]> * Don't fresh metadata every time Signed-off-by: Xuanwo <[email protected]> * Remov not needed mut Signed-off-by: Xuanwo <[email protected]> * Make everyone happy Signed-off-by: Xuanwo <[email protected]> * Rename to metakey Signed-off-by: Xuanwo <[email protected]> --------- Signed-off-by: Xuanwo <[email protected]>
apache · Feb 22, 2023 · 0df39ca · 0df39ca · github-actions · Feb 22, 2023
1 parent 50b0769
commit 0df39ca
Show file tree

Hide file tree

Showing 14 changed files with 103 additions and 128 deletions.
diff --git a/binaries/oay/src/services/http/mod.rs b/binaries/oay/src/services/http/mod.rs
@@ -103,7 +103,7 @@ impl Service {
     }
 
     async fn put(&self, req: HttpRequest, mut body: web::Payload) -> Result<HttpResponse> {
-        let mut o = self
+        let o = self
             .op
             .object(&percent_decode(req.path().as_bytes()).decode_utf8_lossy());
 

diff --git a/binaries/oli/src/commands/cp.rs b/binaries/oli/src/commands/cp.rs
@@ -31,7 +31,7 @@ pub async fn main(args: Option<ArgMatches>) -> Result<()> {
         .get_one::<String>("destination")
         .ok_or_else(|| anyhow!("missing target"))?;
     let (dst_op, dst_path) = parse_location(dst)?;
-    let mut dst_o = dst_op.object(dst_path);
+    let dst_o = dst_op.object(dst_path);
 
     let size = src_o.stat().await?.content_length();
     let reader = src_o.reader().await?;

diff --git a/bindings/object_store/src/lib.rs b/bindings/object_store/src/lib.rs
@@ -56,7 +56,7 @@ impl std::fmt::Display for OpendalStore {
 #[async_trait]
 impl ObjectStore for OpendalStore {
     async fn put(&self, location: &Path, bytes: Bytes) -> Result<()> {
-        let mut o = self.inner.object(location.as_ref());
+        let o = self.inner.object(location.as_ref());
         Ok(o.write(bytes)
             .await
             .map_err(|err| format_object_store_error(err, location.as_ref()))?)
@@ -127,7 +127,7 @@ impl ObjectStore for OpendalStore {
     }
 
     async fn delete(&self, location: &Path) -> Result<()> {
-        let mut o = self.inner.object(location.as_ref());
+        let o = self.inner.object(location.as_ref());
         o.delete()
             .await
             .map_err(|err| format_object_store_error(err, location.as_ref()))?;

diff --git a/src/layers/complete.rs b/src/layers/complete.rs
@@ -295,7 +295,7 @@ impl<A: Accessor> LayeredAccessor for CompleteReaderAccessor<A> {
         self.inner.stat(path, args).await.map(|v| {
             v.map_metadata(|m| {
                 let bit = m.bit();
-                m.with_bit(bit | ObjectMetadataKey::Complete)
+                m.with_bit(bit | ObjectMetakey::Complete)
             })
         })
     }
@@ -304,7 +304,7 @@ impl<A: Accessor> LayeredAccessor for CompleteReaderAccessor<A> {
         self.inner.blocking_stat(path, args).map(|v| {
             v.map_metadata(|m| {
                 let bit = m.bit();
-                m.with_bit(bit | ObjectMetadataKey::Complete)
+                m.with_bit(bit | ObjectMetakey::Complete)
             })
         })
     }

diff --git a/src/layers/immutable_index.rs b/src/layers/immutable_index.rs
@@ -289,7 +289,7 @@ mod tests {
         let mut map = HashMap::new();
         let mut set = HashSet::new();
         let mut ds = op.object("").list().await?;
-        while let Some(mut entry) = ds.try_next().await? {
+        while let Some(entry) = ds.try_next().await? {
             debug!("got entry: {}", entry.path());
             assert!(
                 set.insert(entry.path().to_string()),
@@ -298,7 +298,7 @@ mod tests {
             );
             map.insert(
                 entry.path().to_string(),
-                entry.metadata(ObjectMetadataKey::Mode).await?.mode(),
+                entry.metadata(ObjectMetakey::Mode).await?.mode(),
             );
         }
 
@@ -327,7 +327,7 @@ mod tests {
         let mut ds = op.object("/").scan().await?;
         let mut set = HashSet::new();
         let mut map = HashMap::new();
-        while let Some(mut entry) = ds.try_next().await? {
+        while let Some(entry) = ds.try_next().await? {
             debug!("got entry: {}", entry.path());
             assert!(
                 set.insert(entry.path().to_string()),
@@ -336,7 +336,7 @@ mod tests {
             );
             map.insert(
                 entry.path().to_string(),
-                entry.metadata(ObjectMetadataKey::Mode).await?.mode(),
+                entry.metadata(ObjectMetakey::Mode).await?.mode(),
             );
         }
 
@@ -372,15 +372,15 @@ mod tests {
         let mut map = HashMap::new();
         let mut set = HashSet::new();
         let mut ds = op.object("/").list().await?;
-        while let Some(mut entry) = ds.try_next().await? {
+        while let Some(entry) = ds.try_next().await? {
             assert!(
                 set.insert(entry.path().to_string()),
                 "duplicated value: {}",
                 entry.path()
             );
             map.insert(
                 entry.path().to_string(),
-                entry.metadata(ObjectMetadataKey::Mode).await?.mode(),
+                entry.metadata(ObjectMetakey::Mode).await?.mode(),
             );
         }
 
@@ -391,15 +391,15 @@ mod tests {
         let mut map = HashMap::new();
         let mut set = HashSet::new();
         let mut ds = op.object("dataset/stateful/").list().await?;
-        while let Some(mut entry) = ds.try_next().await? {
+        while let Some(entry) = ds.try_next().await? {
             assert!(
                 set.insert(entry.path().to_string()),
                 "duplicated value: {}",
                 entry.path()
             );
             map.insert(
                 entry.path().to_string(),
-                entry.metadata(ObjectMetadataKey::Mode).await?.mode(),
+                entry.metadata(ObjectMetakey::Mode).await?.mode(),
             );
         }
 
@@ -442,15 +442,15 @@ mod tests {
 
         let mut map = HashMap::new();
         let mut set = HashSet::new();
-        while let Some(mut entry) = ds.try_next().await? {
+        while let Some(entry) = ds.try_next().await? {
             assert!(
                 set.insert(entry.path().to_string()),
                 "duplicated value: {}",
                 entry.path()
             );
             map.insert(
                 entry.path().to_string(),
-                entry.metadata(ObjectMetadataKey::Mode).await?.mode(),
+                entry.metadata(ObjectMetakey::Mode).await?.mode(),
             );
         }
 

diff --git a/src/lib.rs b/src/lib.rs
@@ -79,7 +79,7 @@ mod object;
 pub use object::Object;
 pub use object::ObjectLister;
 pub use object::ObjectMetadata;
-pub use object::ObjectMetadataKey;
+pub use object::ObjectMetakey;
 pub use object::ObjectMode;
 pub use object::ObjectMultipart;
 pub use object::ObjectPart;