You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opendal.apache.org by ju...@apache.org on 2023/08/22 04:57:45 UTC
[incubator-opendal] branch feat/merge_range_read updated (f800bc6d8 -> 78604b223)
This is an automated email from the ASF dual-hosted git repository.
junouyang pushed a change to branch feat/merge_range_read
in repository https://gitbox.apache.org/repos/asf/incubator-opendal.git
omit f800bc6d8 feat: fix code
omit f9c7c14df feat: fix code
omit f94407655 feat: fix code
omit 6f4290e02 feat: remove operator rangge_read and range_reader API
add 864918919 feat: Add retry for Writer::sink operation (#2896)
add 4e1c14cb1 refactor(services/gdrive): prepare for CI (#2892)
add ebc579590 chore: add health check for docker-compose minio (#2899)
add 6f4116579 fix: Set default timeouts for HttpClient (#2895)
add b5f343b8d ci(services/hdfs): Load native lib instead (#2900)
add 2934405ac chore(ci): offload healthcheck logic to docker-compose config (#2901)
add f84715681 ci(services/rocksdb): Make sure rocksdb lib is loaded (#2902)
new 797885398 feat: remove operator rangge_read and range_reader API
new 674051ee9 feat: fix code
new 8f3fb1867 feat: fix code
new 78604b223 feat: fix code
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (f800bc6d8)
\
N -- N -- N refs/heads/feat/merge_range_read (78604b223)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 4 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.env.example | 9 +-
.github/workflows/service_test_hdfs.yml | 4 +-
.github/workflows/service_test_rocksdb.yml | 1 +
.github/workflows/service_test_s3.yml | 8 +-
bindings/ocaml/src/operator/mod.rs | 3 +-
bindings/ocaml/src/operator/reader.rs | 4 +-
core/src/layers/retry.rs | 60 +++-
core/src/raw/http_util/client.rs | 5 +
core/src/raw/oio/stream/api.rs | 118 ++++++-
core/src/raw/oio/stream/into_stream.rs | 7 +
core/src/raw/oio/stream/into_stream_from_reader.rs | 7 +
core/src/raw/oio/stream/mod.rs | 1 +
core/src/services/gdrive/backend.rs | 163 ++++++++-
core/src/services/gdrive/core.rs | 377 ++++++++++++++++-----
core/src/services/gdrive/writer.rs | 72 +++-
.../services/s3/fixtures/docker-compose-minio.yml | 5 +
16 files changed, 721 insertions(+), 123 deletions(-)
[incubator-opendal] 03/04: feat: fix code
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
junouyang pushed a commit to branch feat/merge_range_read
in repository https://gitbox.apache.org/repos/asf/incubator-opendal.git
commit 8f3fb1867e08fba13c0239c872c4cf0f198bc7f4
Author: owl <ou...@gmail.com>
AuthorDate: Tue Aug 22 01:26:15 2023 +0800
feat: fix code
---
core/src/types/operator/operator.rs | 1 -
1 file changed, 1 deletion(-)
diff --git a/core/src/types/operator/operator.rs b/core/src/types/operator/operator.rs
index 70c276c2d..9849c5fe5 100644
--- a/core/src/types/operator/operator.rs
+++ b/core/src/types/operator/operator.rs
@@ -15,7 +15,6 @@
// specific language governing permissions and limitations
// under the License.
-use std::ops::RangeBounds;
use std::time::Duration;
use bytes::Bytes;
[incubator-opendal] 04/04: feat: fix code
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
junouyang pushed a commit to branch feat/merge_range_read
in repository https://gitbox.apache.org/repos/asf/incubator-opendal.git
commit 78604b223fffbbcfab29ad276d4aa93d5dee47d7
Author: owl <ou...@gmail.com>
AuthorDate: Tue Aug 22 12:07:24 2023 +0800
feat: fix code
---
core/src/types/operator/operator.rs | 1 +
core/tests/behavior/read_only.rs | 32 ++++++++++++++++++++++++++++++++
2 files changed, 33 insertions(+)
diff --git a/core/src/types/operator/operator.rs b/core/src/types/operator/operator.rs
index 9849c5fe5..b95f4b78d 100644
--- a/core/src/types/operator/operator.rs
+++ b/core/src/types/operator/operator.rs
@@ -343,6 +343,7 @@ impl Operator {
/// # #[tokio::main]
/// # async fn test(op: Operator) -> Result<()> {
/// let bs = op.read_with("path/to/file").await?;
+ /// let bs = op.read_with("path/to/file").range(0..10).await?;
/// # Ok(())
/// # }
/// ```
diff --git a/core/tests/behavior/read_only.rs b/core/tests/behavior/read_only.rs
index 2edaea846..90275ee04 100644
--- a/core/tests/behavior/read_only.rs
+++ b/core/tests/behavior/read_only.rs
@@ -40,6 +40,8 @@ pub fn behavior_read_only_tests(op: &Operator) -> Vec<Trial> {
test_read_only_stat_root,
test_read_only_read_full,
test_read_only_read_full_with_special_chars,
+ test_read_only_read_with_range,
+ test_read_only_reader_with_range,
test_read_only_reader_from,
test_read_only_reader_tail,
test_read_only_read_not_exist,
@@ -181,6 +183,36 @@ pub async fn test_read_only_read_full_with_special_chars(op: Operator) -> Result
Ok(())
}
+/// Read full content should match.
+pub async fn test_read_only_read_with_range(op: Operator) -> Result<()> {
+ let bs = op.read_with("normal_file").range(1024..2048).await?;
+ assert_eq!(bs.len(), 1024, "read size");
+ assert_eq!(
+ format!("{:x}", Sha256::digest(&bs)),
+ "28786fb63abfe5545479e4f50da853652d1d67b88be5553c265ede4022774913",
+ "read content"
+ );
+
+ Ok(())
+}
+
+/// Read range should match.
+pub async fn test_read_only_reader_with_range(op: Operator) -> Result<()> {
+ let mut r = op.reader_with("normal_file").range(1024..2048).await?;
+
+ let mut bs = Vec::new();
+ r.read_to_end(&mut bs).await?;
+
+ assert_eq!(bs.len(), 1024, "read size");
+ assert_eq!(
+ format!("{:x}", Sha256::digest(&bs)),
+ "28786fb63abfe5545479e4f50da853652d1d67b88be5553c265ede4022774913",
+ "read content"
+ );
+
+ Ok(())
+}
+
/// Read from should match.
pub async fn test_read_only_reader_from(op: Operator) -> Result<()> {
let mut r = op.reader_with("normal_file").range(261120..).await?;
[incubator-opendal] 02/04: feat: fix code
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
junouyang pushed a commit to branch feat/merge_range_read
in repository https://gitbox.apache.org/repos/asf/incubator-opendal.git
commit 674051ee9d6c1b96b6efbd8943c455fecfade4ca
Author: owl <ou...@gmail.com>
AuthorDate: Tue Aug 22 01:17:04 2023 +0800
feat: fix code
---
bin/oay/src/services/webdav/webdav_file.rs | 3 ++-
core/benches/ops/read.rs | 6 ++++--
core/src/layers/logging.rs | 11 ++++++++---
integrations/object_store/src/lib.rs | 3 ++-
4 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/bin/oay/src/services/webdav/webdav_file.rs b/bin/oay/src/services/webdav/webdav_file.rs
index 5f9b07131..53e99c07f 100644
--- a/bin/oay/src/services/webdav/webdav_file.rs
+++ b/bin/oay/src/services/webdav/webdav_file.rs
@@ -40,7 +40,8 @@ impl DavFile for WebdavFile {
async move {
let file_path = self.path.as_url_string();
self.op
- .read_with(&file_path).range(0..count as u64)
+ .read_with(&file_path)
+ .range(0..count as u64)
.await
.map(Bytes::from)
.map_err(convert_error)
diff --git a/core/benches/ops/read.rs b/core/benches/ops/read.rs
index ab591fc7b..e33db0b50 100644
--- a/core/benches/ops/read.rs
+++ b/core/benches/ops/read.rs
@@ -58,7 +58,8 @@ fn bench_read_full(c: &mut Criterion, name: &str, op: Operator) {
group.bench_with_input(size.to_string(), &(op.clone(), &path), |b, (op, path)| {
b.to_async(&*TOKIO).iter(|| async {
let r = op
- .reader_with(path).range(0..=size.bytes() as u64)
+ .reader_with(path)
+ .range(0..=size.bytes() as u64)
.await
.unwrap();
io::copy(r, &mut io::sink()).await.unwrap();
@@ -130,7 +131,8 @@ fn bench_read_parallel(c: &mut Criterion, name: &str, op: Operator) {
.map(|_| async {
let mut buf = buf.clone();
let mut r = op
- .reader_with(path).range(offset..=offset + size.bytes() as u64)
+ .reader_with(path)
+ .range(offset..=offset + size.bytes() as u64)
.await
.unwrap();
r.read_exact(&mut buf).await.unwrap();
diff --git a/core/src/layers/logging.rs b/core/src/layers/logging.rs
index 9a09cc8d9..07323cf8c 100644
--- a/core/src/layers/logging.rs
+++ b/core/src/layers/logging.rs
@@ -401,7 +401,6 @@ impl<A: Accessor> LayeredAccessor for LoggingAccessor<A> {
from,
to,
self.ctx.error_print(&err),
-
)
};
err
@@ -1512,7 +1511,10 @@ impl<P: oio::Page> oio::Page for LoggingPager<P> {
Ok(None) => {
debug!(
target: LOGGING_TARGET,
- "service={} operation={} path={} -> finished", self.ctx.scheme, self.op, self.path
+ "service={} operation={} path={} -> finished",
+ self.ctx.scheme,
+ self.op,
+ self.path
);
self.finished = true;
}
@@ -1553,7 +1555,10 @@ impl<P: oio::BlockingPage> oio::BlockingPage for LoggingPager<P> {
Ok(None) => {
debug!(
target: LOGGING_TARGET,
- "service={} operation={} path={} -> finished", self.ctx.scheme, self.op, self.path
+ "service={} operation={} path={} -> finished",
+ self.ctx.scheme,
+ self.op,
+ self.path
);
self.finished = true;
}
diff --git a/integrations/object_store/src/lib.rs b/integrations/object_store/src/lib.rs
index 00ebdf0d3..6f1822d67 100644
--- a/integrations/object_store/src/lib.rs
+++ b/integrations/object_store/src/lib.rs
@@ -111,7 +111,8 @@ impl ObjectStore for OpendalStore {
async fn get_range(&self, location: &Path, range: Range<usize>) -> Result<Bytes> {
let bs = self
.inner
- .read_with(location.as_ref()).range(range.start as u64..range.end as u64)
+ .read_with(location.as_ref())
+ .range(range.start as u64..range.end as u64)
.await
.map_err(|err| format_object_store_error(err, location.as_ref()))?;
[incubator-opendal] 01/04: feat: remove operator rangge_read and range_reader API
Posted by ju...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
junouyang pushed a commit to branch feat/merge_range_read
in repository https://gitbox.apache.org/repos/asf/incubator-opendal.git
commit 797885398580dfdc61ec24a4e25586d12d51177b
Author: owl <ou...@gmail.com>
AuthorDate: Tue Aug 22 01:15:04 2023 +0800
feat: remove operator rangge_read and range_reader API
---
bin/oay/src/services/webdav/webdav_file.rs | 2 +-
core/benches/ops/read.rs | 6 ++--
core/fuzz/fuzz_reader.rs | 2 +-
core/src/types/operator/operator.rs | 55 +++---------------------------
core/tests/behavior/fuzz.rs | 2 +-
core/tests/behavior/read_only.rs | 36 ++-----------------
core/tests/behavior/write.rs | 20 +++++------
integrations/object_store/src/lib.rs | 2 +-
8 files changed, 23 insertions(+), 102 deletions(-)
diff --git a/bin/oay/src/services/webdav/webdav_file.rs b/bin/oay/src/services/webdav/webdav_file.rs
index e3a49bf86..5f9b07131 100644
--- a/bin/oay/src/services/webdav/webdav_file.rs
+++ b/bin/oay/src/services/webdav/webdav_file.rs
@@ -40,7 +40,7 @@ impl DavFile for WebdavFile {
async move {
let file_path = self.path.as_url_string();
self.op
- .range_read(&file_path, 0..count as u64)
+ .read_with(&file_path).range(0..count as u64)
.await
.map(Bytes::from)
.map_err(convert_error)
diff --git a/core/benches/ops/read.rs b/core/benches/ops/read.rs
index ef8315b95..ab591fc7b 100644
--- a/core/benches/ops/read.rs
+++ b/core/benches/ops/read.rs
@@ -58,7 +58,7 @@ fn bench_read_full(c: &mut Criterion, name: &str, op: Operator) {
group.bench_with_input(size.to_string(), &(op.clone(), &path), |b, (op, path)| {
b.to_async(&*TOKIO).iter(|| async {
let r = op
- .range_reader(path, 0..=size.bytes() as u64)
+ .reader_with(path).range(0..=size.bytes() as u64)
.await
.unwrap();
io::copy(r, &mut io::sink()).await.unwrap();
@@ -91,7 +91,7 @@ fn bench_read_part(c: &mut Criterion, name: &str, op: Operator) {
group.throughput(criterion::Throughput::Bytes(size.bytes() as u64));
group.bench_with_input(size.to_string(), &(op.clone(), &path), |b, (op, path)| {
b.to_async(&*TOKIO).iter(|| async {
- let r = op.range_reader(path, offset..).await.unwrap();
+ let r = op.reader_with(path).range(offset..).await.unwrap();
io::copy(r, &mut io::sink()).await.unwrap();
})
});
@@ -130,7 +130,7 @@ fn bench_read_parallel(c: &mut Criterion, name: &str, op: Operator) {
.map(|_| async {
let mut buf = buf.clone();
let mut r = op
- .range_reader(path, offset..=offset + size.bytes() as u64)
+ .reader_with(path).range(offset..=offset + size.bytes() as u64)
.await
.unwrap();
r.read_exact(&mut buf).await.unwrap();
diff --git a/core/fuzz/fuzz_reader.rs b/core/fuzz/fuzz_reader.rs
index 25b9db37e..7b13207bf 100644
--- a/core/fuzz/fuzz_reader.rs
+++ b/core/fuzz/fuzz_reader.rs
@@ -226,7 +226,7 @@ async fn fuzz_reader(op: Operator, input: FuzzInput) -> Result<()> {
let mut checker = ReadChecker::new(input.size, input.range);
op.write(&path, checker.raw_data.clone()).await?;
- let mut o = op.range_reader(&path, input.range.to_range()).await?;
+ let mut o = op.reader_with(&path).range(input.range.to_range()).await?;
for action in input.actions {
match action {
diff --git a/core/src/types/operator/operator.rs b/core/src/types/operator/operator.rs
index b65eb8698..70c276c2d 100644
--- a/core/src/types/operator/operator.rs
+++ b/core/src/types/operator/operator.rs
@@ -327,7 +327,7 @@ impl Operator {
/// # }
/// ```
pub async fn read(&self, path: &str) -> Result<Vec<u8>> {
- self.range_read(path, ..).await
+ self.read_with(path).await
}
/// Read the whole path into a bytes with extra options.
@@ -361,7 +361,7 @@ impl Operator {
ErrorKind::IsADirectory,
"read path is a directory",
)
- .with_operation("range_read")
+ .with_operation("read")
.with_context("service", inner.info().scheme())
.with_context("path", &path));
}
@@ -381,7 +381,7 @@ impl Operator {
// TODO: use native read api
s.read_exact(buf.initialized_mut()).await.map_err(|err| {
Error::new(ErrorKind::Unexpected, "read from storage")
- .with_operation("range_read")
+ .with_operation("read")
.with_context("service", inner.info().scheme().into_static())
.with_context("path", &path)
.with_context("range", br.to_string())
@@ -401,31 +401,6 @@ impl Operator {
fut
}
- /// Read the specified range of path into a bytes.
- ///
- /// This function will allocate a new bytes internally. For more precise memory control or
- /// reading data lazily, please use [`Operator::range_reader`]
- ///
- /// # Notes
- ///
- /// - The returning content's length may be smaller than the range specified.
- ///
- /// # Examples
- ///
- /// ```
- /// # use std::io::Result;
- /// # use opendal::Operator;
- /// # use futures::TryStreamExt;
- /// # #[tokio::main]
- /// # async fn test(op: Operator) -> Result<()> {
- /// let bs = op.range_read("path/to/file", 1024..2048).await?;
- /// # Ok(())
- /// # }
- /// ```
- pub async fn range_read(&self, path: &str, range: impl RangeBounds<u64>) -> Result<Vec<u8>> {
- self.read_with(path).range(range).await
- }
-
/// Create a new reader which can read the whole path.
///
/// # Examples
@@ -445,28 +420,6 @@ impl Operator {
self.reader_with(path).await
}
- /// Create a new reader which can read the specified range.
- ///
- /// # Notes
- ///
- /// - The returning content's length may be smaller than the range specified.
- ///
- /// # Examples
- ///
- /// ```no_run
- /// # use std::io::Result;
- /// # use opendal::Operator;
- /// # use futures::TryStreamExt;
- /// # #[tokio::main]
- /// # async fn test(op: Operator) -> Result<()> {
- /// let r = op.range_reader("path/to/file", 1024..2048).await?;
- /// # Ok(())
- /// # }
- /// ```
- pub async fn range_reader(&self, path: &str, range: impl RangeBounds<u64>) -> Result<Reader> {
- self.reader_with(path).range(range).await
- }
-
/// Create a new reader with extra options
///
/// # Examples
@@ -496,7 +449,7 @@ impl Operator {
ErrorKind::IsADirectory,
"read path is a directory",
)
- .with_operation("Operator::range_reader")
+ .with_operation("Operator::reader")
.with_context("service", inner.info().scheme())
.with_context("path", path));
}
diff --git a/core/tests/behavior/fuzz.rs b/core/tests/behavior/fuzz.rs
index 8a7b8187f..b8f47fdfb 100644
--- a/core/tests/behavior/fuzz.rs
+++ b/core/tests/behavior/fuzz.rs
@@ -81,7 +81,7 @@ pub async fn test_fuzz_issue_2717(op: Operator) -> Result<()> {
.await
.expect("write must succeed");
- let mut r = op.range_reader(&path, 1..2).await?;
+ let mut r = op.reader_with(&path).range(1..2).await?;
// Perform a seek
let result = r.seek(SeekFrom::End(-2)).await;
diff --git a/core/tests/behavior/read_only.rs b/core/tests/behavior/read_only.rs
index 85d897aaf..2edaea846 100644
--- a/core/tests/behavior/read_only.rs
+++ b/core/tests/behavior/read_only.rs
@@ -40,8 +40,6 @@ pub fn behavior_read_only_tests(op: &Operator) -> Vec<Trial> {
test_read_only_stat_root,
test_read_only_read_full,
test_read_only_read_full_with_special_chars,
- test_read_only_read_range,
- test_read_only_reader_range,
test_read_only_reader_from,
test_read_only_reader_tail,
test_read_only_read_not_exist,
@@ -183,39 +181,9 @@ pub async fn test_read_only_read_full_with_special_chars(op: Operator) -> Result
Ok(())
}
-/// Read full content should match.
-pub async fn test_read_only_read_range(op: Operator) -> Result<()> {
- let bs = op.range_read("normal_file", 1024..2048).await?;
- assert_eq!(bs.len(), 1024, "read size");
- assert_eq!(
- format!("{:x}", Sha256::digest(&bs)),
- "28786fb63abfe5545479e4f50da853652d1d67b88be5553c265ede4022774913",
- "read content"
- );
-
- Ok(())
-}
-
-/// Read range should match.
-pub async fn test_read_only_reader_range(op: Operator) -> Result<()> {
- let mut r = op.range_reader("normal_file", 1024..2048).await?;
-
- let mut bs = Vec::new();
- r.read_to_end(&mut bs).await?;
-
- assert_eq!(bs.len(), 1024, "read size");
- assert_eq!(
- format!("{:x}", Sha256::digest(&bs)),
- "28786fb63abfe5545479e4f50da853652d1d67b88be5553c265ede4022774913",
- "read content"
- );
-
- Ok(())
-}
-
/// Read from should match.
pub async fn test_read_only_reader_from(op: Operator) -> Result<()> {
- let mut r = op.range_reader("normal_file", 261120..).await?;
+ let mut r = op.reader_with("normal_file").range(261120..).await?;
let mut bs = Vec::new();
r.read_to_end(&mut bs).await?;
@@ -232,7 +200,7 @@ pub async fn test_read_only_reader_from(op: Operator) -> Result<()> {
/// Read tail should match.
pub async fn test_read_only_reader_tail(op: Operator) -> Result<()> {
- let mut r = op.range_reader("normal_file", ..1024).await?;
+ let mut r = op.reader_with("normal_file").range(..1024).await?;
let mut bs = Vec::new();
r.read_to_end(&mut bs).await?;
diff --git a/core/tests/behavior/write.rs b/core/tests/behavior/write.rs
index f60b6673b..a1effab43 100644
--- a/core/tests/behavior/write.rs
+++ b/core/tests/behavior/write.rs
@@ -68,7 +68,7 @@ pub fn behavior_write_tests(op: &Operator) -> Vec<Trial> {
test_read_not_exist,
test_read_with_if_match,
test_read_with_if_none_match,
- test_fuzz_range_reader,
+ test_fuzz_reader_with_range,
test_fuzz_offset_reader,
test_fuzz_part_reader,
test_read_with_dir_path,
@@ -438,7 +438,7 @@ pub async fn test_read_range(op: Operator) -> Result<()> {
.await
.expect("write must succeed");
- let bs = op.range_read(&path, offset..offset + length).await?;
+ let bs = op.read_with(&path).range(offset..offset + length).await?;
assert_eq!(bs.len() as u64, length, "read size");
assert_eq!(
format!("{:x}", Sha256::digest(&bs)),
@@ -468,7 +468,7 @@ pub async fn test_read_large_range(op: Operator) -> Result<()> {
.await
.expect("write must succeed");
- let bs = op.range_read(&path, offset..u32::MAX as u64).await?;
+ let bs = op.read_with(&path).range(offset..u32::MAX as u64).await?;
assert_eq!(
bs.len() as u64,
size as u64 - offset,
@@ -499,7 +499,7 @@ pub async fn test_reader_range(op: Operator) -> Result<()> {
.await
.expect("write must succeed");
- let mut r = op.range_reader(&path, offset..offset + length).await?;
+ let mut r = op.reader_with(&path).range(offset..offset + length).await?;
let mut bs = Vec::new();
r.read_to_end(&mut bs).await?;
@@ -532,7 +532,7 @@ pub async fn test_reader_from(op: Operator) -> Result<()> {
.await
.expect("write must succeed");
- let mut r = op.range_reader(&path, offset..).await?;
+ let mut r = op.reader_with(&path).range(offset..).await?;
let mut bs = Vec::new();
r.read_to_end(&mut bs).await?;
@@ -563,7 +563,7 @@ pub async fn test_reader_tail(op: Operator) -> Result<()> {
.await
.expect("write must succeed");
- let mut r = match op.range_reader(&path, ..length).await {
+ let mut r = match op.reader_with(&path).range(..length).await {
Ok(r) => r,
// Not all services support range with tail range, let's tolerate this.
Err(err) if err.kind() == ErrorKind::Unsupported => {
@@ -663,7 +663,7 @@ pub async fn test_read_with_if_none_match(op: Operator) -> Result<()> {
Ok(())
}
-pub async fn test_fuzz_range_reader(op: Operator) -> Result<()> {
+pub async fn test_fuzz_reader_with_range(op: Operator) -> Result<()> {
if !op.info().full_capability().read_with_range {
return Ok(());
}
@@ -677,7 +677,7 @@ pub async fn test_fuzz_range_reader(op: Operator) -> Result<()> {
.expect("write must succeed");
let mut fuzzer = ObjectReaderFuzzer::new(&path, content.clone(), 0, content.len());
- let mut o = op.range_reader(&path, 0..content.len() as u64).await?;
+ let mut o = op.reader_with(&path).range(0..content.len() as u64).await?;
for _ in 0..100 {
match fuzzer.fuzz() {
@@ -718,7 +718,7 @@ pub async fn test_fuzz_offset_reader(op: Operator) -> Result<()> {
.expect("write must succeed");
let mut fuzzer = ObjectReaderFuzzer::new(&path, content.clone(), 0, content.len());
- let mut o = op.range_reader(&path, 0..).await?;
+ let mut o = op.reader_with(&path).range(0..).await?;
for _ in 0..100 {
match fuzzer.fuzz() {
@@ -761,7 +761,7 @@ pub async fn test_fuzz_part_reader(op: Operator) -> Result<()> {
let mut fuzzer =
ObjectReaderFuzzer::new(&path, content.clone(), offset as usize, length as usize);
- let mut o = op.range_reader(&path, offset..offset + length).await?;
+ let mut o = op.reader_with(&path).range(offset..offset + length).await?;
for _ in 0..100 {
match fuzzer.fuzz() {
diff --git a/integrations/object_store/src/lib.rs b/integrations/object_store/src/lib.rs
index c05aaa231..00ebdf0d3 100644
--- a/integrations/object_store/src/lib.rs
+++ b/integrations/object_store/src/lib.rs
@@ -111,7 +111,7 @@ impl ObjectStore for OpendalStore {
async fn get_range(&self, location: &Path, range: Range<usize>) -> Result<Bytes> {
let bs = self
.inner
- .range_read(location.as_ref(), range.start as u64..range.end as u64)
+ .read_with(location.as_ref()).range(range.start as u64..range.end as u64)
.await
.map_err(|err| format_object_store_error(err, location.as_ref()))?;