Skip to content

Commit af496fb

Browse files
committed
Merge remote-tracking branch 'upstream/main' into 14550_issue
2 parents d58a451 + 2c73fcd commit af496fb

File tree

253 files changed

+3440
-2277
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

253 files changed

+3440
-2277
lines changed

.github/workflows/extended.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,9 @@ jobs:
4848
with:
4949
rust-version: stable
5050
- name: Prepare cargo build
51-
run: cargo check --profile ci --all-targets
51+
run: |
52+
cargo check --profile ci --all-targets
53+
cargo clean
5254
5355
# Run extended tests (with feature 'extended_tests')
5456
linux-test-extended:
@@ -70,6 +72,8 @@ jobs:
7072
run: cargo test --profile ci --exclude datafusion-examples --exclude datafusion-benchmarks --workspace --lib --tests --bins --features avro,json,backtrace,extended_tests
7173
- name: Verify Working Directory Clean
7274
run: git diff --exit-code
75+
- name: Cleanup
76+
run: cargo clean
7377

7478
# Check answers are correct when hash values collide
7579
hash-collisions:
@@ -90,6 +94,7 @@ jobs:
9094
run: |
9195
cd datafusion
9296
cargo test --profile ci --exclude datafusion-examples --exclude datafusion-benchmarks --exclude datafusion-sqllogictest --workspace --lib --tests --features=force_hash_collisions,avro,extended_tests
97+
cargo clean
9398
9499
sqllogictest-sqlite:
95100
name: "Run sqllogictests with the sqlite test suite"
@@ -106,4 +111,8 @@ jobs:
106111
with:
107112
rust-version: stable
108113
- name: Run sqllogictest
109-
run: cargo test --profile release-nonlto --test sqllogictests -- --include-sqlite
114+
run: |
115+
cargo test --profile release-nonlto --test sqllogictests -- --include-sqlite
116+
cargo clean
117+
118+

Cargo.lock

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

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ ctor = "0.2.9"
9999
dashmap = "6.0.1"
100100
datafusion = { path = "datafusion/core", version = "45.0.0", default-features = false }
101101
datafusion-catalog = { path = "datafusion/catalog", version = "45.0.0" }
102-
datafusion-catalog-listing = { path = "datafusion/catalog-listing", version = "45.0.0" }
102+
datafusion-catalog-listing = { path = "datafusion/catalog-listing", version = "45.0.0", default-features = false }
103103
datafusion-common = { path = "datafusion/common", version = "45.0.0", default-features = false }
104104
datafusion-common-runtime = { path = "datafusion/common-runtime", version = "45.0.0" }
105105
datafusion-doc = { path = "datafusion/doc", version = "45.0.0" }

datafusion/catalog-listing/Cargo.toml

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,35 +27,46 @@ repository.workspace = true
2727
rust-version.workspace = true
2828
version.workspace = true
2929

30+
[features]
31+
compression = ["async-compression", "xz2", "bzip2", "flate2", "zstd", "tokio-util"]
32+
default = ["compression"]
33+
3034
[dependencies]
3135
arrow = { workspace = true }
32-
arrow-schema = { workspace = true }
3336
async-compression = { version = "0.4.0", features = [
3437
"bzip2",
3538
"gzip",
3639
"xz",
3740
"zstd",
3841
"tokio",
3942
], optional = true }
43+
async-trait = { workspace = true }
44+
bytes = { workspace = true }
45+
bzip2 = { version = "0.5.0", optional = true }
4046
chrono = { workspace = true }
4147
datafusion-catalog = { workspace = true }
4248
datafusion-common = { workspace = true, features = ["object_store"] }
49+
datafusion-common-runtime = { workspace = true }
4350
datafusion-execution = { workspace = true }
4451
datafusion-expr = { workspace = true }
4552
datafusion-physical-expr = { workspace = true }
4653
datafusion-physical-expr-common = { workspace = true }
4754
datafusion-physical-plan = { workspace = true }
55+
flate2 = { version = "1.0.24", optional = true }
4856
futures = { workspace = true }
4957
glob = "0.3.0"
5058
itertools = { workspace = true }
5159
log = { workspace = true }
5260
object_store = { workspace = true }
61+
rand = { workspace = true }
62+
tokio = { workspace = true }
63+
tokio-util = { version = "0.7.4", features = ["io"], optional = true }
5364
url = { workspace = true }
65+
xz2 = { version = "0.1", optional = true, features = ["static"] }
66+
zstd = { version = "0.13", optional = true, default-features = false }
5467

5568
[dev-dependencies]
56-
async-trait = { workspace = true }
5769
tempfile = { workspace = true }
58-
tokio = { workspace = true }
5970

6071
[lints]
6172
workspace = true

datafusion/core/src/datasource/file_format/file_compression_type.rs renamed to datafusion/catalog-listing/src/file_compression_type.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
2020
use std::str::FromStr;
2121

22-
use crate::error::{DataFusionError, Result};
22+
use datafusion_common::error::{DataFusionError, Result};
2323

2424
use datafusion_common::parsers::CompressionTypeVariant::{self, *};
2525
use datafusion_common::GetExt;
@@ -254,8 +254,8 @@ pub trait FileTypeExt {
254254
mod tests {
255255
use std::str::FromStr;
256256

257-
use crate::datasource::file_format::file_compression_type::FileCompressionType;
258-
use crate::error::DataFusionError;
257+
use super::FileCompressionType;
258+
use datafusion_common::error::DataFusionError;
259259

260260
use bytes::Bytes;
261261
use futures::StreamExt;

0 commit comments

Comments
 (0)