You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by ag...@apache.org on 2023/01/17 16:06:57 UTC
[arrow-datafusion] branch master updated: Upgrade to substrait 0.3 (#4895)
This is an automated email from the ASF dual-hosted git repository.
agrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/arrow-datafusion.git
The following commit(s) were added to refs/heads/master by this push:
new 84ba3c2d9 Upgrade to substrait 0.3 (#4895)
84ba3c2d9 is described below
commit 84ba3c2d976def021db274f2b96fd8acdab19c80
Author: Andy Grove <an...@gmail.com>
AuthorDate: Tue Jan 17 09:06:50 2023 -0700
Upgrade to substrait 0.3 (#4895)
* Upgrade to substrait 0.3
* add link to GitHub issue
---
datafusion/substrait/Cargo.toml | 6 +++---
datafusion/substrait/src/producer.rs | 4 ++++
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/datafusion/substrait/Cargo.toml b/datafusion/substrait/Cargo.toml
index 091b3a565..41c9e4d05 100644
--- a/datafusion/substrait/Cargo.toml
+++ b/datafusion/substrait/Cargo.toml
@@ -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]
diff --git a/datafusion/substrait/src/producer.rs b/datafusion/substrait/src/producer.rs
index ab32983b9..902c389d8 100644
--- a/datafusion/substrait/src/producer.rs
+++ b/datafusion/substrait/src/producer.rs
@@ -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,
@@ -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,
@@ -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)?),
@@ -447,6 +450,7 @@ pub fn make_binary_op_scalar_func(
],
output_type: None,
args: vec![],
+ options: vec![],
})),
}
}