This is an automated email from the ASF dual-hosted git repository.
jonah pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/datafusion.git
The following commit(s) were added to refs/heads/main by this push:
new dcd4568fcd chore(deps): bump substrait from 0.53.2 to 0.54.0 (#15043)
dcd4568fcd is described below
commit dcd4568fcdb715bd524eff5f9875f784c7247ef7
Author: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
AuthorDate: Wed Mar 12 23:11:23 2025 +0800
chore(deps): bump substrait from 0.53.2 to 0.54.0 (#15043)
* chore(deps): bump substrait from 0.53.2 to 0.54.0
Bumps [substrait](https://github.com/substrait-io/substrait-rs) from 0.53.2
to 0.54.0.
- [Release notes](https://github.com/substrait-io/substrait-rs/releases)
-
[Changelog](https://github.com/substrait-io/substrait-rs/blob/main/CHANGELOG.md)
-
[Commits](https://github.com/substrait-io/substrait-rs/compare/v0.53.2...v0.54.0)
---
updated-dependencies:
- dependency-name: substrait
dependency-type: direct:production
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <[email protected]>
* Fix build
---------
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot]
<49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: jonahgao <[email protected]>
---
Cargo.lock | 4 ++--
datafusion/substrait/Cargo.toml | 2 +-
datafusion/substrait/src/logical_plan/consumer.rs | 20 ++++++++++++++++----
datafusion/substrait/src/logical_plan/producer.rs | 1 +
datafusion/substrait/tests/utils.rs | 1 +
5 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 4a838b670a..68afca862d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5982,9 +5982,9 @@ dependencies = [
[[package]]
name = "substrait"
-version = "0.53.2"
+version = "0.54.0"
source = "registry+https://github.com/rust-lang/crates.io-index";
-checksum = "6fac3d70185423235f37b889764e184b81a5af4bb7c95833396ee9bd92577e1b"
+checksum = "93890ad613de815a5b76e38bc4a934b4012ebe197717c9dd6a17f7af8cf33dae"
dependencies = [
"heck 0.5.0",
"pbjson",
diff --git a/datafusion/substrait/Cargo.toml b/datafusion/substrait/Cargo.toml
index 3e3ea7843a..dbb7fd65c1 100644
--- a/datafusion/substrait/Cargo.toml
+++ b/datafusion/substrait/Cargo.toml
@@ -39,7 +39,7 @@ itertools = { workspace = true }
object_store = { workspace = true }
pbjson-types = { workspace = true }
prost = { workspace = true }
-substrait = { version = "0.53", features = ["serde"] }
+substrait = { version = "0.54", features = ["serde"] }
url = { workspace = true }
tokio = { workspace = true, features = ["fs"] }
diff --git a/datafusion/substrait/src/logical_plan/consumer.rs
b/datafusion/substrait/src/logical_plan/consumer.rs
index 7c6c45f44d..60e71ca39d 100644
--- a/datafusion/substrait/src/logical_plan/consumer.rs
+++ b/datafusion/substrait/src/logical_plan/consumer.rs
@@ -104,10 +104,11 @@ use substrait::proto::{
rel::RelType,
rel_common,
sort_field::{SortDirection, SortKind::*},
- AggregateFunction, AggregateRel, ConsistentPartitionWindowRel, CrossRel,
ExchangeRel,
- Expression, ExtendedExpression, ExtensionLeafRel, ExtensionMultiRel,
- ExtensionSingleRel, FetchRel, FilterRel, FunctionArgument, JoinRel,
NamedStruct,
- Plan, ProjectRel, ReadRel, Rel, RelCommon, SetRel, SortField, SortRel,
Type,
+ AggregateFunction, AggregateRel, ConsistentPartitionWindowRel, CrossRel,
+ DynamicParameter, ExchangeRel, Expression, ExtendedExpression,
ExtensionLeafRel,
+ ExtensionMultiRel, ExtensionSingleRel, FetchRel, FilterRel,
FunctionArgument,
+ JoinRel, NamedStruct, Plan, ProjectRel, ReadRel, Rel, RelCommon, SetRel,
SortField,
+ SortRel, Type,
};
#[async_trait]
@@ -392,6 +393,14 @@ pub trait SubstraitConsumer: Send + Sync + Sized {
not_impl_err!("Enum expression not supported")
}
+ async fn consume_dynamic_parameter(
+ &self,
+ _expr: &DynamicParameter,
+ _input_schema: &DFSchema,
+ ) -> Result<Expr> {
+ not_impl_err!("Dynamic Parameter expression not supported")
+ }
+
// User-Defined Functionality
// The details of extension relations, and how to handle them, are fully
up to users to specify.
@@ -1999,6 +2008,9 @@ pub async fn from_substrait_rex(
}
RexType::Nested(expr) => consumer.consume_nested(expr,
input_schema).await,
RexType::Enum(expr) => consumer.consume_enum(expr,
input_schema).await,
+ RexType::DynamicParameter(expr) => {
+ consumer.consume_dynamic_parameter(expr, input_schema).await
+ }
},
None => substrait_err!("Expression must set rex_type: {:?}",
expression),
}
diff --git a/datafusion/substrait/src/logical_plan/producer.rs
b/datafusion/substrait/src/logical_plan/producer.rs
index 3021d4e38f..44baf27778 100644
--- a/datafusion/substrait/src/logical_plan/producer.rs
+++ b/datafusion/substrait/src/logical_plan/producer.rs
@@ -449,6 +449,7 @@ pub fn to_substrait_plan(plan: &LogicalPlan, state:
&SessionState) -> Result<Box
relations: plan_rels,
advanced_extensions: None,
expected_type_urls: vec![],
+ parameter_bindings: vec![],
}))
}
diff --git a/datafusion/substrait/tests/utils.rs
b/datafusion/substrait/tests/utils.rs
index 0034cc27bf..e3e3ec3fab 100644
--- a/datafusion/substrait/tests/utils.rs
+++ b/datafusion/substrait/tests/utils.rs
@@ -480,6 +480,7 @@ pub mod test {
}
}
}
+ RexType::DynamicParameter(_) => {}
// Enum is deprecated
RexType::Enum(_) => {}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
