Skip to content
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

Jump to bottom

fix: added examples and fixes for maps #94

Merged
merged 1 commit into from
Dec 20, 2022
Merged

fix: added examples and fixes for maps #94

Show file tree
Hide file tree
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
50 changes: 39 additions & 11 deletions cmd/protoc-gen-fastmarshal/templates/fieldsnippets.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,14 +145,19 @@
// size of key (always has an internal tag of 1)
{{ if eq (.Kind | string) "int32" "int64" "uint32" "uint64" -}}
keySize := 1 + csproto.SizeOfVarint(uint64(k))
{{- else if eq (.Kind | string) "bool" -}}
_ = k
keySize := 1 + 1
{{- else if eq (.Kind | string) "string" -}}
l = len(k)
keySize := 1 + csproto.SizeOfVarint(uint64(l)) + l
{{- else if eq (.Kind | string) "sint32" "sint64" -}}
keySize := 1 + csproto.SizeOfZigZag(uint64(k))
{{- else if eq (.Kind | string) "fixed32" "sfixed32" -}}
_ = k
keySize := 5
{{- else if eq (.Kind | string) "fixed64" "sfixed64" -}}
_ = k
keySize := 9
{{- else -}}
panic(fmt.Errorf("unknown/unsupported Protobuf field kind '{{.Kind | string}}' for map key for field {{$mapField.Name}} (tag={{$mapDesc.Number}})"))
Expand All @@ -163,6 +168,10 @@
{{ if eq (.Kind | string) "int32" "int64" "uint32" "uint64" "enum" -}}
valueSize := 1 + csproto.SizeOfVarint(uint64(v))
sz += csproto.SizeOfTagKey({{$mapDesc.Number}}) + csproto.SizeOfVarint(uint64(keySize + valueSize)) + keySize + valueSize
{{- else if eq (.Kind | string) "bool" -}}
_ = v
valueSize := 1 + 1
sz += csproto.SizeOfTagKey({{$mapDesc.Number}}) + csproto.SizeOfVarint(uint64(keySize + valueSize)) + keySize + valueSize
{{- else if eq (.Kind | string) "string" "bytes" -}}
l = len(v)
valueSize := 1 + csproto.SizeOfVarint(uint64(l)) + l
Expand Down Expand Up @@ -490,12 +499,14 @@
{{- $mapKeyKind := (.Desc.MapKey.Kind | string) -}}
{{- $mapValueKind := (.Desc.MapValue.Kind | string) -}}
for k, v := range m.{{.GoName | getSafeFieldName}} {
var l int
{{ if eq $mapValueKind "int32" "int64" "uint32" "uint64" "enum" -}}
itemSize := 1 + csproto.SizeOfVarint(uint64(v))
{{- else if eq $mapValueKind "bool" -}}
_ = v
itemSize := 1 + 1
{{- else if eq $mapValueKind "string" "bytes" -}}
l = len(v)
itemSize := 1 + csproto.SizeOfVarint(uint64(l)) + l
valueSize := len(v)
dylan-bourque marked this conversation as resolved.
Show resolved Hide resolved
itemSize := 1 + csproto.SizeOfVarint(uint64(valueSize)) + valueSize
{{- else if eq $mapValueKind "sint32" "sint64" -}}
itemSize := 1 + csproto.SizeOfZigZag(uint64(v))
{{- else if eq $mapValueKind "fixed32" "sfixed32" "float" -}}
Expand All @@ -506,16 +517,19 @@
if v == nil {
continue
}
l = csproto.Size(v)
itemSize := 1 + csproto.SizeOfVarint(uint64(l)) + l
valueSize := csproto.Size(v)
itemSize := 1 + csproto.SizeOfVarint(uint64(valueSize)) + valueSize
{{- else -}}
panic(fmt.Errorf("unknown/unsupported Protobuf field kind '{{$mapValueKind}}' for map value for field {{$mapField.Desc.Name}} (tag={{$mapField.Desc.Number}})"))
{{- end }}
{{ if eq $mapKeyKind "int32" "int64" "uint32" "uint64" "enum" -}}
itemSize += 1 + csproto.SizeOfVarint(uint64(k))
{{- else if eq $mapKeyKind "bool" -}}
_ = k
itemSize += 1 + 1 + l
{{- else if eq $mapKeyKind "string" -}}
l = len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(l)) + l
keySize := len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(keySize)) + keySize
{{- else if eq $mapKeyKind "sint32" "sint64" -}}
itemSize += 1 + csproto.SizeOfZigZag(uint64(k))
{{- else if eq $mapKeyKind "fixed32" "sfixed32" -}}
Expand All @@ -528,15 +542,19 @@
enc.EncodeMapEntryHeader({{$mapField.Desc.Number}}, itemSize)
{{ if eq $mapKeyKind "int32" "int64" "uint32" "uint64" -}}
enc.EncodeUInt64(1, uint64(k))
{{- else if eq $mapKeyKind "bool" -}}
enc.EncodeBool(1, k)
{{- else if eq $mapKeyKind "string" -}}
enc.EncodeString(1, k)
{{- else if eq $mapKeyKind "sint32" "sint64" -}}
enc.EncodeSInt{{$mapKeyKind | trunc -2}}(1, k)
{{- else if eq $mapKeyKind "fixed32" "sfixed32" "fixed64" "sfixed64" -}}
enc.EncodeFixed{{$mapKeyKind | trunc -2}}(uint{{$mapKeyKind | trunc -2}}(1, k))
enc.EncodeFixed{{$mapKeyKind | trunc -2}}(1, uint{{$mapKeyKind | trunc -2}}(k))
{{- end }}
{{ if eq $mapValueKind "int32" "int64" "uint32" "uint64" "enum" -}}
enc.EncodeUInt64(2, uint64(v))
{{- else if eq $mapValueKind "bool" -}}
enc.EncodeBool(2, v)
{{- else if eq $mapValueKind "string" "bytes" -}}
enc.Encode{{$mapValueKind | upperFirst}}(2, v)
{{- else if eq $mapValueKind "sint32" "sint64" -}}
Expand Down Expand Up @@ -1047,7 +1065,7 @@
if ewt != csproto.WireTypeVarint {
return fmt.Errorf("incorrect wire type %v for map key for field '{{.Desc.Name}}' (tag={{.Desc.Number}}), expected 0 (varint)", ewt)
}
if entryKey, err = dec.DecodeUint{{$mapKeyKind | trunc -2}}(); err != nil {
if entryKey, err = dec.DecodeUInt{{$mapKeyKind | trunc -2}}(); err != nil {
return err
}
{{- else if eq $mapKeyKind "sint32" "sint64" -}}
Expand All @@ -1057,7 +1075,17 @@
if entryKey, err = dec.DecodeSInt{{$mapKeyKind | trunc -2}}(); err != nil {
return err
}
{{- else if eq $mapKeyKind "fixed32" "sfixed32" "fixed64" "sfixed64" -}}
{{- else if eq $mapKeyKind "sfixed32" "sfixed64" -}}
{{- $bitSize := $mapKeyKind | trunc -2 -}}
if ewt != csproto.WireTypeFixed{{$bitSize}} {
return fmt.Errorf("incorrect wire type %v for map key for field '{{.Desc.Name}}' (tag={{.Desc.Number}}), expected {{if eq $bitSize "32"}}5{{else}}1{{end}} (fixed{{$bitSize}})", ewt)
}
if sv, err := dec.DecodeFixed{{$bitSize}}(); err != nil {
return err
} else {
entryKey = int{{$bitSize}}(sv)
}
{{- else if eq $mapKeyKind "fixed32" "fixed64" -}}
{{- $bitSize := $mapKeyKind | trunc -2 -}}
if ewt != csproto.WireTypeFixed{{$bitSize}} {
return fmt.Errorf("incorrect wire type %v for map key for field '{{.Desc.Name}}' (tag={{.Desc.Number}}), expected {{if eq $bitSize "32"}}5{{else}}1{{end}} (fixed{{$bitSize}})", ewt)
Expand Down Expand Up @@ -1328,7 +1356,7 @@
if wt != csproto.WireTypeLengthDelimited {
return fmt.Errorf("incorrect wire type %v for tag field '{{.Desc.Name}}' (tag={{.Desc.Number}}), expected 2 (length-delimited)", wt)
}
var mm_{{.Desc.Name}} {{.Message.GoIdent.GoName | getSafeFieldName}}
var mm_{{.Desc.Name}} {{.Message | getImportPrefix}}{{.Message.GoIdent.GoName | getSafeFieldName}}
if err = dec.DecodeNested(&mm_{{.Desc.Name}}); err != nil {
return fmt.Errorf("unable to decode message value for field '{{.Desc.Name}}' (tag={{.Desc.Number}}): %w", err)
} else {
Expand Down
92 changes: 38 additions & 54 deletions example/permessage/gogo/gogo_permessage_example_allthemaps.pb.fm.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,181 +221,165 @@ func (m *AllTheMaps) MarshalTo(dest []byte) error {

// ToInt32 (1,map)
for k, v := range m.ToInt32 {
var l int
itemSize := 1 + csproto.SizeOfVarint(uint64(v))
l = len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(l)) + l
keySize := len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(keySize)) + keySize
enc.EncodeMapEntryHeader(1, itemSize)
enc.EncodeString(1, k)
enc.EncodeUInt64(2, uint64(v))
}

// ToInt64 (2,map)
for k, v := range m.ToInt64 {
var l int
itemSize := 1 + csproto.SizeOfVarint(uint64(v))
l = len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(l)) + l
keySize := len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(keySize)) + keySize
enc.EncodeMapEntryHeader(2, itemSize)
enc.EncodeString(1, k)
enc.EncodeUInt64(2, uint64(v))
}

// ToUInt32 (3,map)
for k, v := range m.ToUInt32 {
var l int
itemSize := 1 + csproto.SizeOfVarint(uint64(v))
l = len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(l)) + l
keySize := len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(keySize)) + keySize
enc.EncodeMapEntryHeader(3, itemSize)
enc.EncodeString(1, k)
enc.EncodeUInt64(2, uint64(v))
}

// ToUInt64 (4,map)
for k, v := range m.ToUInt64 {
var l int
itemSize := 1 + csproto.SizeOfVarint(uint64(v))
l = len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(l)) + l
keySize := len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(keySize)) + keySize
enc.EncodeMapEntryHeader(4, itemSize)
enc.EncodeString(1, k)
enc.EncodeUInt64(2, uint64(v))
}

// ToString (5,map)
for k, v := range m.ToString {
var l int
l = len(v)
itemSize := 1 + csproto.SizeOfVarint(uint64(l)) + l
l = len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(l)) + l
valueSize := len(v)
itemSize := 1 + csproto.SizeOfVarint(uint64(valueSize)) + valueSize
keySize := len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(keySize)) + keySize
enc.EncodeMapEntryHeader(5, itemSize)
enc.EncodeString(1, k)
enc.EncodeString(2, v)
}

// ToBytes (6,map)
for k, v := range m.ToBytes {
var l int
l = len(v)
itemSize := 1 + csproto.SizeOfVarint(uint64(l)) + l
l = len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(l)) + l
valueSize := len(v)
itemSize := 1 + csproto.SizeOfVarint(uint64(valueSize)) + valueSize
keySize := len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(keySize)) + keySize
enc.EncodeMapEntryHeader(6, itemSize)
enc.EncodeString(1, k)
enc.EncodeBytes(2, v)
}

// ToSInt32 (7,map)
for k, v := range m.ToSInt32 {
var l int
itemSize := 1 + csproto.SizeOfZigZag(uint64(v))
l = len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(l)) + l
keySize := len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(keySize)) + keySize
enc.EncodeMapEntryHeader(7, itemSize)
enc.EncodeString(1, k)
enc.EncodeSInt32(2, v)
}

// ToSInt64 (8,map)
for k, v := range m.ToSInt64 {
var l int
itemSize := 1 + csproto.SizeOfZigZag(uint64(v))
l = len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(l)) + l
keySize := len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(keySize)) + keySize
enc.EncodeMapEntryHeader(8, itemSize)
enc.EncodeString(1, k)
enc.EncodeSInt64(2, v)
}

// ToFixed32 (9,map)
for k, v := range m.ToFixed32 {
var l int
itemSize := 5
l = len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(l)) + l
keySize := len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(keySize)) + keySize
enc.EncodeMapEntryHeader(9, itemSize)
enc.EncodeString(1, k)
enc.EncodeFixed32(2, uint32(v))
}

// ToSFixed32 (10,map)
for k, v := range m.ToSFixed32 {
var l int
itemSize := 5
l = len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(l)) + l
keySize := len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(keySize)) + keySize
enc.EncodeMapEntryHeader(10, itemSize)
enc.EncodeString(1, k)
enc.EncodeFixed32(2, uint32(v))
}

// ToFixed64 (11,map)
for k, v := range m.ToFixed64 {
var l int
itemSize := 9
l = len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(l)) + l
keySize := len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(keySize)) + keySize
enc.EncodeMapEntryHeader(11, itemSize)
enc.EncodeString(1, k)
enc.EncodeFixed64(2, uint64(v))
}

// ToSFixed64 (12,map)
for k, v := range m.ToSFixed64 {
var l int
itemSize := 9
l = len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(l)) + l
keySize := len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(keySize)) + keySize
enc.EncodeMapEntryHeader(12, itemSize)
enc.EncodeString(1, k)
enc.EncodeFixed64(2, uint64(v))
}

// ToFloat (13,map)
for k, v := range m.ToFloat {
var l int
itemSize := 5
l = len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(l)) + l
keySize := len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(keySize)) + keySize
enc.EncodeMapEntryHeader(13, itemSize)
enc.EncodeString(1, k)
enc.EncodeFloat32(2, v)
}

// ToDouble (14,map)
for k, v := range m.ToDouble {
var l int
itemSize := 9
l = len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(l)) + l
keySize := len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(keySize)) + keySize
enc.EncodeMapEntryHeader(14, itemSize)
enc.EncodeString(1, k)
enc.EncodeFloat64(2, v)
}

// ToMessage (15,map)
for k, v := range m.ToMessage {
var l int
if v == nil {
continue
}
l = csproto.Size(v)
itemSize := 1 + csproto.SizeOfVarint(uint64(l)) + l
l = len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(l)) + l
valueSize := csproto.Size(v)
itemSize := 1 + csproto.SizeOfVarint(uint64(valueSize)) + valueSize
keySize := len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(keySize)) + keySize
enc.EncodeMapEntryHeader(15, itemSize)
enc.EncodeString(1, k)
enc.EncodeNested(2, v)
}

// ToEnum (16,map)
for k, v := range m.ToEnum {
var l int
itemSize := 1 + csproto.SizeOfVarint(uint64(v))
l = len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(l)) + l
keySize := len(k)
itemSize += 1 + csproto.SizeOfVarint(uint64(keySize)) + keySize
enc.EncodeMapEntryHeader(16, itemSize)
enc.EncodeString(1, k)
enc.EncodeUInt64(2, uint64(v))
Expand Down
2 changes: 1 addition & 1 deletion example/permessage/googlev1/googlev1_permessage_example.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading