feat: update substrait and prost version

src/client/Cargo.toml

@@ -32,12 +32,8 @@ substrait = { path = "../common/substrait" }
 tokio.workspace = true
 tracing = "0.1"
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
-
-# TODO(ruihang): upgrade to 0.11 once substrait-rs supports it.
-[dev-dependencies.prost_09]
-package = "prost"
-version = "0.9"
+prost.workspace = true
 
 [dev-dependencies.substrait_proto]
 package = "substrait"
-version = "0.2"
+version = "0.4"

src/client/examples/logical.rs

@@ -15,11 +15,11 @@
 use api::v1::{ColumnDataType, ColumnDef, CreateTableExpr, TableId};
 use client::{Client, Database};
 use common_catalog::consts::{DEFAULT_CATALOG_NAME, DEFAULT_SCHEMA_NAME};
-use prost_09::Message;
-use substrait_proto::protobuf::plan_rel::RelType as PlanRelType;
-use substrait_proto::protobuf::read_rel::{NamedTable, ReadType};
-use substrait_proto::protobuf::rel::RelType;
-use substrait_proto::protobuf::{PlanRel, ReadRel, Rel};
+use prost::Message;
+use substrait_proto::proto::plan_rel::RelType as PlanRelType;
+use substrait_proto::proto::read_rel::{NamedTable, ReadType};
+use substrait_proto::proto::rel::RelType;
+use substrait_proto::proto::{PlanRel, ReadRel, Rel};
 use tracing::{event, Level};
 
 fn main() {
@@ -89,12 +89,8 @@ fn mock_logical_plan() -> Vec<u8> {
     let read_type = ReadType::NamedTable(named_table);
 
     let read_rel = ReadRel {
-        common: None,
-        base_schema: None,
-        filter: None,
-        projection: None,
-        advanced_extension: None,
         read_type: Some(read_type),
+        ..Default::default()
     };
 
     let mut buf = vec![];

src/common/substrait/Cargo.toml

@@ -14,13 +14,13 @@ datafusion.workspace = true
 datafusion-expr.workspace = true
 datatypes = { path = "../../datatypes" }
 futures = "0.3"
-prost = "0.9"
+prost.workspace = true
 snafu.workspace = true
 table = { path = "../../table" }
 
 [dependencies.substrait_proto]
 package = "substrait"
-version = "0.2"
+version = "0.4"
 
 [dev-dependencies]
 datatypes = { path = "../../datatypes" }

src/common/substrait/src/context.rs

@@ -15,10 +15,10 @@
 use std::collections::HashMap;
 
 use datafusion::common::DFSchemaRef;
-use substrait_proto::protobuf::extensions::simple_extension_declaration::{
+use substrait_proto::proto::extensions::simple_extension_declaration::{
     ExtensionFunction, MappingType,
 };
-use substrait_proto::protobuf::extensions::SimpleExtensionDeclaration;
+use substrait_proto::proto::extensions::SimpleExtensionDeclaration;
 
 #[derive(Default)]
 pub struct ConvertorContext {

src/common/substrait/src/df_expr.rs

@@ -20,15 +20,15 @@ use datafusion_expr::expr::Sort;
 use datafusion_expr::{expr_fn, lit, Between, BinaryExpr, BuiltinScalarFunction, Expr, Operator};
 use datatypes::schema::Schema;
 use snafu::{ensure, OptionExt};
-use substrait_proto::protobuf::expression::field_reference::ReferenceType as FieldReferenceType;
-use substrait_proto::protobuf::expression::reference_segment::{
+use substrait_proto::proto::expression::field_reference::ReferenceType as FieldReferenceType;
+use substrait_proto::proto::expression::reference_segment::{
     ReferenceType as SegReferenceType, StructField,
 };
-use substrait_proto::protobuf::expression::{
+use substrait_proto::proto::expression::{
     FieldReference, Literal, ReferenceSegment, RexType, ScalarFunction,
 };
-use substrait_proto::protobuf::function_argument::ArgType;
-use substrait_proto::protobuf::Expression;
+use substrait_proto::proto::function_argument::ArgType;
+use substrait_proto::proto::Expression;
 
 use crate::context::ConvertorContext;
 use crate::error::{
@@ -61,6 +61,7 @@ pub(crate) fn to_df_expr(
         | RexType::MultiOrList(_)
         | RexType::Cast(_)
         | RexType::Subquery(_)
+        | RexType::Nested(_)
         | RexType::Enum(_) => UnsupportedExprSnafu {
             name: format!("substrait expression {expr_rex_type:?}"),
         }
@@ -615,9 +616,9 @@ pub fn convert_column(column: &Column, schema: &Schema) -> Result<FieldReference
 /// Some utils special for this `DataFusion::Expr` and `Substrait::Expression` conversion.
 mod utils {
     use datafusion_expr::{BuiltinScalarFunction, Operator};
-    use substrait_proto::protobuf::expression::{RexType, ScalarFunction};
-    use substrait_proto::protobuf::function_argument::ArgType;
-    use substrait_proto::protobuf::{Expression, FunctionArgument};
+    use substrait_proto::proto::expression::{RexType, ScalarFunction};
+    use substrait_proto::proto::function_argument::ArgType;
+    use substrait_proto::proto::{Expression, FunctionArgument};
 
     pub(crate) fn name_df_operator(op: &Operator) -> &str {
         match op {

src/common/substrait/src/df_logical.rs

@@ -25,13 +25,13 @@ use datafusion::physical_plan::project_schema;
 use datafusion_expr::{Filter, LogicalPlan, TableScan, TableSource};
 use prost::Message;
 use snafu::{ensure, OptionExt, ResultExt};
-use substrait_proto::protobuf::expression::mask_expression::{StructItem, StructSelect};
-use substrait_proto::protobuf::expression::MaskExpression;
-use substrait_proto::protobuf::extensions::simple_extension_declaration::MappingType;
-use substrait_proto::protobuf::plan_rel::RelType as PlanRelType;
-use substrait_proto::protobuf::read_rel::{NamedTable, ReadType};
-use substrait_proto::protobuf::rel::RelType;
-use substrait_proto::protobuf::{FilterRel, Plan, PlanRel, ReadRel, Rel};
+use substrait_proto::proto::expression::mask_expression::{StructItem, StructSelect};
+use substrait_proto::proto::expression::MaskExpression;
+use substrait_proto::proto::extensions::simple_extension_declaration::MappingType;
+use substrait_proto::proto::plan_rel::RelType as PlanRelType;
+use substrait_proto::proto::read_rel::{NamedTable, ReadType};
+use substrait_proto::proto::rel::RelType;
+use substrait_proto::proto::{FilterRel, Plan, PlanRel, ReadRel, Rel};
 use table::table::adapter::DfTableProviderAdapter;
 
 use crate::context::ConvertorContext;
@@ -424,6 +424,7 @@ impl DFLogicalSubstraitConvertor {
             relations: vec![plan_rel],
             advanced_extensions: None,
             expected_type_urls: vec![],
+            ..Default::default()
         })
     }
 
@@ -485,6 +486,7 @@ impl DFLogicalSubstraitConvertor {
             projection,
             advanced_extension: None,
             read_type: Some(read_type),
+            ..Default::default()
         };
 
         Ok(read_rel)

src/common/substrait/src/schema.rs

@@ -13,8 +13,8 @@
 // limitations under the License.
 
 use datatypes::schema::{ColumnSchema, Schema};
-use substrait_proto::protobuf::r#type::{Nullability, Struct as SubstraitStruct};
-use substrait_proto::protobuf::NamedStruct;
+use substrait_proto::proto::r#type::{Nullability, Struct as SubstraitStruct};
+use substrait_proto::proto::NamedStruct;
 
 use crate::error::Result;
 use crate::types::{from_concrete_type, to_concrete_type};

src/common/substrait/src/types.rs

@@ -20,9 +20,9 @@
 
 use datafusion::scalar::ScalarValue;
 use datatypes::prelude::ConcreteDataType;
-use substrait_proto::protobuf::expression::literal::LiteralType;
-use substrait_proto::protobuf::r#type::{self as s_type, Kind, Nullability};
-use substrait_proto::protobuf::{Type as SType, Type};
+use substrait_proto::proto::expression::literal::LiteralType;
+use substrait_proto::proto::r#type::{self as s_type, Kind, Nullability};
+use substrait_proto::proto::{Type as SType, Type};
 
 use crate::error::{self, Result, UnsupportedConcreteTypeSnafu, UnsupportedSubstraitTypeSnafu};
 
@@ -86,6 +86,7 @@ pub fn to_concrete_type(ty: &SType) -> Result<(ConcreteDataType, bool)> {
         | Kind::Struct(_)
         | Kind::List(_)
         | Kind::Map(_)
+        | Kind::UserDefined(_)
         | Kind::UserDefinedTypeReference(_) => UnsupportedSubstraitTypeSnafu {
             ty: format!("{kind:?}"),
         }