mirror/protobuf-go
1
0
Fork 0
mirror of https://github.com/protocolbuffers/protobuf-go.git synced 2025-02-10 03:39:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

internal/filedesc: use jsonName.Init method over JSONName constructor

Browse Source 
The JSONName constructor returns a struct value which shallow copies
a sync.Once within it; this is a dubious pattern.
Instead, add a jsonName.Init method to initialize the value.

Change-Id: I190a7239b1b62a8041ee7e4e09c0fe37b64ff623
Reviewed-on: https://go-review.googlesource.com/c/protobuf/+/213237
Reviewed-by: Damien Neil <dneil@google.com>
This commit is contained in:
Joe Tsai 2020-01-03 15:53:47 -08:00 committed by Joe Tsai
parent 1a08d54978
commit 6c26a04a51
4 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/encoding/tag/tag.go
View File

@ -104,7 +104,7 @@ func Unmarshal(tag string, goType reflect.Type, evs pref.EnumValueDescriptors) p
case strings.HasPrefix(s, "json="): case strings.HasPrefix(s, "json="):
jsonName := s[len("json="):] jsonName := s[len("json="):]
if jsonName != strs.JSONCamelCase(string(f.L0.FullName.Name())) { if jsonName != strs.JSONCamelCase(string(f.L0.FullName.Name())) {
f.L1.JSONName = fdesc.JSONName(jsonName) f.L1.JSONName.Init(jsonName)
} }
case s == "packed": case s == "packed":
f.L1.HasPacked = true f.L1.HasPacked = true

10
internal/filedesc/desc.go
View File

@ -490,16 +490,18 @@ func (d *Base) Syntax() pref.Syntax { return d.L0.ParentFile.Syn
func (d *Base) IsPlaceholder() bool { return false } func (d *Base) IsPlaceholder() bool { return false }
func (d *Base) ProtoInternal(pragma.DoNotImplement) {} func (d *Base) ProtoInternal(pragma.DoNotImplement) {}
func JSONName(s string) jsonName {
return jsonName{has: true, name: s}
}
type jsonName struct { type jsonName struct {
has bool has bool
once sync.Once once sync.Once
name string name string
} }
// Init initializes the name. It is exported for use by other internal packages.
func (js *jsonName) Init(s string) {
js.has = true
js.name = s
}
func (js *jsonName) get(fd pref.FieldDescriptor) string { func (js *jsonName) get(fd pref.FieldDescriptor) string {
if !js.has { if !js.has {
js.once.Do(func() { js.once.Do(func() {

4
internal/filedesc/desc_lazy.go
View File

@ -449,7 +449,7 @@ func (fd *Field) unmarshalFull(b []byte, sb *strs.Builder, pf *File, pd pref.Des
case fieldnum.FieldDescriptorProto_Name: case fieldnum.FieldDescriptorProto_Name:
fd.L0.FullName = appendFullName(sb, pd.FullName(), v) fd.L0.FullName = appendFullName(sb, pd.FullName(), v)
case fieldnum.FieldDescriptorProto_JsonName: case fieldnum.FieldDescriptorProto_JsonName:
fd.L1.JSONName = JSONName(sb.MakeString(v)) fd.L1.JSONName.Init(sb.MakeString(v))
case fieldnum.FieldDescriptorProto_DefaultValue: case fieldnum.FieldDescriptorProto_DefaultValue:
fd.L1.Default.val = pref.ValueOfBytes(v) // temporarily store as bytes; later resolved in resolveMessages fd.L1.Default.val = pref.ValueOfBytes(v) // temporarily store as bytes; later resolved in resolveMessages
case fieldnum.FieldDescriptorProto_TypeName: case fieldnum.FieldDescriptorProto_TypeName:
@ -542,7 +542,7 @@ func (xd *Extension) unmarshalFull(b []byte, sb *strs.Builder) {
b = b[m:] b = b[m:]
switch num { switch num {
case fieldnum.FieldDescriptorProto_JsonName: case fieldnum.FieldDescriptorProto_JsonName:
xd.L2.JSONName = JSONName(sb.MakeString(v)) xd.L2.JSONName.Init(sb.MakeString(v))
case fieldnum.FieldDescriptorProto_DefaultValue: case fieldnum.FieldDescriptorProto_DefaultValue:
xd.L2.Default.val = pref.ValueOfBytes(v) // temporarily store as bytes; later resolved in resolveExtensions xd.L2.Default.val = pref.ValueOfBytes(v) // temporarily store as bytes; later resolved in resolveExtensions
case fieldnum.FieldDescriptorProto_TypeName: case fieldnum.FieldDescriptorProto_TypeName:

4
reflect/protodesc/desc_init.go
View File

@ -133,7 +133,7 @@ func (r descsByName) initFieldsFromDescriptorProto(fds []*descriptorpb.FieldDesc
f.L1.Kind = protoreflect.Kind(fd.GetType()) f.L1.Kind = protoreflect.Kind(fd.GetType())
} }
if fd.JsonName != nil { if fd.JsonName != nil {
f.L1.JSONName = filedesc.JSONName(fd.GetJsonName()) f.L1.JSONName.Init(fd.GetJsonName())
} }
} }
return fs, nil return fs, nil
@ -173,7 +173,7 @@ func (r descsByName) initExtensionDeclarations(xds []*descriptorpb.FieldDescript
x.L1.Kind = protoreflect.Kind(xd.GetType()) x.L1.Kind = protoreflect.Kind(xd.GetType())
} }
if xd.JsonName != nil { if xd.JsonName != nil {
x.L2.JSONName = filedesc.JSONName(xd.GetJsonName()) x.L2.JSONName.Init(xd.GetJsonName())
} }
} }
return xs, nil return xs, nil