chore: codefmt

Author: KKould

src/meta/app/src/principal/user_defined_function.rs

@@ -53,7 +53,9 @@ pub struct UDFScript {
 
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct UDTF {
+    // arg name with data type
     pub arg_types: Vec<(String, DataType)>,
+    // return column name with data type
     pub return_types: Vec<(String, DataType)>,
     pub sql: String,
 }

src/meta/proto-conv/src/udf_from_to_protobuf_impl.rs

@@ -289,22 +289,20 @@ impl FromToProto for mt::UDTF {
 
         let mut arg_types = Vec::new();
         for arg_ty in p.arg_types {
-            let ty = (&TableDataType::from_pb(arg_ty.r#type.ok_or_else(|| {
+            let ty = TableDataType::from_pb(arg_ty.ty.ok_or_else(|| {
                 Incompatible::new("UDTF.arg_types.ty can not be None".to_string())
-            })?)?)
-                .into();
+            })?)?;
 
-            arg_types.push((arg_ty.name, ty));
+            arg_types.push((arg_ty.name, (&ty).into()));
         }
 
         let mut return_types = Vec::new();
         for return_ty in p.return_types {
-            let ty = (&TableDataType::from_pb(return_ty.r#type.ok_or_else(|| {
+            let ty = TableDataType::from_pb(return_ty.ty.ok_or_else(|| {
                 Incompatible::new("UDTF.arg_types.ty can not be None".to_string())
-            })?)?)
-                .into();
+            })?)?;
 
-            return_types.push((return_ty.name, ty));
+            return_types.push((return_ty.name, (&ty).into()));
         }
 
         Ok(Self {
@@ -327,7 +325,7 @@ impl FromToProto for mt::UDTF {
                 .to_pb()?;
             arg_types.push(UdtfArg {
                 name: arg_name.clone(),
-                r#type: Some(arg_type),
+                ty: Some(arg_type),
             });
         }
 
@@ -343,7 +341,7 @@ impl FromToProto for mt::UDTF {
                 .to_pb()?;
             return_types.push(UdtfArg {
                 name: return_name.clone(),
-                r#type: Some(return_type),
+                ty: Some(return_type),
             });
         }
 

src/meta/proto-conv/tests/it/v142_udtf.rs

@@ -14,6 +14,7 @@
 
 use chrono::DateTime;
 use chrono::Utc;
+use databend_common_expression::types::DataType;
 use databend_common_meta_app::principal::UDFDefinition;
 use databend_common_meta_app::principal::UserDefinedFunction;
 use databend_common_meta_app::principal::UDTF;
@@ -35,18 +36,20 @@ use crate::common;
 fn test_decode_v142_udtf() -> anyhow::Result<()> {
     let bytes = vec![
         10, 9, 116, 101, 115, 116, 95, 117, 100, 116, 102, 18, 21, 84, 104, 105, 115, 32, 105, 115,
-        32, 97, 32, 100, 101, 115, 99, 114, 105, 112, 116, 105, 111, 110, 66, 25, 26, 16, 115, 101,
-        108, 101, 99, 116, 32, 42, 32, 102, 114, 111, 109, 32, 116, 49, 160, 6, 142, 1, 168, 6, 24,
-        42, 23, 50, 48, 50, 51, 45, 49, 50, 45, 49, 53, 32, 48, 49, 58, 50, 54, 58, 48, 57, 32, 85,
-        84, 67, 160, 6, 142, 1, 168, 6, 24,
+        32, 97, 32, 100, 101, 115, 99, 114, 105, 112, 116, 105, 111, 110, 66, 79, 10, 16, 10, 2,
+        99, 49, 18, 10, 146, 2, 0, 160, 6, 142, 1, 168, 6, 24, 10, 16, 10, 2, 99, 50, 18, 10, 138,
+        2, 0, 160, 6, 142, 1, 168, 6, 24, 18, 16, 10, 2, 99, 51, 18, 10, 170, 2, 0, 160, 6, 142, 1,
+        168, 6, 24, 26, 16, 115, 101, 108, 101, 99, 116, 32, 42, 32, 102, 114, 111, 109, 32, 116,
+        49, 160, 6, 142, 1, 168, 6, 24, 42, 23, 50, 48, 50, 51, 45, 49, 50, 45, 49, 53, 32, 48, 49,
+        58, 50, 54, 58, 48, 57, 32, 85, 84, 67, 160, 6, 142, 1, 168, 6, 24,
     ];
 
     let want = || UserDefinedFunction {
         name: "test_udtf".to_string(),
         description: "This is a description".to_string(),
         definition: UDFDefinition::UDTF(UDTF {
-            arg_types: vec![],
-            return_types: vec![],
+            arg_types: vec![(s("c1"), DataType::String), (s("c2"), DataType::Boolean)],
+            return_types: vec![(s("c3"), DataType::Date)],
             sql: "select * from t1".to_string(),
         }),
         created_on: DateTime::<Utc>::from_timestamp(1702603569, 0).unwrap(),
@@ -55,3 +58,7 @@ fn test_decode_v142_udtf() -> anyhow::Result<()> {
     common::test_pb_from_to(func_name!(), want())?;
     common::test_load_old(func_name!(), bytes.as_slice(), 142, want())
 }
+
+fn s(ss: impl ToString) -> String {
+    ss.to_string()
+}

src/meta/protos/proto/udf.proto

@@ -71,7 +71,7 @@ message UDAFScript {
 
 message UDTFArg {
   string name = 1;
-  DataType type = 2;
+  DataType ty = 2;
 }
 
 message UDTF {