Skip to content

WIP: zeropb codec #128

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

Draft
wants to merge 9 commits into
base: main
Choose a base branch
from
Draft

WIP: zeropb codec #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2fd4189
wip
elias-orijtech Nov 22, 2023
7a9403f
struct-based codec
elias-orijtech Nov 30, 2023
6877930
wip
elias-orijtech Nov 30, 2023
dbf8abb
wip
elias-orijtech Nov 30, 2023
aa8bd70
wip
elias-orijtech Nov 30, 2023
eca656e
wip one-alloc unmarshal
elias-orijtech Dec 1, 2023
8119ed2
wip one-alloc unmarshal
elias-orijtech Dec 1, 2023
ace3fd4
add nil check; test segments
elias-orijtech Dec 9, 2023
2e9e8e9
implement segments
elias-orijtech Dec 9, 2023
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
1 change: 1 addition & 0 deletions cmd/protoc-gen-go-pulsar/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (

_ "github.com/cosmos/cosmos-proto/features/fastreflection"
_ "github.com/cosmos/cosmos-proto/features/protoc"
_ "github.com/cosmos/cosmos-proto/features/zeropb"
"github.com/cosmos/cosmos-proto/generator"
"google.golang.org/protobuf/reflect/protoreflect"

Expand Down
39 changes: 24 additions & 15 deletions features/protoc/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1448,7 +1448,7 @@ func genMessageField(g *generator.GeneratedFile, f *fileInfo, m *messageInfo, fi
sf.append(oneof.GoName)
return
}
goType, pointer := fieldGoType(g, f, field)
goType, pointer := FieldGoType(g, field)
if pointer {
goType = "*" + goType
}
Expand Down Expand Up @@ -1490,7 +1490,7 @@ func genMessageDefaultDecls(g *generator.GeneratedFile, f *fileInfo, m *messageI
continue
}
name := "Default_" + m.GoIdent.GoName + "_" + field.GoName
goType, _ := fieldGoType(g, f, field)
goType, _ := FieldGoType(g, field)
defVal := field.Desc.Default()
switch field.Desc.Kind() {
case protoreflect.StringKind:
Expand Down Expand Up @@ -1610,7 +1610,7 @@ func genMessageGetterMethods(g *generator.GeneratedFile, f *fileInfo, m *message
}

// Getter for message field.
goType, pointer := fieldGoType(g, f, field)
goType, pointer := FieldGoType(g, field)
defaultValue := fieldDefaultValue(g, f, m, field)
g.Annotate(m.GoIdent.GoName+".Get"+field.GoName, field.Location)
leadingComments := appendDeprecationSuffix("",
Expand Down Expand Up @@ -1679,10 +1679,27 @@ func genMessageSetterMethods(g *generator.GeneratedFile, f *fileInfo, m *message
}
}

// fieldGoType returns the Go type used for a field.
// FieldGoType returns the Go type used for a field.
//
// If it returns pointer=true, the struct field is a pointer to the type.
func fieldGoType(g *generator.GeneratedFile, f *fileInfo, field *protogen.Field) (goType string, pointer bool) {
func FieldGoType(g *generator.GeneratedFile, field *protogen.Field) (goType string, pointer bool) {
switch {
case field.Desc.IsList():
typ, _ := FieldGoElemType(g, field)
return "[]" + typ, false
case field.Desc.IsMap():
keyType, _ := FieldGoType(g, field.Message.Fields[0])
valType, _ := FieldGoType(g, field.Message.Fields[1])
return fmt.Sprintf("map[%v]%v", keyType, valType), false
}
return FieldGoElemType(g, field)
}

// FieldElemGoType returns the Go element type used for a field. It is not valid for
// map fields.
//
// If it returns pointer=true, the struct field is a pointer to the type.
func FieldGoElemType(g *generator.GeneratedFile, field *protogen.Field) (goType string, pointer bool) {
if field.Desc.IsWeak() {
return "struct{}", false
}
Expand Down Expand Up @@ -1714,14 +1731,6 @@ func fieldGoType(g *generator.GeneratedFile, f *fileInfo, field *protogen.Field)
goType = "*" + g.QualifiedGoIdent(field.Message.GoIdent)
pointer = false // pointer captured as part of the type
}
switch {
case field.Desc.IsList():
return "[]" + goType, false
case field.Desc.IsMap():
keyType, _ := fieldGoType(g, f, field.Message.Fields[0])
valType, _ := fieldGoType(g, f, field.Message.Fields[1])
return fmt.Sprintf("map[%v]%v", keyType, valType), false
}
return goType, pointer
}

Expand Down Expand Up @@ -1779,7 +1788,7 @@ func genExtensions(g *generator.GeneratedFile, f *fileInfo) {
for _, x := range f.allExtensions {
g.P("{")
g.P("ExtendedType: (*", x.Extendee.GoIdent, ")(nil),")
goType, pointer := fieldGoType(g, f, x.Extension)
goType, pointer := FieldGoType(g, x.Extension)
if pointer {
goType = "*" + goType
}
Expand Down Expand Up @@ -1852,7 +1861,7 @@ func genMessageOneofWrapperTypes(g *generator.GeneratedFile, f *fileInfo, m *mes
g.Annotate(field.GoIdent.GoName, field.Location)
g.Annotate(field.GoIdent.GoName+"."+field.GoName, field.Location)
g.P("type ", field.GoIdent, " struct {")
goType, _ := fieldGoType(g, f, field)
goType, _ := FieldGoType(g, field)
tags := structTags{
{"protobuf", fieldProtobufTagValue(field)},
}
Expand Down
Loading