Skip to content

Commit a5ace50

Browse files
committed
feat: Upgrade OpenDAL to v0.16.0
Signed-off-by: Xuanwo <github@xuanwo.io>
1 parent 8adbd8c commit a5ace50

File tree

13 files changed

+77
-78
lines changed

13 files changed

+77
-78
lines changed

Cargo.lock

Lines changed: 56 additions & 63 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/common/contexts/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ test = false
1212
common-base = { path = "../base" }
1313

1414
async-trait = "0.1.56"
15-
opendal = { version = "0.14.1", features = ["layers-retry"] }
15+
opendal = { version = "0.16.0", features = ["layers-retry"] }

src/common/storage/Cargo.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,8 @@ anyhow = "1.0.58"
1818
backon = "0.0.2"
1919
globiter = "0.1.0"
2020
once_cell = "1.12.0"
21-
opendal = { version = "0.14.1", features = [
21+
opendal = { version = "0.16.0", features = [
2222
"layers-retry",
23-
"services-http",
2423
"layers-tracing",
2524
"layers-metrics",
2625
"compress",

src/common/storage/src/operator.rs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ use common_base::base::Singleton;
2121
use common_contexts::DalRuntime;
2222
use common_exception::ErrorCode;
2323
use once_cell::sync::OnceCell;
24+
use opendal::layers::ImmutableIndexLayer;
2425
use opendal::layers::LoggingLayer;
2526
use opendal::layers::MetricsLayer;
2627
use opendal::layers::RetryLayer;
@@ -127,10 +128,16 @@ pub fn init_http_operator(cfg: &StorageHttpConfig) -> Result<Operator> {
127128
// Endpoint.
128129
builder.endpoint(&cfg.endpoint_url);
129130

130-
// Update index.
131-
builder.extend_index(cfg.paths.iter().map(|v| v.as_str()));
131+
// HTTP Service is read-only and doesn't support list operation.
132+
// ImmutableIndexLayer will build an in-memory immutable index for it.
133+
let mut immutable_layer = ImmutableIndexLayer::default();
134+
let files: Vec<String> = cfg.paths.iter().map(|v| v.to_string()).collect();
135+
// TODO: should be replace by `immutable_layer.extend_iter()` after fix
136+
for i in files {
137+
immutable_layer.insert(i);
138+
}
132139

133-
Ok(Operator::new(builder.build()?))
140+
Ok(Operator::new(builder.build()?).layer(immutable_layer))
134141
}
135142

136143
/// init_memory_operator will init a opendal memory operator.

src/query/catalog/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,5 @@ common-users = { path = "../users" }
2626

2727
async-trait = "0.1.56"
2828
dyn-clone = "1.0.6"
29-
opendal = { version = "0.14.1", features = ["layers-retry"] }
29+
opendal = { version = "0.16.0", features = ["layers-retry"] }
3030
parking_lot = "0.12.1"

src/query/config/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ common-users = { path = "../users" }
2121
clap = { version = "3.2.5", features = ["derive", "env"] }
2222
hex = "0.4.3"
2323
once_cell = "1.12.0"
24-
opendal = { version = "0.14.1", features = ["layers-retry", "compress"], optional = true }
24+
opendal = { version = "0.16.0", features = ["layers-retry", "compress"], optional = true }
2525
semver = "1.0.10"
2626
serde = { version = "1.0.137", features = ["derive"] }
2727
serfig = "0.0.2"

src/query/pipeline/sources/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,5 +23,5 @@ common-streams = { path = "../../streams" }
2323
async-trait = { version = "0.1.0", package = "async-trait-fn" }
2424
futures = "0.3.21"
2525
futures-util = "0.3.21"
26-
opendal = { version = "0.14.1", features = ["layers-retry", "compress"] }
26+
opendal = { version = "0.16.0", features = ["layers-retry", "compress"] }
2727
parking_lot = "0.12.1"

src/query/service/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ num = "0.4.0"
111111
num_cpus = "1.13.1"
112112
octocrab = "0.16.0"
113113
once_cell = "1.12.0"
114-
opendal = { version = "0.14.1", features = ["layers-retry", "layers-tracing", "layers-metrics", "compress"] }
114+
opendal = { version = "0.16.0", features = ["layers-retry", "layers-tracing", "layers-metrics", "compress"] }
115115
opensrv-mysql = "0.2.0"
116116
openssl = { version = "0.10.40", features = ["vendored"] }
117117
parking_lot = "0.12.1"

src/query/storages/fuse/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ backoff = { version = "0.4.0", features = ["futures", "tokio"] }
3737
chrono = "0.4.19"
3838
futures = "0.3.21"
3939
futures-util = "0.3.21"
40-
opendal = { version = "0.14.1", features = ["layers-retry"] }
40+
opendal = { version = "0.16.0", features = ["layers-retry"] }
4141
serde = { version = "1.0.137", features = ["derive"] }
4242
serde_json = "1.0.81"
4343
tracing = "0.1.35"

src/query/storages/hive/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ common-storages-util = { path = "../util" }
3131
async-recursion = "1.0.0"
3232
async-trait = "0.1.56"
3333
futures = "0.3.21"
34-
opendal = { version = "0.14.1", features = ["layers-retry"] }
34+
opendal = { version = "0.16.0", features = ["layers-retry"] }
3535
serde = { version = "1.0.137", features = ["derive"] }
3636
thrift = "0.15.0"
3737
tracing = "0.1.35"

0 commit comments

Comments
 (0)