From f292e7b147b9592a74153b7d434c3a29750483e5 Mon Sep 17 00:00:00 2001
From: xiangjinwu <17769960+xiangjinwu@users.noreply.github.com>
Date: Tue, 26 Mar 2024 22:40:28 +0800
Subject: [PATCH] chore: bump opendal to v0.45.1 for connector/icelake (#15920)

---
 Cargo.lock                                    | 38 ++-----------------
 src/connector/Cargo.toml                      |  2 +-
 .../opendal_source/opendal_reader.rs          |  3 ++
 3 files changed, 8 insertions(+), 35 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2afdd92bbf435..278a56cd3f9c5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5166,7 +5166,7 @@ dependencies = [
  "log",
  "murmur3",
  "once_cell",
- "opendal 0.44.2",
+ "opendal",
  "ordered-float 3.9.1",
  "parquet 50.0.0",
  "prometheus",
@@ -6793,37 +6793,6 @@ version = "11.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575"
 
-[[package]]
-name = "opendal"
-version = "0.44.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4af824652d4d2ffabf606d337a071677ae621b05622adf35df9562f69d9b4498"
-dependencies = [
- "anyhow",
- "async-trait",
- "backon",
- "base64 0.21.7",
- "bytes",
- "chrono",
- "flagset",
- "futures",
- "getrandom",
- "http 0.2.9",
- "log",
- "md-5",
- "once_cell",
- "percent-encoding",
- "prometheus",
- "quick-xml 0.30.0",
- "reqsign",
- "reqwest",
- "serde",
- "serde_json",
- "sha2",
- "tokio",
- "uuid",
-]
-
 [[package]]
 name = "opendal"
 version = "0.45.1"
@@ -6844,6 +6813,7 @@ dependencies = [
  "md-5",
  "once_cell",
  "percent-encoding",
+ "prometheus",
  "quick-xml 0.31.0",
  "reqsign",
  "reqwest",
@@ -9338,7 +9308,7 @@ dependencies = [
  "mysql_common",
  "nexmark",
  "num-bigint",
- "opendal 0.44.2",
+ "opendal",
  "parking_lot 0.12.1",
  "paste",
  "pretty_assertions",
@@ -10009,7 +9979,7 @@ dependencies = [
  "madsim",
  "madsim-aws-sdk-s3",
  "madsim-tokio",
- "opendal 0.45.1",
+ "opendal",
  "prometheus",
  "risingwave_common",
  "rustls",
diff --git a/src/connector/Cargo.toml b/src/connector/Cargo.toml
index 8faea40d5be25..2b0d04bcb90a5 100644
--- a/src/connector/Cargo.toml
+++ b/src/connector/Cargo.toml
@@ -82,7 +82,7 @@ mysql_common = { version = "0.31", default-features = false, features = [
 ] }
 nexmark = { version = "0.2", features = ["serde"] }
 num-bigint = "0.4"
-opendal = "0.44"
+opendal = "0.45"
 parking_lot = "0.12"
 paste = "1"
 prometheus = { version = "0.13", features = ["process"] }
diff --git a/src/connector/src/source/filesystem/opendal_source/opendal_reader.rs b/src/connector/src/source/filesystem/opendal_source/opendal_reader.rs
index 79a4925f4bd24..0fb53ce8a0d1c 100644
--- a/src/connector/src/source/filesystem/opendal_source/opendal_reader.rs
+++ b/src/connector/src/source/filesystem/opendal_source/opendal_reader.rs
@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use std::future::IntoFuture;
+
 use async_trait::async_trait;
 use futures::TryStreamExt;
 use futures_async_stream::try_stream;
@@ -126,6 +128,7 @@ impl<Src: OpendalSource> OpendalReader<Src> {
         let reader = op
             .reader_with(&object_name)
             .range(split.offset as u64..)
+            .into_future() // Unlike `rustc`, `try_stream` seems require manual `into_future`.
             .await?;
 
         let stream_reader = StreamReader::new(