Skip to content

Commit d9802f7

Browse files
committed
upgrade prost
1 parent 4cc47d3 commit d9802f7

6 files changed

Lines changed: 114 additions & 44 deletions

File tree

Cargo.lock

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

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,11 @@ parquet = { version = "56.1.0", default-features = false, features = [
164164
"object_store",
165165
"encryption",
166166
] }
167-
pbjson = { version = "0.7.0" }
168-
pbjson-types = "0.7"
167+
pbjson = { version = "0.8.0" }
168+
pbjson-types = "0.8.0"
169169
# Should match arrow-flight's version of prost.
170170
insta = { version = "1.43.2", features = ["glob", "filters"] }
171-
prost = "0.13.1"
171+
prost = "0.14.1"
172172
rand = "0.9"
173173
recursive = "0.1.1"
174174
regex = "1.11"

datafusion/substrait/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ itertools = { workspace = true }
3939
object_store = { workspace = true }
4040
pbjson-types = { workspace = true }
4141
prost = { workspace = true }
42-
substrait = { version = "0.58", features = ["serde"] }
42+
substrait = { version = "0.62", features = ["serde"] }
4343
url = { workspace = true }
4444
tokio = { workspace = true, features = ["fs"] }
4545

datafusion/substrait/src/extensions.rs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ impl From<Extensions> for Vec<SimpleExtensionDeclaration> {
118118
for (f_anchor, f_name) in val.functions {
119119
let function_extension = ExtensionFunction {
120120
extension_uri_reference: u32::MAX,
121+
extension_urn_reference: u32::MAX,
121122
function_anchor: f_anchor,
122123
name: f_name,
123124
};
@@ -129,7 +130,8 @@ impl From<Extensions> for Vec<SimpleExtensionDeclaration> {
129130

130131
for (t_anchor, t_name) in val.types {
131132
let type_extension = ExtensionType {
132-
extension_uri_reference: u32::MAX, // https://github.com/apache/datafusion/issues/11545
133+
extension_uri_reference: u32::MAX,
134+
extension_urn_reference: u32::MAX, // https://github.com/apache/datafusion/issues/11545
133135
type_anchor: t_anchor,
134136
name: t_name,
135137
};
@@ -141,7 +143,8 @@ impl From<Extensions> for Vec<SimpleExtensionDeclaration> {
141143

142144
for (tv_anchor, tv_name) in val.type_variations {
143145
let type_variation_extension = ExtensionTypeVariation {
144-
extension_uri_reference: u32::MAX, // We don't register proper extension URIs yet
146+
extension_uri_reference: u32::MAX,
147+
extension_urn_reference: u32::MAX, // We don't register proper extension URIs yet
145148
type_variation_anchor: tv_anchor,
146149
name: tv_name,
147150
};

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ pub fn to_substrait_extended_expr(
8585
advanced_extensions: None,
8686
expected_type_urls: vec![],
8787
extension_uris: vec![],
88+
extension_urns: vec![],
8889
extensions: extensions.into(),
8990
version: Some(version::version_with_producer("datafusion")),
9091
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
@@ -45,11 +45,13 @@ pub fn to_substrait_plan(
4545
Ok(Box::new(Plan {
4646
version: Some(version::version_with_producer("datafusion")),
4747
extension_uris: vec![],
48+
extension_urns: vec![],
4849
extensions: extensions.into(),
4950
relations: plan_rels,
5051
advanced_extensions: None,
5152
expected_type_urls: vec![],
5253
parameter_bindings: vec![],
54+
type_aliases: vec![],
5355
}))
5456
}
5557

0 commit comments

Comments
 (0)