Skip to content

feat(opendal): Add option connections #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Mar 9, 2024
Merged

feat(opendal): Add option connections #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3b2be1e
feat(opendal): Add options connections
aawsome Feb 7, 2024
a23ba4d
Merge branch 'main' into opendal-connections
aawsome Feb 12, 2024
85f268d
Merge branch 'main' into opendal-connections
simonsan Mar 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions crates/backend/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,11 +89,11 @@ tokio = { version = "1.35.1", optional = true, default-features = false }

[target.'cfg(not(windows))'.dependencies]
# opendal backend - sftp is not supported on windows, see https://github.com/apache/incubator-opendal/issues/2963
opendal = { version = "0.44.2", features = ["services-b2", "services-sftp", "services-swift"], optional = true }
opendal = { version = "0.45", features = ["services-b2", "services-sftp", "services-swift", "layers-blocking"], optional = true }

[target.'cfg(windows)'.dependencies]
# opendal backend
opendal = { version = "0.44.2", features = ["services-b2", "services-swift"], optional = true }
opendal = { version = "0.45", features = ["services-b2", "services-swift", "layers-blocking"], optional = true }

[dev-dependencies]
rstest = "0.18.2"
19 changes: 15 additions & 4 deletions crates/backend/src/opendal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use anyhow::Result;
use bytes::Bytes;
use log::trace;
use opendal::{
layers::{BlockingLayer, LoggingLayer, RetryLayer},
layers::{BlockingLayer, ConcurrentLimitLayer, LoggingLayer, RetryLayer},
BlockingOperator, ErrorKind, Metakey, Operator, Scheme,
};
use rayon::prelude::{IntoParallelIterator, ParallelIterator};
Expand Down Expand Up @@ -45,19 +45,30 @@ impl OpenDALBackend {
/// * `path` - The path to the OpenDAL backend.
/// * `options` - Additional options for the OpenDAL backend.
pub fn new(path: impl AsRef<str>, options: HashMap<String, String>) -> Result<Self> {
let max_retries = match options.get("retry").map(std::string::String::as_str) {
let max_retries = match options.get("retry").map(String::as_str) {
Some("false" | "off") => 0,
None | Some("default") => consts::DEFAULT_RETRY,
Some(value) => usize::from_str(value)?,
};
let connections = options
.get("connections")
.map(|c| usize::from_str(c))
.transpose()?;

let schema = Scheme::from_str(path.as_ref())?;
let mut operator = Operator::via_map(schema, options)?
.layer(RetryLayer::new().with_max_times(max_retries).with_jitter());

if let Some(connections) = connections {
operator = operator.layer(ConcurrentLimitLayer::new(connections));
}

let _guard = runtime().enter();
let operator = Operator::via_map(schema, options)?
.layer(RetryLayer::new().with_max_times(max_retries).with_jitter())
let operator = operator
.layer(LoggingLayer::default())
.layer(BlockingLayer::create()?)
.blocking();

Ok(Self { operator })
}

Expand Down