Skip to content

Commit 84b2ba8

Browse files
refactor: Drop smol runtime support (#1900)
## Which issue does this PR close? - Closes #1866 ## What changes are included in this PR? ## Are these changes tested? --------- Signed-off-by: Xuanwo <github@xuanwo.io> Co-authored-by: Renjie Liu <liurenjie2008@gmail.com>
1 parent c0f9fdc commit 84b2ba8

File tree

6 files changed

+25
-237
lines changed

6 files changed

+25
-237
lines changed

.github/workflows/ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ jobs:
143143
matrix:
144144
test-suite:
145145
- { name: "default", args: "--all-targets --all-features --workspace" }
146-
- { name: "smol", args: "--all-targets --no-default-features --features smol --features storage-all --workspace" }
147146
- { name: "doc", args: "--doc --all-features --workspace" }
148147
name: Unit Tests (${{ matrix.test-suite.name }})
149148
steps:

Cargo.lock

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

Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,6 @@ serde_derive = "1.0.219"
116116
serde_json = "1.0.142"
117117
serde_repr = "0.1.16"
118118
serde_with = "3.4"
119-
smol = "2.0.2"
120119
sqllogictest = "0.28.3"
121120
sqlx = { version = "0.8.1", default-features = false }
122121
stacker = "0.1.20"

crates/iceberg/Cargo.toml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ license = { workspace = true }
2929
repository = { workspace = true }
3030

3131
[features]
32-
default = ["storage-memory", "storage-fs", "storage-s3", "tokio"]
32+
default = ["storage-memory", "storage-fs", "storage-s3"]
3333
storage-all = ["storage-memory", "storage-fs", "storage-s3", "storage-gcs"]
3434

3535
storage-azdls = ["opendal/services-azdls"]
@@ -39,8 +39,6 @@ storage-memory = ["opendal/services-memory"]
3939
storage-oss = ["opendal/services-oss"]
4040
storage-s3 = ["opendal/services-s3", "reqsign"]
4141

42-
smol = ["dep:smol"]
43-
tokio = ["tokio/rt-multi-thread"]
4442

4543
[dependencies]
4644
anyhow = { workspace = true }
@@ -85,7 +83,6 @@ serde_derive = { workspace = true }
8583
serde_json = { workspace = true }
8684
serde_repr = { workspace = true }
8785
serde_with = { workspace = true }
88-
smol = { workspace = true, optional = true }
8986
strum = { workspace = true, features = ["derive"] }
9087
thrift = { workspace = true }
9188
tokio = { workspace = true, optional = false, features = ["sync"] }

crates/iceberg/src/io/storage.rs

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@
1515
// specific language governing permissions and limitations
1616
// under the License.
1717

18+
#[cfg(any(
19+
feature = "storage-s3",
20+
feature = "storage-gcs",
21+
feature = "storage-oss",
22+
feature = "storage-azdls",
23+
))]
1824
use std::sync::Arc;
1925

2026
use opendal::layers::RetryLayer;
@@ -71,6 +77,7 @@ impl Storage {
7177
/// Convert iceberg config to opendal config.
7278
pub(crate) fn build(file_io_builder: FileIOBuilder) -> crate::Result<Self> {
7379
let (scheme_str, props, extensions) = file_io_builder.into_parts();
80+
let _ = (&props, &extensions);
7481
let scheme = Self::parse_scheme(&scheme_str)?;
7582

7683
match scheme {
@@ -127,6 +134,7 @@ impl Storage {
127134
path: &'a impl AsRef<str>,
128135
) -> crate::Result<(Operator, &'a str)> {
129136
let path = path.as_ref();
137+
let _ = path;
130138
let (operator, relative_path): (Operator, &str) = match self {
131139
#[cfg(feature = "storage-memory")]
132140
Storage::Memory(op) => {

0 commit comments

Comments
 (0)