#297 support optional parameters for thrift functions

pilota-build/src/ir/mod.rs

@@ -54,6 +54,7 @@ pub struct Arg {
     pub name: Ident,
     pub id: i32,
     pub tags: Arc<Tags>,
+    pub attribute: FieldKind,
 }
 
 #[derive(Clone, Debug)]

pilota-build/src/middle/rir.rs

@@ -24,6 +24,7 @@ pub struct Arg {
     pub name: Ident,
     pub id: i32,
     pub tags_id: TagId,
+    pub kind: FieldKind,
 }
 
 #[derive(Clone, Debug)]

pilota-build/src/parser/protobuf/mod.rs

@@ -392,6 +392,7 @@ impl Lower {
                                     &Default::default(),
                                 ),
                                 tags: Arc::new(Tags::default()),
+                                attribute: FieldKind::Required,
                             }],
                             oneway: false,
                             ret: self.lower_ty(None, m.output_type.as_deref(), &Default::default()),

pilota-build/src/parser/thrift/mod.rs

@@ -319,6 +319,11 @@ impl ThriftLower {
                     id: a.id,
                     name: self.lower_ident(&a.name),
                     tags: Arc::new(self.extract_tags(&a.annotations)),
+                    attribute: match a.attribute {
+                        pilota_thrift_parser::Attribute::Required => FieldKind::Required,
+                        pilota_thrift_parser::Attribute::Optional
+                        | pilota_thrift_parser::Attribute::Default => FieldKind::Optional,
+                    },
                 })
                 .collect(),
             ret: self.lower_ty(&method.result_type),

pilota-build/src/resolve.rs

@@ -662,6 +662,10 @@ impl Resolver {
                                     name: a.name.clone(),
                                     id: a.id,
                                     tags_id,
+                                    kind: match a.attribute {
+                                        ir::FieldKind::Required => FieldKind::Required,
+                                        ir::FieldKind::Optional => FieldKind::Optional,
+                                    },
                                 });
                                 self.nodes.insert(
                                     def_id,

pilota-build/src/tags.rs

@@ -194,7 +194,6 @@ impl FromStr for KeepUnknownFields {
 }
 
 pub mod protobuf {
-
     #[derive(Copy, Clone, PartialEq, Eq)]
     pub enum ProstType {
         SInt32,

pilota-build/test_data/thrift/optional_parameter.thrift

@@ -0,0 +1,7 @@
+service Test {
+    string test(
+        1: required string required_param
+        2: optional string optional_param
+        3: string default_param
+    )
+}

pilota-thrift-parser/src/descriptor/field.rs

@@ -1,6 +1,6 @@
 use super::{Annotations, ConstValue, Ident, Type};
 
-#[derive(Debug, Clone, Default)]
+#[derive(Debug, Clone, Default, PartialEq)]
 pub enum Attribute {
     Optional,
     Required,

pilota-thrift-parser/src/parser/function.rs

@@ -47,7 +47,9 @@ impl Parser for Function {
             |(oneway, r#type, _, name, _, _, arguments, _, _, _, throws, _, annotations, _)| {
                 let mut args = arguments.unwrap_or_default();
                 args.iter_mut().for_each(|f| {
-                    f.attribute = Attribute::Required;
+                    if f.attribute == Attribute::Default {
+                        f.attribute = Attribute::Required
+                    }
                 });
                 Function {
                     name,