Skip to content

Commit 40242b4

Browse files
committed
downgrade substrait
1 parent eedca83 commit 40242b4

File tree

5 files changed

+119
-51
lines changed

5 files changed

+119
-51
lines changed

Cargo.lock

Lines changed: 116 additions & 42 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 = { workspace = true }
45-
prost = { workspace = true }
46-
substrait = { version = "0.62", features = ["serde"] }
44+
pbjson-types = { version = "0.7" }
45+
prost = { version = "0.13" }
46+
substrait = { version = "0.58", features = ["serde"] }
4747
url = { workspace = true }
4848
tokio = { workspace = true, features = ["fs"] }
4949
uuid = { version = "1.17.0", features = ["v4"] }

datafusion/substrait/src/extensions.rs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ impl From<Extensions> for Vec<SimpleExtensionDeclaration> {
121121
for (f_anchor, f_name) in val.functions {
122122
let function_extension = ExtensionFunction {
123123
extension_uri_reference: u32::MAX,
124-
extension_urn_reference: u32::MAX,
125124
function_anchor: f_anchor,
126125
name: f_name,
127126
};
@@ -134,7 +133,6 @@ impl From<Extensions> for Vec<SimpleExtensionDeclaration> {
134133
for (t_anchor, t_name) in val.types {
135134
let type_extension = ExtensionType {
136135
extension_uri_reference: u32::MAX, // https://github.com/apache/datafusion/issues/11545
137-
extension_urn_reference: u32::MAX, // https://github.com/apache/datafusion/issues/11545
138136
type_anchor: t_anchor,
139137
name: t_name,
140138
};
@@ -147,7 +145,6 @@ impl From<Extensions> for Vec<SimpleExtensionDeclaration> {
147145
for (tv_anchor, tv_name) in val.type_variations {
148146
let type_variation_extension = ExtensionTypeVariation {
149147
extension_uri_reference: u32::MAX, // We don't register proper extension URIs yet
150-
extension_urn_reference: u32::MAX, // We don't register proper extension URIs yet
151148
type_variation_anchor: tv_anchor,
152149
name: tv_name,
153150
};

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@ pub fn to_substrait_extended_expr(
8888
advanced_extensions: None,
8989
expected_type_urls: vec![],
9090
extension_uris: vec![],
91-
extension_urns: vec![],
9291
extensions: extensions.into(),
9392
version: Some(version::version_with_producer("datafusion")),
9493
referred_expr: substrait_exprs,

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,11 @@ pub fn to_substrait_plan(
4848
Ok(Box::new(Plan {
4949
version: Some(version::version_with_producer("datafusion")),
5050
extension_uris: vec![],
51-
extension_urns: vec![],
5251
extensions: extensions.into(),
5352
relations: plan_rels,
5453
advanced_extensions: None,
5554
expected_type_urls: vec![],
5655
parameter_bindings: vec![],
57-
type_aliases: vec![],
5856
}))
5957
}
6058

0 commit comments

Comments
 (0)