chore: rebase

Author: KKould

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

@@ -51,11 +51,15 @@ pub struct UDFScript {
     pub immutable: Option<bool>,
 }
 
+/// User Defined Table Function (UDTF)
+///
+/// # Fields
+/// - `arg_types`: arg name with data type
+/// - `return_types`: return column name with data type
+/// - `sql`: SQL implementing the UDTF
 #[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,18 +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.ty.ok_or_else(|| {
+            let ty_pb = arg_ty.ty.ok_or_else(|| {
                 Incompatible::new("UDTF.arg_types.ty can not be None".to_string())
-            })?)?;
+            })?;
+            let ty = TableDataType::from_pb(ty_pb)?;
 
             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.ty.ok_or_else(|| {
+            let ty_pb = return_ty.ty.ok_or_else(|| {
                 Incompatible::new("UDTF.arg_types.ty can not be None".to_string())
-            })?)?;
+            })?;
+            let ty = TableDataType::from_pb(ty_pb)?;
 
             return_types.push((return_ty.name, (&ty).into()));
         }

src/meta/protos/proto/udf.proto

@@ -78,7 +78,9 @@ message UDTF {
   uint64 ver = 100;
   uint64 min_reader_ver = 101;
 
+  // arg name with data type
   repeated UDTFArg arg_types = 1;
+  // return column name with data type
   repeated UDTFArg return_types = 2;
   string sql = 3;
 }