Merge branch 'main' into feat/sdk

cloudwego · May 20, 2024 · 0125858 · 0125858
2 parents 45be7f2 + 5ef2d54
commit 0125858
Show file tree

Hide file tree

Showing 48 changed files with 4,555 additions and 2,165 deletions.
diff --git a/descriptor.thrift b/descriptor.thrift
@@ -119,9 +119,9 @@ struct ServiceDescriptor{
     2:required string name 
     3:required list<MethodDescriptor> methods  
     4:required map<string,list<string>> annotations 
-    5:required string comments  
+    5:required string comments
     6:optional map<string,string> extra  // extra info
-    7:optional ServiceDescriptor parent
+    7:optional string base = ""
 }
 
 struct FileDescriptor{

diff --git a/descriptor_code_gen.sh b/descriptor_code_gen.sh
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-go run . -g go:gen_type_meta -o . descriptor.thrift
+go run . -g go:gen_type_meta,no_processor -o . descriptor.thrift
diff --git a/extension/thrift_option/option_idl/test.thrift b/extension/thrift_option/option_idl/test.thrift
@@ -103,10 +103,8 @@ struct PersonC{
     entity.person_basic_info.valuei8 = '8'
     entity.person_basic_info.valuei16 = '16'
     entity.person_struct_info.valuestruct = '{email:"empty email"}'
-    // 简写不建议这样写，而且这行会被下面那行覆盖掉
-    entity.person_struct_info.valueteststruct.innerStruct = "{name: '123'},innerStruct:{email:'456'}"
-    entity.person_struct_info.valueteststruct.innerStruct.email = "no email"
     entity.person_struct_info.valueteststruct.name = "lee"
+    entity.person_struct_info.valueteststruct.innerStruct.email = "no email"
 )
 
 enum MyEnum{

diff --git a/extension/thrift_option/runtime_test/option_gen/annotation/entity/entity-reflection.go b/extension/thrift_option/runtime_test/option_gen/annotation/entity/entity-reflection.go