refactor: Remove metakey concept (#5319)

apache · Nov 14, 2024 · cd2fc9f · cd2fc9f
1 parent 137843c
commit cd2fc9f
Show file tree

Hide file tree

Showing 28 changed files with 173 additions and 1,282 deletions.
diff --git a/bin/oay/src/services/s3/service.rs b/bin/oay/src/services/s3/service.rs
@@ -26,7 +26,6 @@ use axum::routing::get;
 use axum::Router;
 use chrono::SecondsFormat;
 use futures_util::StreamExt;
-use opendal::Metakey;
 use opendal::Operator;
 use serde::Deserialize;
 use serde::Serialize;
@@ -100,7 +99,6 @@ async fn handle_list_objects(
         .op
         .lister_with(&params.prefix)
         .start_after(&params.start_after)
-        .metakey(Metakey::Mode | Metakey::LastModified | Metakey::Etag | Metakey::ContentLength)
         .await?
         .chunks(1000);
 

diff --git a/bindings/java/src/error.rs b/bindings/java/src/error.rs
@@ -83,7 +83,7 @@ impl From<opendal::Error> for Error {
 
 impl From<jni::errors::Error> for Error {
     fn from(err: jni::errors::Error) -> Self {
-        opendal::Error::new(ErrorKind::Unexpected, &err.to_string()).into()
+        opendal::Error::new(ErrorKind::Unexpected, err.to_string()).into()
     }
 }
 

diff --git a/bindings/java/src/lib.rs b/bindings/java/src/lib.rs
@@ -28,7 +28,6 @@ use opendal::Capability;
 use opendal::Entry;
 use opendal::EntryMode;
 use opendal::Metadata;
-use opendal::Metakey;
 use opendal::OperatorInfo;
 
 mod async_operator;
@@ -51,7 +50,7 @@ fn make_presigned_request<'a>(env: &mut JNIEnv<'a>, req: PresignedRequest) -> Re
         for (k, v) in req.header().iter() {
             let key = k.to_string();
             let value = v.to_str().map_err(|err| {
-                opendal::Error::new(opendal::ErrorKind::Unexpected, &err.to_string())
+                opendal::Error::new(opendal::ErrorKind::Unexpected, err.to_string())
             })?;
             map.insert(key, value.to_owned());
         }
@@ -143,72 +142,36 @@ fn make_metadata<'a>(env: &mut JNIEnv<'a>, metadata: Metadata) -> Result<JObject
         EntryMode::Unknown => 2,
     };
 
-    let metakey = metadata.metakey();
-
-    let contains_metakey = |k| metakey.contains(k) || metakey.contains(Metakey::Complete);
-
-    let last_modified = if contains_metakey(Metakey::LastModified) {
-        metadata.last_modified().map_or_else(
-            || Ok::<JObject<'_>, error::Error>(JObject::null()),
-            |v| {
-                Ok(env
-                    .call_static_method(
-                        "java/time/Instant",
-                        "ofEpochSecond",
-                        "(JJ)Ljava/time/Instant;",
-                        &[
-                            JValue::Long(v.timestamp()),
-                            JValue::Long(v.timestamp_subsec_nanos() as jlong),
-                        ],
-                    )?
-                    .l()?)
-            },
-        )?
-    } else {
-        JObject::null()
-    };
+    let last_modified = metadata.last_modified().map_or_else(
+        || Ok::<JObject<'_>, error::Error>(JObject::null()),
+        |v| {
+            Ok(env
+                .call_static_method(
+                    "java/time/Instant",
+                    "ofEpochSecond",
+                    "(JJ)Ljava/time/Instant;",
+                    &[
+                        JValue::Long(v.timestamp()),
+                        JValue::Long(v.timestamp_subsec_nanos() as jlong),
+                    ],
+                )?
+                .l()?)
+        },
+    )?;
 
-    let cache_control = if contains_metakey(Metakey::CacheControl) {
-        convert::string_to_jstring(env, metadata.cache_control())?
-    } else {
-        JObject::null()
-    };
+    let cache_control = convert::string_to_jstring(env, metadata.cache_control())?;
 
-    let content_disposition = if contains_metakey(Metakey::ContentDisposition) {
-        convert::string_to_jstring(env, metadata.content_disposition())?
-    } else {
-        JObject::null()
-    };
+    let content_disposition = convert::string_to_jstring(env, metadata.content_disposition())?;
 
-    let content_md5 = if contains_metakey(Metakey::ContentMd5) {
-        convert::string_to_jstring(env, metadata.content_md5())?
-    } else {
-        JObject::null()
-    };
+    let content_md5 = convert::string_to_jstring(env, metadata.content_md5())?;
 
-    let content_type = if contains_metakey(Metakey::ContentType) {
-        convert::string_to_jstring(env, metadata.content_type())?
-    } else {
-        JObject::null()
-    };
+    let content_type = convert::string_to_jstring(env, metadata.content_type())?;
 
-    let etag = if contains_metakey(Metakey::Etag) {
-        convert::string_to_jstring(env, metadata.etag())?
-    } else {
-        JObject::null()
-    };
+    let etag = convert::string_to_jstring(env, metadata.etag())?;
 
-    let version = if contains_metakey(Metakey::Version) {
-        convert::string_to_jstring(env, metadata.version())?
-    } else {
-        JObject::null()
-    };
+    let version = convert::string_to_jstring(env, metadata.version())?;
 
-    let content_length = if contains_metakey(Metakey::ContentLength) {
-        metadata.content_length() as jlong
-    } else {
-        -1
-    };
+    let content_length = metadata.content_length() as jlong;
 
     let result = env
         .new_object(

diff --git a/bindings/java/src/operator_input_stream.rs b/bindings/java/src/operator_input_stream.rs
@@ -87,7 +87,7 @@ fn intern_read_next_bytes(
     match reader
         .next()
         .transpose()
-        .map_err(|err| opendal::Error::new(opendal::ErrorKind::Unexpected, &err.to_string()))?
+        .map_err(|err| opendal::Error::new(opendal::ErrorKind::Unexpected, err.to_string()))?
     {
         None => Ok(JObject::null().into_raw()),
         Some(content) => {

diff --git a/core/Cargo.lock b/core/Cargo.lock