Skip to content

Upgrade to substrait 0.3 #4895

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

Merged
andygrove merged 3 commits into from
Jan 17, 2023
Merged

Upgrade to substrait 0.3 #4895

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4684dad
Upgrade to substrait 0.3
andygrove Jan 13, 2023
1163705
Merge remote-tracking branch 'apache/master' into substrait-0.3
andygrove Jan 17, 2023
b1344ed
add link to GitHub issue
andygrove Jan 17, 2023
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
6 changes: 3 additions & 3 deletions datafusion/substrait/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ rust-version = "1.62"
[dependencies]
async-recursion = "1.0"
datafusion = { version = "16.0.0", path = "../core" }
prost = "0.9"
prost-types = "0.9"
substrait = "0.2"
prost = "0.11"
prost-types = "0.11"
substrait = "0.3"
tokio = "1.17"

[build-dependencies]
Expand Down
4 changes: 4 additions & 0 deletions datafusion/substrait/src/producer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ pub fn to_substrait_plan(plan: &LogicalPlan) -> Result<Box<Plan>> {

// Return parsed plan
Ok(Box::new(Plan {
version: None, // TODO: https://github.com/apache/arrow-datafusion/issues/4949
extension_uris: vec![],
extensions: function_extensions,
relations: plan_rels,
Expand Down Expand Up @@ -115,6 +116,7 @@ pub fn to_substrait_rel(
r#struct: None,
}),
filter: None,
best_effort_filter: None,
projection: Some(MaskExpression {
select: Some(StructSelect { struct_items }),
maintain_singular_struct: false,
Expand Down Expand Up @@ -367,6 +369,7 @@ pub fn to_substrait_agg_measure(
},
phase: substrait::protobuf::AggregationPhase::Unspecified as i32,
args: vec![],
options: vec![],
}),
filter: match filter {
Some(f) => Some(to_substrait_rex(f, schema, extension_info)?),
Expand Down Expand Up @@ -447,6 +450,7 @@ pub fn make_binary_op_scalar_func(
],
output_type: None,
args: vec![],
options: vec![],
})),
}
}
Expand Down