Skip to content

Update substrait requirement from 0.16.0 to 0.17.0 #7808

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
merged 2 commits into from
Oct 13, 2023
Merged

Update substrait requirement from 0.16.0 to 0.17.0 #7808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b26bb8
Update substrait requirement from 0.16.0 to 0.17.0
dependabot[bot] Oct 12, 2023
3f17970
Update prost dependencies, and new clippy
alamb Oct 13, 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 @@ -33,9 +33,9 @@ chrono = { workspace = true }
datafusion = { version = "32.0.0", path = "../core" }
itertools = "0.11"
object_store = "0.7.0"
prost = "0.11"
prost-types = "0.11"
substrait = "0.16.0"
prost = "0.12"
prost-types = "0.12"
substrait = "0.17.0"
tokio = "1.17"

[features]
Expand Down
10 changes: 5 additions & 5 deletions datafusion/substrait/src/logical_plan/consumer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,8 +461,8 @@ pub async fn from_substrait_rel(
}
_ => not_impl_err!("Only NamedTable reads are supported"),
},
Some(RelType::Set(set)) => match set_rel::SetOp::from_i32(set.op) {
Some(set_op) => match set_op {
Some(RelType::Set(set)) => match set_rel::SetOp::try_from(set.op) {
Ok(set_op) => match set_op {
set_rel::SetOp::UnionAll => {
if !set.inputs.is_empty() {
let mut union_builder = Ok(LogicalPlanBuilder::from(
Expand All @@ -479,7 +479,7 @@ pub async fn from_substrait_rel(
}
_ => not_impl_err!("Unsupported set operator: {set_op:?}"),
},
None => not_impl_err!("Invalid set operation type None"),
Err(e) => not_impl_err!("Invalid set operation type {}: {e}", set.op),
},
Some(RelType::ExtensionLeaf(extension)) => {
let Some(ext_detail) = &extension.detail else {
Expand Down Expand Up @@ -535,7 +535,7 @@ pub async fn from_substrait_rel(
}

fn from_substrait_jointype(join_type: i32) -> Result<JoinType> {
if let Some(substrait_join_type) = join_rel::JoinType::from_i32(join_type) {
if let Ok(substrait_join_type) = join_rel::JoinType::try_from(join_type) {
match substrait_join_type {
join_rel::JoinType::Inner => Ok(JoinType::Inner),
join_rel::JoinType::Left => Ok(JoinType::Left),
Expand Down Expand Up @@ -563,7 +563,7 @@ pub async fn from_substrait_sorts(
let asc_nullfirst = match &s.sort_kind {
Some(k) => match k {
Direction(d) => {
let Some(direction) = SortDirection::from_i32(*d) else {
let Ok(direction) = SortDirection::try_from(*d) else {
return not_impl_err!(
"Unsupported Substrait SortDirection value {d}"
);
Expand Down