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.

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

Datafusion 46 support #2417

Merged
merged 34 commits into from
Mar 9, 2025
Merged
Show file tree
Hide file tree
Changes from 10 commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
2609f78
.
AdamGS Feb 13, 2025
c2c05d7
Merge branch 'develop' into adamg/datafusion-46-branch
AdamGS Feb 17, 2025
1399e1d
bench: enable divan codspeed compatibility layer (#2351)
0ax1 Feb 13, 2025
3f34ecf
Merge branch 'develop' into adamg/datafusion-46-branch
AdamGS Feb 18, 2025
e9df5e7
.
AdamGS Feb 18, 2025
bfa2790
.
AdamGS Feb 18, 2025
ab669fd
.
AdamGS Feb 18, 2025
e3632ed
some work
AdamGS Feb 18, 2025
8192981
this works?
AdamGS Feb 19, 2025
9820224
.
AdamGS Feb 19, 2025
22079d3
thing
AdamGS Feb 19, 2025
b68d85d
datafusion bumped some dependenceis, and it seems like we should too
AdamGS Feb 19, 2025
2b1bd31
demuxed write
AdamGS Feb 19, 2025
58a7437
.
AdamGS Feb 19, 2025
f0a30c6
Merge branch 'develop' into adamg/datafusion-46-branch
AdamGS Feb 19, 2025
487656d
.
AdamGS Feb 19, 2025
bf1dcc9
cleanup debug
AdamGS Feb 19, 2025
d0f8fb3
Merge branch 'develop' into adamg/datafusion-46-branch
AdamGS Feb 19, 2025
dd97f33
Merge branch 'develop' into adamg/datafusion-46-branch
AdamGS Feb 20, 2025
9e89b2b
Merge branch 'develop' into adamg/datafusion-46-branch
AdamGS Feb 20, 2025
cd42186
metrics conflict
AdamGS Feb 20, 2025
57aedeb
.
AdamGS Feb 21, 2025
cc428c3
.
AdamGS Feb 21, 2025
17ed2a9
Merge branch 'develop' into adamg/datafusion-46-branch
AdamGS Feb 21, 2025
e286234
.
AdamGS Feb 25, 2025
34c925e
.
AdamGS Mar 3, 2025
9b31848
Merge branch 'develop' into adamg/datafusion-46-branch
AdamGS Mar 3, 2025
3fd5043
rename
AdamGS Mar 3, 2025
34e1de1
.
AdamGS Mar 3, 2025
9e130b2
bump minimal uuid version
AdamGS Mar 3, 2025
9824a2b
Merge branch 'develop' into adamg/datafusion-46-branch
AdamGS Mar 5, 2025
3e2c75a
Merge branch 'develop' into adamg/datafusion-46-branch
AdamGS Mar 9, 2025
b41770d
.
AdamGS Mar 9, 2025
aab23a3
.
AdamGS Mar 9, 2025
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
206 changes: 130 additions & 76 deletions Cargo.lock

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,12 @@ criterion = { package = "codspeed-criterion-compat", features = [
"html_reports",
], version = "2.7.2" }
crossterm = "0.28"
datafusion = { version = "45", default-features = false }
datafusion-common = "45"
datafusion-execution = "45"
datafusion-expr = "45"
datafusion-physical-expr = "45"
datafusion-physical-plan = "45"
datafusion = { version = "45", default-features = false, git = "https://github.com/apache/datafusion.git", rev = "refs/pull/14754/head" }
datafusion-common = {version = "45", git = "https://github.com/apache/datafusion.git", rev = "refs/pull/14754/head" }
datafusion-execution = {version = "45", git = "https://github.com/apache/datafusion.git", rev = "refs/pull/14754/head" }
datafusion-expr = {version = "45", git = "https://github.com/apache/datafusion.git", rev = "refs/pull/14754/head" }
datafusion-physical-expr = {version = "45", git = "https://github.com/apache/datafusion.git", rev = "refs/pull/14754/head" }
datafusion-physical-plan = {version = "45", git = "https://github.com/apache/datafusion.git", rev = "refs/pull/14754/head" }
divan = { package = "codspeed-divan-compat", version = "2.8.0" }
dyn-hash = "0.2.0"
enum-iterator = "2.0.0"
Expand Down
1 change: 0 additions & 1 deletion vortex-datafusion/src/lib.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
//! Connectors to enable DataFusion to read Vortex data.
#![deny(missing_docs)]
#![allow(clippy::nonminimal_bool)]
#![allow(clippy::cast_possible_truncation)]

use std::sync::Arc;
Expand Down
3 changes: 2 additions & 1 deletion vortex-datafusion/src/memory/provider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ mod test {
use arrow_schema::{DataType, Field, Schema};
use datafusion::functions_aggregate::count::count_distinct;
use datafusion::prelude::SessionContext;
use datafusion_common::{Column, TableReference};
use datafusion_common::{Column, Spans, TableReference};
use datafusion_expr::{and, col, lit, BinaryExpr, Expr, Operator};
use vortex_array::array::{PrimitiveArray, StructArray, VarBinViewArray};
use vortex_array::{Array, IntoArray};
Expand Down Expand Up @@ -244,6 +244,7 @@ mod test {
table: "orders".into(),
}),
name: "o_orderstatus".to_string(),
spans: Spans::new(),
}
.into(),
),
Expand Down
1 change: 1 addition & 0 deletions vortex-datafusion/src/persistent/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ pub struct ConfigProjection {
pub arrow_schema: SchemaRef,
pub constraints: Constraints,
pub statistics: Statistics,
#[allow(dead_code)]
pub orderings: Vec<LexOrdering>,
pub projection_expr: Arc<dyn VortexExpr>,
}
Expand Down
257 changes: 0 additions & 257 deletions vortex-datafusion/src/persistent/execution.rs

This file was deleted.

Loading
Loading