Merge branch 'branch-51-test' into lia/IN-LIST-cherry-picks-on-top-of-v51

Author: LiaCastaneda

Cargo.lock

@@ -45,7 +45,7 @@ json = ["serde", "pbjson"]
 arrow = { workspace = true }
 datafusion-common = { workspace = true }
 pbjson = { workspace = true, optional = true }
-prost = { workspace = true }
+prost = { version = "0.13" }
 serde = { version = "1.0", optional = true }
 
 [dev-dependencies]

datafusion/proto-common/Cargo.toml

@@ -68,7 +68,7 @@ datafusion-physical-plan = { workspace = true }
 datafusion-proto-common = { workspace = true }
 object_store = { workspace = true }
 pbjson = { workspace = true, optional = true }
-prost = { workspace = true }
+prost = { version = "0.13" }
 serde = { version = "1.0", optional = true }
 serde_json = { workspace = true, optional = true }
 

datafusion/proto/Cargo.toml

@@ -41,9 +41,9 @@ datafusion = { workspace = true, features = ["sql"] }
 half = { workspace = true }
 itertools = { workspace = true }
 object_store = { workspace = true }
-pbjson-types = { workspace = true }
-prost = { workspace = true }
-substrait = { version = "0.62", features = ["serde"] }
+pbjson-types = { version = "0.7" }
+prost = { version = "0.13" }
+substrait = { version = "0.58", features = ["serde"] }
 url = { workspace = true }
 tokio = { workspace = true, features = ["fs"] }
 uuid = { version = "1.17.0", features = ["v4"] }

datafusion/substrait/Cargo.toml

@@ -121,7 +121,6 @@ impl From<Extensions> for Vec<SimpleExtensionDeclaration> {
         for (f_anchor, f_name) in val.functions {
             let function_extension = ExtensionFunction {
                 extension_uri_reference: u32::MAX,
-                extension_urn_reference: u32::MAX,
                 function_anchor: f_anchor,
                 name: f_name,
             };
@@ -134,7 +133,6 @@ impl From<Extensions> for Vec<SimpleExtensionDeclaration> {
         for (t_anchor, t_name) in val.types {
             let type_extension = ExtensionType {
                 extension_uri_reference: u32::MAX, // https://github.com/apache/datafusion/issues/11545
-                extension_urn_reference: u32::MAX, // https://github.com/apache/datafusion/issues/11545
                 type_anchor: t_anchor,
                 name: t_name,
             };
@@ -147,7 +145,6 @@ impl From<Extensions> for Vec<SimpleExtensionDeclaration> {
         for (tv_anchor, tv_name) in val.type_variations {
             let type_variation_extension = ExtensionTypeVariation {
                 extension_uri_reference: u32::MAX, // We don't register proper extension URIs yet
-                extension_urn_reference: u32::MAX, // We don't register proper extension URIs yet
                 type_variation_anchor: tv_anchor,
                 name: tv_name,
             };