opt: move mask check into FieldReader

cloudwego · Dec 1, 2023 · 474dbef · 474dbef
1 parent 9f7a28b
commit 474dbef
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/generator/golang/templates/struct.go b/generator/golang/templates/struct.go
@@ -179,17 +179,9 @@ func (p *{{$TypeName}}) Read(iprot thrift.TProtocol) (err error) {
 		{{- $isBaseVal := .Type | IsBaseType}}
 		case {{.ID}}:
 			if fieldTypeId == thrift.{{.Type | GetTypeIDConstant }} {
-				{{- if Features.WithFieldMask}}
-				if {{if $isBaseVal}}_{{else}}nfm{{end}}, ex := p._fieldmask.Field(fieldId); ex {
-				{{- end}}
-				if err = p.{{.Reader}}(iprot{{if and Features.WithFieldMask (not $isBaseVal)}}, nfm{{end}}); err != nil {
+				if err = p.{{.Reader}}(iprot); err != nil {
 					goto ReadFieldError
 				}
-				{{- if Features.WithFieldMask}}
-				} else if err = iprot.Skip(fieldTypeId); err != nil {
-					goto SkipFieldError
-				}
-				{{- end}}
 				{{- if .Requiredness.IsRequired}}
 				isset{{.GoName}} = true
 				{{- end}}
@@ -279,9 +271,17 @@ var StructLikeReadField = `
 {{- range .Fields}}
 {{$FieldName := .GoName}}
 {{- $isBaseVal := .Type | IsBaseType -}}
-func (p *{{$TypeName}}) {{.Reader}}(iprot thrift.TProtocol{{if and Features.WithFieldMask (not $isBaseVal)}}, fm *fieldmask.FieldMask{{end}}) error {
+func (p *{{$TypeName}}) {{.Reader}}(iprot thrift.TProtocol) error {
+	{{- if Features.WithFieldMask}}
+	if {{if $isBaseVal}}_{{else}}fm{{end}}, ex := p._fieldmask.Field({{.ID}}); ex {
+	{{- end}}
 	{{$ctx := (MkRWCtx .).WithFieldMask "fm"}}
 	{{- template "FieldRead" $ctx}}
+	{{- if Features.WithFieldMask}}
+	} else if err := iprot.Skip(thrift.{{.Type | GetTypeIDConstant}}); err != nil {
+		return err
+	}
+	{{- end}}
 	return nil
 }
 {{- end}}{{/* range .Fields */}}

diff --git a/test/golang/fieldmask/main_test.go b/test/golang/fieldmask/main_test.go
@@ -22,7 +22,6 @@ import (
 
 	"github.com/apache/thrift/lib/go/thrift"
 	"github.com/cloudwego/thriftgo/fieldmask"
-	"github.com/davecgh/go-spew/spew"
 
 	// abase "github.com/cloudwego/thriftgo/test/golang/fieldmask/gen-go/base"
 	nbase "github.com/cloudwego/thriftgo/test/golang/fieldmask/gen-new/base"
@@ -133,7 +132,6 @@ func TestMaskRequired(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-	spew.Dump(fm)
 	j, err := fm.MarshalJSON()
 	if err != nil {
 		t.Fatal(err)