From ebe4d3b7ca3f23cb96f083ecfc25a9cb7950dda3 Mon Sep 17 00:00:00 2001
From: congyi <15605187270@163.com>
Date: Wed, 3 Jan 2024 16:56:05 +0800
Subject: [PATCH] bump version

---
 Cargo.lock                                    | 17 ++++++-----
 src/connector/Cargo.toml                      |  2 +-
 src/object_store/Cargo.toml                   |  2 +-
 .../opendal_engine/opendal_object_store.rs    | 30 +------------------
 4 files changed, 13 insertions(+), 38 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index ed87be2ae251d..6573d54bdccb2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4714,7 +4714,7 @@ dependencies = [
  "log",
  "murmur3",
  "once_cell",
- "opendal 0.43.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "opendal 0.43.0",
  "ordered-float 3.9.1",
  "parquet 49.0.0",
  "prometheus",
@@ -6216,8 +6216,9 @@ dependencies = [
 
 [[package]]
 name = "opendal"
-version = "0.43.0"
-source = "git+https://github.com/apache/incubator-opendal?rev=9a222e4d72b328a24d5775b1565292f4636bbe69#9a222e4d72b328a24d5775b1565292f4636bbe69"
+version = "0.44.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c32736a48ef08a5d2212864e2295c8e54f4d6b352b7f49aa0c29a12fc410ff66"
 dependencies = [
  "anyhow",
  "async-compat",
@@ -6228,6 +6229,7 @@ dependencies = [
  "chrono",
  "flagset",
  "futures",
+ "getrandom",
  "http 0.2.9",
  "log",
  "md-5",
@@ -7826,15 +7828,16 @@ dependencies = [
 
 [[package]]
 name = "reqsign"
-version = "0.14.5"
+version = "0.14.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f52b6eef6975eb2decff7d7e95744c8a6b6bb8558bc9b4230c0a3431a74f59c"
+checksum = "dce87f66ba6c6acef277a729f989a0eca946cb9ce6a15bcc036bda0f72d4b9fd"
 dependencies = [
  "anyhow",
  "async-trait",
  "base64 0.21.4",
  "chrono",
  "form_urlencoded",
+ "getrandom",
  "hex",
  "hmac",
  "home",
@@ -8471,7 +8474,7 @@ dependencies = [
  "mysql_common",
  "nexmark",
  "num-bigint",
- "opendal 0.43.0 (git+https://github.com/apache/incubator-opendal?rev=9a222e4d72b328a24d5775b1565292f4636bbe69)",
+ "opendal 0.44.0",
  "parking_lot 0.12.1",
  "paste",
  "pretty_assertions",
@@ -9039,7 +9042,7 @@ dependencies = [
  "itertools 0.12.0",
  "madsim-aws-sdk-s3",
  "madsim-tokio",
- "opendal 0.43.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "opendal 0.44.0",
  "prometheus",
  "risingwave_common",
  "rustls",
diff --git a/src/connector/Cargo.toml b/src/connector/Cargo.toml
index 82303fd620f29..5d74d749f929d 100644
--- a/src/connector/Cargo.toml
+++ b/src/connector/Cargo.toml
@@ -79,7 +79,7 @@ mysql_common = { version = "0.31", default-features = false, features = [
 ] }
 nexmark = { version = "0.2", features = ["serde"] }
 num-bigint = "0.4"
-opendal = { git = "https://github.com/apache/incubator-opendal", rev = "9a222e4d72b328a24d5775b1565292f4636bbe69" }
+opendal = "0.44"
 parking_lot = "0.12"
 paste = "1"
 prometheus = { version = "0.13", features = ["process"] }
diff --git a/src/object_store/Cargo.toml b/src/object_store/Cargo.toml
index f0d22ffad44cc..95354557dd943 100644
--- a/src/object_store/Cargo.toml
+++ b/src/object_store/Cargo.toml
@@ -26,7 +26,7 @@ hyper = { version = "0.14", features = ["tcp", "client"] }
 hyper-rustls = { version = "0.24.2", features = ["webpki-roots"] }
 hyper-tls = "0.5.0"
 itertools = "0.12"
-opendal = "0.43"
+opendal = "0.44"
 prometheus = { version = "0.13", features = ["process"] }
 risingwave_common = { workspace = true }
 rustls = "0.21.8"
diff --git a/src/object_store/src/object/opendal_engine/opendal_object_store.rs b/src/object_store/src/object/opendal_engine/opendal_object_store.rs
index 1a7f1c62e87e7..bb94d3106f3b3 100644
--- a/src/object_store/src/object/opendal_engine/opendal_object_store.rs
+++ b/src/object_store/src/object/opendal_engine/opendal_object_store.rs
@@ -199,34 +199,6 @@ impl ObjectStore for OpendalObjectStore {
     }
 }
 
-impl OpendalObjectStore {
-    // This function is only used in unit test, as list api will spawn the thread to stat Metakey::ContentLength,
-    // which will panic in deterministic test.
-    #[cfg(test)]
-    async fn list_for_test(&self, prefix: &str) -> ObjectResult<ObjectMetadataIter> {
-        let object_lister = self.op.lister_with(prefix).recursive(true).await?;
-
-        let stream = stream::unfold(object_lister, |mut object_lister| async move {
-            match object_lister.next().await {
-                Some(Ok(object)) => {
-                    let key = object.path().to_string();
-                    let last_modified = 0_f64;
-                    let total_size = 0_usize;
-                    let metadata = ObjectMetadata {
-                        key,
-                        last_modified,
-                        total_size,
-                    };
-                    Some((Ok(metadata), object_lister))
-                }
-                Some(Err(err)) => Some((Err(err.into()), object_lister)),
-                None => None,
-            }
-        });
-
-        Ok(stream.boxed())
-    }
-}
 
 /// Store multiple parts in a map, and concatenate them on finish.
 pub struct OpendalStreamingUploader {
@@ -273,7 +245,7 @@ mod tests {
 
     async fn list_all(prefix: &str, store: &OpendalObjectStore) -> Vec<ObjectMetadata> {
         store
-            .list_for_test(prefix)
+            .list(prefix)
             .await
             .unwrap()
             .try_collect::<Vec<_>>()