Skip to content

Commit a551016

Browse files
committed
Revert "downgrade substrait"
This reverts commit f2b943a.
1 parent 1daebf5 commit a551016

File tree

5 files changed

+51
-119
lines changed

5 files changed

+51
-119
lines changed

Cargo.lock

Lines changed: 42 additions & 116 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

datafusion/substrait/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@ datafusion = { workspace = true, features = ["sql"] }
4141
half = { workspace = true }
4242
itertools = { workspace = true }
4343
object_store = { workspace = true }
44-
pbjson-types = { version = "0.7" }
45-
prost = { version = "0.13" }
46-
substrait = { version = "0.58", features = ["serde"] }
44+
pbjson-types = { workspace = true }
45+
prost = { workspace = true }
46+
substrait = { version = "0.62", features = ["serde"] }
4747
url = { workspace = true }
4848
tokio = { workspace = true, features = ["fs"] }
4949
uuid = { version = "1.19.0", features = ["v4"] }

datafusion/substrait/src/extensions.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ impl From<Extensions> for Vec<SimpleExtensionDeclaration> {
120120
for (f_anchor, f_name) in val.functions {
121121
let function_extension = ExtensionFunction {
122122
extension_uri_reference: u32::MAX,
123+
extension_urn_reference: u32::MAX,
123124
function_anchor: f_anchor,
124125
name: f_name,
125126
};
@@ -132,6 +133,7 @@ impl From<Extensions> for Vec<SimpleExtensionDeclaration> {
132133
for (t_anchor, t_name) in val.types {
133134
let type_extension = ExtensionType {
134135
extension_uri_reference: u32::MAX, // https://github.com/apache/datafusion/issues/11545
136+
extension_urn_reference: u32::MAX, // https://github.com/apache/datafusion/issues/11545
135137
type_anchor: t_anchor,
136138
name: t_name,
137139
};
@@ -144,6 +146,7 @@ impl From<Extensions> for Vec<SimpleExtensionDeclaration> {
144146
for (tv_anchor, tv_name) in val.type_variations {
145147
let type_variation_extension = ExtensionTypeVariation {
146148
extension_uri_reference: u32::MAX, // We don't register proper extension URIs yet
149+
extension_urn_reference: u32::MAX, // We don't register proper extension URIs yet
147150
type_variation_anchor: tv_anchor,
148151
name: tv_name,
149152
};

datafusion/substrait/src/logical_plan/producer/expr/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ pub fn to_substrait_extended_expr(
8787
advanced_extensions: None,
8888
expected_type_urls: vec![],
8989
extension_uris: vec![],
90+
extension_urns: vec![],
9091
extensions: extensions.into(),
9192
version: Some(version::version_with_producer("datafusion")),
9293
referred_expr: substrait_exprs,

datafusion/substrait/src/logical_plan/producer/plan.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,13 @@ pub fn to_substrait_plan(
4747
Ok(Box::new(Plan {
4848
version: Some(version::version_with_producer("datafusion")),
4949
extension_uris: vec![],
50+
extension_urns: vec![],
5051
extensions: extensions.into(),
5152
relations: plan_rels,
5253
advanced_extensions: None,
5354
expected_type_urls: vec![],
5455
parameter_bindings: vec![],
56+
type_aliases: vec![],
5557
}))
5658
}
5759

0 commit comments

Comments
 (0)