Skip to content

Commit 2fbe56f

Browse files
authored
Merge branch 'main' into implement_additional_benchmarks_hashjoin
2 parents a9d6d68 + 14c18ec commit 2fbe56f

4 files changed

Lines changed: 14 additions & 8 deletions

File tree

Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,8 +104,11 @@ arrow-data = { version = "58.1.0", default-features = false }
104104
arrow-flight = { version = "58.1.0", features = [
105105
"flight-sql-experimental",
106106
] }
107+
# Both codecs are required here to make sure that code paths like
108+
# file-spilling have access to all compression codecs.
107109
arrow-ipc = { version = "58.1.0", default-features = false, features = [
108110
"lz4",
111+
"zstd",
109112
] }
110113
arrow-ord = { version = "58.1.0", default-features = false }
111114
arrow-schema = { version = "58.1.0", default-features = false }

datafusion/datasource-arrow/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,6 @@ name = "datafusion_datasource_arrow"
6262
path = "src/mod.rs"
6363

6464
[features]
65-
compression = [
66-
"arrow-ipc/zstd",
67-
]
65+
# This feature is deprecated, as core functionality in the SpillManager requires all features
66+
# it enabled, and will be removed in a future version.
67+
compression = []

datafusion/datasource-arrow/src/mod.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121
#![cfg_attr(not(test), deny(clippy::clone_on_ref_ptr))]
2222

2323
//! [`ArrowFormat`]: Apache Arrow file format abstractions
24+
//!
25+
//! Note: As of DataFusion 54.0.0, the `compression` feature of this crate
26+
//! is a no-op, only kept for backwards compatibility purposes, and it will
27+
//! be removed in a future release.
2428
2529
pub mod file_format;
2630
pub mod source;

datafusion/sqllogictest/test_files/array/array_union.slt

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,10 @@ select array_union(arrow_cast([], 'LargeList(Int64)'), arrow_cast([], 'LargeList
114114
[]
115115

116116
# array_union scalar function #7
117-
# re-enable when https://github.com/apache/arrow-rs/issues/9227 is fixed
118-
# query ?
119-
# select array_union([[null]], []);
120-
# ----
121-
# [[]]
117+
query ?
118+
select array_union([[null]], []);
119+
----
120+
[[NULL]]
122121

123122
query error DataFusion error: Error during planning: Failed to coerce arguments to satisfy a call to 'array_union' function:
124123
select array_union(arrow_cast([[null]], 'LargeList(List(Int64))'), arrow_cast([], 'LargeList(Int64)'));

0 commit comments

Comments
 (0)