Skip to content

fix: oneof type only write/size once #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Hchenn wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: oneof type only write/size once #28

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
92 changes: 50 additions & 42 deletions protoc-gen-fastpb/generator/generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,9 +218,16 @@ func (f *fgMessage) GenFastWrite(g *protogen.GeneratedFile) {
g.P(fmt.Sprintf("func (x *%s) FastWrite(buf []byte) (offset int) {", f.name()))
// switch case
g.P("if x == nil { return offset }")
for i := range f.m.Fields {
number := f.m.Fields[i].Desc.Number()
g.P(fmt.Sprintf("offset += x.fastWriteField%d(buf[offset:])", number))
for _, field := range f.m.Fields {
number := field.Desc.Number()
if field.Oneof != nil && !field.Oneof.Desc.IsSynthetic() {
g.P(fmt.Sprintf("if _, ok := x.GetKind().(*%s); ok {", field.GoIdent.GoName))
g.P(fmt.Sprintf("offset += x.fastWriteField%d(buf[offset:])", number))
g.P(`return offset`)
g.P(`}`)
} else {
g.P(fmt.Sprintf("offset += x.fastWriteField%d(buf[offset:])", number))
}
}
g.P(`return offset`)
g.P(`}`)
Expand All @@ -231,9 +238,16 @@ func (f *fgMessage) GenFastSize(g *protogen.GeneratedFile) {
g.P(fmt.Sprintf("func (x *%s) Size() (n int) {", f.name()))
// switch case
g.P("if x == nil { return n }")
for i := range f.m.Fields {
number := f.m.Fields[i].Desc.Number()
g.P(fmt.Sprintf("n += x.sizeField%d()", number))
for _, field := range f.m.Fields {
number := field.Desc.Number()
if field.Oneof != nil && !field.Oneof.Desc.IsSynthetic() {
g.P(fmt.Sprintf("if _, ok := x.GetKind().(*%s); ok {", field.GoIdent.GoName))
g.P(fmt.Sprintf("n += x.sizeField%d()", number))
g.P(`return n`)
g.P(`}`)
} else {
g.P(fmt.Sprintf("n += x.sizeField%d()", number))
}
}
g.P(`return n`)
g.P(`}`)
Expand Down Expand Up @@ -288,25 +302,22 @@ func (f *fgField) GenFastRead(g *protogen.GeneratedFile) {

func (f *fgField) GenFastWrite(g *protogen.GeneratedFile) {
g.P(fmt.Sprintf("func (x *%s) fastWriteField%s(buf []byte) (offset int) {", f.parentName(), f.number))

setter := fmt.Sprintf("x.%s", f.name())
getSetter := fmt.Sprintf("x.Get%s()", f.name())
// oneof need replace setter
if f.oneofType != "" {
setter = fmt.Sprintf("x.Get%s()", f.name())
}
switch {
case f.f.Desc.Kind() == protoreflect.MessageKind, f.isPointer:
g.P(fmt.Sprintf("if %s == nil { return offset }", setter))
case f.f.Desc.IsMap() || f.f.Desc.IsList() || f.f.Desc.Kind() == protoreflect.BytesKind:
g.P(fmt.Sprintf("if len(%s) == 0 { return offset }", setter))
case f.f.Desc.Kind() == protoreflect.BoolKind:
g.P(fmt.Sprintf("if !%s { return offset }", setter))
case f.f.Desc.Kind() == protoreflect.StringKind:
g.P(fmt.Sprintf(`if %s == "" { return offset }`, setter))
default:
g.P(fmt.Sprintf("if %s == 0 { return offset }", setter))
if f.oneofType == "" {
setter := fmt.Sprintf("x.%s", f.name())
switch {
case f.f.Desc.Kind() == protoreflect.MessageKind, f.isPointer:
g.P(fmt.Sprintf("if %s == nil { return offset }", setter))
case f.f.Desc.IsMap() || f.f.Desc.IsList() || f.f.Desc.Kind() == protoreflect.BytesKind:
g.P(fmt.Sprintf("if len(%s) == 0 { return offset }", setter))
case f.f.Desc.Kind() == protoreflect.BoolKind:
g.P(fmt.Sprintf("if !%s { return offset }", setter))
case f.f.Desc.Kind() == protoreflect.StringKind:
g.P(fmt.Sprintf(`if %s == "" { return offset }`, setter))
default:
g.P(fmt.Sprintf("if %s == 0 { return offset }", setter))
}
}
getSetter := fmt.Sprintf("x.Get%s()", f.name())
f.body.bodyFastWrite(g, getSetter, f.number)
g.P("return offset")
g.P("}")
Expand All @@ -315,25 +326,22 @@ func (f *fgField) GenFastWrite(g *protogen.GeneratedFile) {

func (f *fgField) GenFastSize(g *protogen.GeneratedFile) {
g.P(fmt.Sprintf("func (x *%s) sizeField%s() (n int) {", f.parentName(), f.number))

setter := fmt.Sprintf("x.%s", f.name())
getSetter := fmt.Sprintf("x.Get%s()", f.name())
// oneof need replace setter
if f.oneofType != "" {
setter = fmt.Sprintf("x.Get%s()", f.name())
}
switch {
case f.f.Desc.Kind() == protoreflect.MessageKind, f.isPointer:
g.P(fmt.Sprintf("if %s == nil { return n }", setter))
case f.f.Desc.IsMap() || f.f.Desc.IsList() || f.f.Desc.Kind() == protoreflect.BytesKind:
g.P(fmt.Sprintf("if len(%s) == 0 { return n }", setter))
case f.f.Desc.Kind() == protoreflect.BoolKind:
g.P(fmt.Sprintf("if !%s { return n }", setter))
case f.f.Desc.Kind() == protoreflect.StringKind:
g.P(fmt.Sprintf(`if %s == "" { return n }`, setter))
default:
g.P(fmt.Sprintf("if %s == 0 { return n }", setter))
if f.oneofType == "" {
setter := fmt.Sprintf("x.%s", f.name())
switch {
case f.f.Desc.Kind() == protoreflect.MessageKind, f.isPointer:
g.P(fmt.Sprintf("if %s == nil { return n }", setter))
case f.f.Desc.IsMap() || f.f.Desc.IsList() || f.f.Desc.Kind() == protoreflect.BytesKind:
g.P(fmt.Sprintf("if len(%s) == 0 { return n }", setter))
case f.f.Desc.Kind() == protoreflect.BoolKind:
g.P(fmt.Sprintf("if !%s { return n }", setter))
case f.f.Desc.Kind() == protoreflect.StringKind:
g.P(fmt.Sprintf(`if %s == "" { return n }`, setter))
default:
g.P(fmt.Sprintf("if %s == 0 { return n }", setter))
}
}
getSetter := fmt.Sprintf("x.Get%s()", f.name())
f.body.bodyFastSize(g, getSetter, f.number)
g.P("return n")
g.P("}")
Expand Down