Skip to content
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

Jump to bottom

feat: Upgrade to DataFusion 40.0.0-rc1 #644

Merged
merged 14 commits into from
Jul 9, 2024
Merged

feat: Upgrade to DataFusion 40.0.0-rc1 #644

Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
ce7f760
Partial upgrade to DataFusion 40.0.0
andygrove Jul 8, 2024
51fe63a
fix
andygrove Jul 8, 2024
7e947f7
implement more udaf
andygrove Jul 8, 2024
921f64e
update bitwise agg
andygrove Jul 8, 2024
8b4cf3a
add func names
andygrove Jul 8, 2024
4596f86
upmerge
andygrove Jul 8, 2024
04cfe12
remove unused imports
andygrove Jul 8, 2024
a340445
remove arrow-string dep
andygrove Jul 8, 2024
ad31c79
fix copy and paste error
andygrove Jul 8, 2024
1d8e5ef
use 40.0.0-rc1 and temporarily ignore failing test
andygrove Jul 9, 2024
f47257a
clippy
andygrove Jul 9, 2024
40f00aa
fall back to Spark for count windows aggregate
andygrove Jul 9, 2024
fcf4625
Merge remote-tracking branch 'apache/main' into update-df-40
andygrove Jul 9, 2024
b6923c5
address feedback
andygrove Jul 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
128 changes: 72 additions & 56 deletions native/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 12 additions & 12 deletions native/core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ include = [
]

[dependencies]
arrow = { git = "https://github.com/apache/arrow-rs.git", rev = "0a4d8a1", features = ["prettyprint", "ffi", "chrono-tz"] }
arrow-array = { git = "https://github.com/apache/arrow-rs.git", rev = "0a4d8a1" }
arrow-buffer = { git = "https://github.com/apache/arrow-rs.git", rev = "0a4d8a1" }
arrow-data = { git = "https://github.com/apache/arrow-rs.git", rev = "0a4d8a1" }
arrow-schema = { git = "https://github.com/apache/arrow-rs.git", rev = "0a4d8a1" }
parquet = { git = "https://github.com/apache/arrow-rs.git", rev = "0a4d8a1", default-features = false, features = ["experimental"] }
arrow = { version = "52.1.0", features = ["prettyprint", "ffi", "chrono-tz"] }
arrow-array = { version = "52.1.0" }
arrow-buffer = { version = "52.1.0" }
arrow-data = { version = "52.1.0" }
arrow-schema = { version = "52.1.0" }
parquet = { version = "52.1.0", default-features = false, features = ["experimental"] }
half = { version = "2.4.1", default-features = false }
futures = "0.3.28"
mimalloc = { version = "*", default-features = false, optional = true }
Expand All @@ -64,12 +64,12 @@ itertools = "0.11.0"
chrono = { version = "0.4", default-features = false, features = ["clock"] }
chrono-tz = { version = "0.8" }
paste = "1.0.14"
datafusion-common = { git = "https://github.com/viirya/arrow-datafusion.git", rev = "17446b1" }
datafusion = { default-features = false, git = "https://github.com/viirya/arrow-datafusion.git", rev = "17446b1", features = ["unicode_expressions", "crypto_expressions"] }
datafusion-functions = { git = "https://github.com/viirya/arrow-datafusion.git", rev = "17446b1", features = ["crypto_expressions"] }
datafusion-expr = { git = "https://github.com/viirya/arrow-datafusion.git", rev = "17446b1", default-features = false }
datafusion-physical-expr-common = { git = "https://github.com/viirya/arrow-datafusion.git", rev = "17446b1", default-features = false }
datafusion-physical-expr = { git = "https://github.com/viirya/arrow-datafusion.git", rev = "17446b1", default-features = false }
datafusion-common = { git = "https://github.com/apache/datafusion.git", rev = "40.0.0-rc1" }
datafusion = { default-features = false, git = "https://github.com/apache/datafusion.git", rev = "40.0.0-rc1", features = ["unicode_expressions", "crypto_expressions"] }
datafusion-functions = { git = "https://github.com/apache/datafusion.git", rev = "40.0.0-rc1", features = ["crypto_expressions"] }
datafusion-expr = { git = "https://github.com/apache/datafusion.git", rev = "40.0.0-rc1", default-features = false }
datafusion-physical-expr-common = { git = "https://github.com/apache/datafusion.git", rev = "40.0.0-rc1", default-features = false }
datafusion-physical-expr = { git = "https://github.com/apache/datafusion.git", rev = "40.0.0-rc1", default-features = false }
unicode-segmentation = "^1.10.1"
once_cell = "1.18.0"
regex = "1.9.6"
Expand Down
2 changes: 1 addition & 1 deletion native/core/src/execution/datafusion/expressions/abs.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ impl CometAbsFunc {
pub fn new(eval_mode: EvalMode, data_type_name: String) -> Result<Self, ExecutionError> {
if let EvalMode::Legacy | EvalMode::Ansi = eval_mode {
Ok(Self {
inner_abs_func: math::abs().inner(),
inner_abs_func: math::abs().inner().clone(),
eval_mode,
data_type_name,
})
Expand Down
2 changes: 1 addition & 1 deletion native/core/src/execution/datafusion/expressions/avg.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ pub struct Avg {
impl Avg {
/// Create a new AVG aggregate function
pub fn new(expr: Arc<dyn PhysicalExpr>, name: impl Into<String>, data_type: DataType) -> Self {
let result_data_type = avg_return_type(&data_type).unwrap();
let result_data_type = avg_return_type("avg", &data_type).unwrap();

Self {
name: name.into(),
Expand Down
Loading
Loading