Skip to content

Commit 280400a

Browse files
xiaostxiaost
committed
chore: updated wire.CoderVarint32 comment and var name
1 parent 2da70e9 commit 280400a

10 files changed

Lines changed: 74 additions & 70 deletions

File tree

‎internal/desc/funcs.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func getCoderType(t TagType, kd reflect.Kind) wire.CoderType {
2929
case reflect.Int32:
3030
return wire.CoderVarintI32
3131
case reflect.Uint32:
32-
return wire.CoderVarint32
32+
return wire.CoderVarintU32
3333
case reflect.Int64, reflect.Uint64:
3434
return wire.CoderVarint64
3535
case reflect.Bool:

‎internal/wire/decoder_map.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@ func init() {
3535
register := func(k, v CoderType, f DecodeFunc) {
3636
mapDecoderFuncs[mapDecoderFuncKey{K: k, V: v}] = f
3737
}
38-
register(CoderVarint32, CoderVarint32, DecodeMap_VarintU32_VarintU32)
39-
register(CoderVarint32, CoderVarint64, DecodeMap_VarintU32_VarintU64)
40-
register(CoderVarint32, CoderZigZag32, DecodeMap_VarintU32_ZigZag32)
41-
register(CoderVarint32, CoderZigZag64, DecodeMap_VarintU32_ZigZag64)
42-
register(CoderVarint32, CoderFixed32, DecodeMap_VarintU32_Fixed32)
43-
register(CoderVarint32, CoderFixed64, DecodeMap_VarintU32_Fixed64)
44-
register(CoderVarint32, CoderBool, DecodeMap_VarintU32_Bool)
45-
46-
// CoderVarintI32 uses the same decoders as CoderVarint32: varint decode truncates to int32
38+
register(CoderVarintU32, CoderVarintU32, DecodeMap_VarintU32_VarintU32)
39+
register(CoderVarintU32, CoderVarint64, DecodeMap_VarintU32_VarintU64)
40+
register(CoderVarintU32, CoderZigZag32, DecodeMap_VarintU32_ZigZag32)
41+
register(CoderVarintU32, CoderZigZag64, DecodeMap_VarintU32_ZigZag64)
42+
register(CoderVarintU32, CoderFixed32, DecodeMap_VarintU32_Fixed32)
43+
register(CoderVarintU32, CoderFixed64, DecodeMap_VarintU32_Fixed64)
44+
register(CoderVarintU32, CoderBool, DecodeMap_VarintU32_Bool)
45+
46+
// CoderVarintI32 uses the same decoders as CoderVarintU32: varint decode truncates to int32
4747
register(CoderVarintI32, CoderVarintI32, DecodeMap_VarintU32_VarintU32)
48-
register(CoderVarintI32, CoderVarint32, DecodeMap_VarintU32_VarintU32)
48+
register(CoderVarintI32, CoderVarintU32, DecodeMap_VarintU32_VarintU32)
4949
register(CoderVarintI32, CoderVarint64, DecodeMap_VarintU32_VarintU64)
5050
register(CoderVarintI32, CoderZigZag32, DecodeMap_VarintU32_ZigZag32)
5151
register(CoderVarintI32, CoderZigZag64, DecodeMap_VarintU32_ZigZag64)
@@ -54,7 +54,7 @@ func init() {
5454
register(CoderVarintI32, CoderBool, DecodeMap_VarintU32_Bool)
5555

5656
register(CoderVarint64, CoderVarintI32, DecodeMap_VarintU64_VarintU32)
57-
register(CoderVarint64, CoderVarint32, DecodeMap_VarintU64_VarintU32)
57+
register(CoderVarint64, CoderVarintU32, DecodeMap_VarintU64_VarintU32)
5858
register(CoderVarint64, CoderVarint64, DecodeMap_VarintU64_VarintU64)
5959
register(CoderVarint64, CoderZigZag32, DecodeMap_VarintU64_ZigZag32)
6060
register(CoderVarint64, CoderZigZag64, DecodeMap_VarintU64_ZigZag64)
@@ -63,7 +63,7 @@ func init() {
6363
register(CoderVarint64, CoderBool, DecodeMap_VarintU64_Bool)
6464

6565
register(CoderZigZag32, CoderVarintI32, DecodeMap_ZigZag32_VarintU32)
66-
register(CoderZigZag32, CoderVarint32, DecodeMap_ZigZag32_VarintU32)
66+
register(CoderZigZag32, CoderVarintU32, DecodeMap_ZigZag32_VarintU32)
6767
register(CoderZigZag32, CoderVarint64, DecodeMap_ZigZag32_VarintU64)
6868
register(CoderZigZag32, CoderZigZag32, DecodeMap_ZigZag32_ZigZag32)
6969
register(CoderZigZag32, CoderZigZag64, DecodeMap_ZigZag32_ZigZag64)
@@ -72,7 +72,7 @@ func init() {
7272
register(CoderZigZag32, CoderBool, DecodeMap_ZigZag32_Bool)
7373

7474
register(CoderZigZag64, CoderVarintI32, DecodeMap_ZigZag64_VarintU32)
75-
register(CoderZigZag64, CoderVarint32, DecodeMap_ZigZag64_VarintU32)
75+
register(CoderZigZag64, CoderVarintU32, DecodeMap_ZigZag64_VarintU32)
7676
register(CoderZigZag64, CoderVarint64, DecodeMap_ZigZag64_VarintU64)
7777
register(CoderZigZag64, CoderZigZag32, DecodeMap_ZigZag64_ZigZag32)
7878
register(CoderZigZag64, CoderZigZag64, DecodeMap_ZigZag64_ZigZag64)
@@ -81,7 +81,7 @@ func init() {
8181
register(CoderZigZag64, CoderBool, DecodeMap_ZigZag64_Bool)
8282

8383
register(CoderFixed32, CoderVarintI32, DecodeMap_Fixed32_VarintU32)
84-
register(CoderFixed32, CoderVarint32, DecodeMap_Fixed32_VarintU32)
84+
register(CoderFixed32, CoderVarintU32, DecodeMap_Fixed32_VarintU32)
8585
register(CoderFixed32, CoderVarint64, DecodeMap_Fixed32_VarintU64)
8686
register(CoderFixed32, CoderZigZag32, DecodeMap_Fixed32_ZigZag32)
8787
register(CoderFixed32, CoderZigZag64, DecodeMap_Fixed32_ZigZag64)
@@ -90,15 +90,15 @@ func init() {
9090
register(CoderFixed32, CoderBool, DecodeMap_Fixed32_Bool)
9191

9292
register(CoderFixed64, CoderVarintI32, DecodeMap_Fixed64_VarintU32)
93-
register(CoderFixed64, CoderVarint32, DecodeMap_Fixed64_VarintU32)
93+
register(CoderFixed64, CoderVarintU32, DecodeMap_Fixed64_VarintU32)
9494
register(CoderFixed64, CoderVarint64, DecodeMap_Fixed64_VarintU64)
9595
register(CoderFixed64, CoderZigZag32, DecodeMap_Fixed64_ZigZag32)
9696
register(CoderFixed64, CoderZigZag64, DecodeMap_Fixed64_ZigZag64)
9797
register(CoderFixed64, CoderFixed32, DecodeMap_Fixed64_Fixed32)
9898
register(CoderFixed64, CoderFixed64, DecodeMap_Fixed64_Fixed64)
9999
register(CoderFixed64, CoderBool, DecodeMap_Fixed64_Bool)
100100

101-
register(CoderBool, CoderVarint32, DecodeMap_Bool_VarintU32)
101+
register(CoderBool, CoderVarintU32, DecodeMap_Bool_VarintU32)
102102
register(CoderBool, CoderVarint64, DecodeMap_Bool_VarintU64)
103103
register(CoderBool, CoderZigZag32, DecodeMap_Bool_ZigZag32)
104104
register(CoderBool, CoderZigZag64, DecodeMap_Bool_ZigZag64)

‎internal/wire/decoder_packed.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
)
2525

2626
func init() {
27-
packedDecoderFuncs[CoderVarint32] = DecodePackedVarintU32
27+
packedDecoderFuncs[CoderVarintU32] = DecodePackedVarintU32
2828
packedDecoderFuncs[CoderVarintI32] = DecodePackedVarintU32 // decode is the same: read varint, truncate
2929
packedDecoderFuncs[CoderVarint64] = DecodePackedVarintU64
3030
packedDecoderFuncs[CoderZigZag32] = DecodePackedZigZag32

‎internal/wire/encoder.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ type AppendFunc func(b []byte, p unsafe.Pointer) []byte
2727
type AppendRepeatedFunc func(b []byte, tag uint64, p unsafe.Pointer) []byte
2828

2929
var appendFuncs = map[CoderType]AppendFunc{
30-
CoderVarint32: UnsafeAppendVarintU32,
30+
CoderVarintU32: UnsafeAppendVarintU32,
3131
CoderVarintI32: UnsafeAppendVarintI32,
3232
CoderVarint64: UnsafeAppendVarintU64,
3333
CoderZigZag32: UnsafeAppendZigZag32,

‎internal/wire/encoder_list.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
)
2222

2323
var appendListFuncs = map[CoderType]AppendRepeatedFunc{
24-
CoderVarint32: UnsafeAppendVarintU32List,
24+
CoderVarintU32: UnsafeAppendVarintU32List,
2525
CoderVarintI32: UnsafeAppendVarintI32List,
2626
CoderVarint64: UnsafeAppendVarintU64List,
2727
CoderZigZag32: UnsafeAppendZigZag32List,

‎internal/wire/encoder_map.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,21 +35,21 @@ func init() {
3535
mapEncoderFuncs[mapEncoderFuncKey{K: k, V: v}] = f
3636
}
3737

38-
register(CoderVarint32, CoderVarint32, AppendMap_VarintU32_VarintU32)
39-
register(CoderVarint32, CoderVarint64, AppendMap_VarintU32_VarintU64)
40-
register(CoderVarint32, CoderZigZag32, AppendMap_VarintU32_ZigZag32)
41-
register(CoderVarint32, CoderZigZag64, AppendMap_VarintU32_ZigZag64)
42-
register(CoderVarint32, CoderFixed32, AppendMap_VarintU32_Fixed32)
43-
register(CoderVarint32, CoderFixed64, AppendMap_VarintU32_Fixed64)
44-
register(CoderVarint32, CoderBool, AppendMap_VarintU32_Bool)
45-
register(CoderVarint32, CoderBytes, AppendMap_VarintU32_Bytes)
46-
register(CoderVarint32, CoderString, AppendMap_VarintU32_String)
38+
register(CoderVarintU32, CoderVarintU32, AppendMap_VarintU32_VarintU32)
39+
register(CoderVarintU32, CoderVarint64, AppendMap_VarintU32_VarintU64)
40+
register(CoderVarintU32, CoderZigZag32, AppendMap_VarintU32_ZigZag32)
41+
register(CoderVarintU32, CoderZigZag64, AppendMap_VarintU32_ZigZag64)
42+
register(CoderVarintU32, CoderFixed32, AppendMap_VarintU32_Fixed32)
43+
register(CoderVarintU32, CoderFixed64, AppendMap_VarintU32_Fixed64)
44+
register(CoderVarintU32, CoderBool, AppendMap_VarintU32_Bool)
45+
register(CoderVarintU32, CoderBytes, AppendMap_VarintU32_Bytes)
46+
register(CoderVarintU32, CoderString, AppendMap_VarintU32_String)
4747

4848
// CoderVarintI32 map encoders: no fast-path registration.
4949
// Falls through to generic path which uses f.KeyAppendFunc/f.ValAppendFunc
5050
// with proper sign extension via UnsafeAppendVarintI32.
5151

52-
register(CoderVarint64, CoderVarint32, AppendMap_VarintU64_VarintU32)
52+
register(CoderVarint64, CoderVarintU32, AppendMap_VarintU64_VarintU32)
5353
register(CoderVarint64, CoderVarint64, AppendMap_VarintU64_VarintU64)
5454
register(CoderVarint64, CoderZigZag32, AppendMap_VarintU64_ZigZag32)
5555
register(CoderVarint64, CoderZigZag64, AppendMap_VarintU64_ZigZag64)
@@ -59,7 +59,7 @@ func init() {
5959
register(CoderVarint64, CoderBytes, AppendMap_VarintU64_Bytes)
6060
register(CoderVarint64, CoderString, AppendMap_VarintU64_String)
6161

62-
register(CoderZigZag32, CoderVarint32, AppendMap_ZigZag32_VarintU32)
62+
register(CoderZigZag32, CoderVarintU32, AppendMap_ZigZag32_VarintU32)
6363
register(CoderZigZag32, CoderVarint64, AppendMap_ZigZag32_VarintU64)
6464
register(CoderZigZag32, CoderZigZag32, AppendMap_ZigZag32_ZigZag32)
6565
register(CoderZigZag32, CoderZigZag64, AppendMap_ZigZag32_ZigZag64)
@@ -69,7 +69,7 @@ func init() {
6969
register(CoderZigZag32, CoderBytes, AppendMap_ZigZag32_Bytes)
7070
register(CoderZigZag32, CoderString, AppendMap_ZigZag32_String)
7171

72-
register(CoderZigZag64, CoderVarint32, AppendMap_ZigZag64_VarintU32)
72+
register(CoderZigZag64, CoderVarintU32, AppendMap_ZigZag64_VarintU32)
7373
register(CoderZigZag64, CoderVarint64, AppendMap_ZigZag64_VarintU64)
7474
register(CoderZigZag64, CoderZigZag32, AppendMap_ZigZag64_ZigZag32)
7575
register(CoderZigZag64, CoderZigZag64, AppendMap_ZigZag64_ZigZag64)
@@ -79,7 +79,7 @@ func init() {
7979
register(CoderZigZag64, CoderBytes, AppendMap_ZigZag64_Bytes)
8080
register(CoderZigZag64, CoderString, AppendMap_ZigZag64_String)
8181

82-
register(CoderFixed32, CoderVarint32, AppendMap_Fixed32_VarintU32)
82+
register(CoderFixed32, CoderVarintU32, AppendMap_Fixed32_VarintU32)
8383
register(CoderFixed32, CoderVarint64, AppendMap_Fixed32_VarintU64)
8484
register(CoderFixed32, CoderZigZag32, AppendMap_Fixed32_ZigZag32)
8585
register(CoderFixed32, CoderZigZag64, AppendMap_Fixed32_ZigZag64)
@@ -89,7 +89,7 @@ func init() {
8989
register(CoderFixed32, CoderBytes, AppendMap_Fixed32_Bytes)
9090
register(CoderFixed32, CoderString, AppendMap_Fixed32_String)
9191

92-
register(CoderFixed64, CoderVarint32, AppendMap_Fixed64_VarintU32)
92+
register(CoderFixed64, CoderVarintU32, AppendMap_Fixed64_VarintU32)
9393
register(CoderFixed64, CoderVarint64, AppendMap_Fixed64_VarintU64)
9494
register(CoderFixed64, CoderZigZag32, AppendMap_Fixed64_ZigZag32)
9595
register(CoderFixed64, CoderZigZag64, AppendMap_Fixed64_ZigZag64)
@@ -99,7 +99,7 @@ func init() {
9999
register(CoderFixed64, CoderBytes, AppendMap_Fixed64_Bytes)
100100
register(CoderFixed64, CoderString, AppendMap_Fixed64_String)
101101

102-
register(CoderBool, CoderVarint32, AppendMap_Bool_VarintU32)
102+
register(CoderBool, CoderVarintU32, AppendMap_Bool_VarintU32)
103103
register(CoderBool, CoderVarint64, AppendMap_Bool_VarintU64)
104104
register(CoderBool, CoderZigZag32, AppendMap_Bool_ZigZag32)
105105
register(CoderBool, CoderZigZag64, AppendMap_Bool_ZigZag64)
@@ -109,7 +109,7 @@ func init() {
109109
register(CoderBool, CoderBytes, AppendMap_Bool_Bytes)
110110
register(CoderBool, CoderString, AppendMap_Bool_String)
111111

112-
register(CoderString, CoderVarint32, AppendMap_String_VarintU32)
112+
register(CoderString, CoderVarintU32, AppendMap_String_VarintU32)
113113
register(CoderString, CoderVarint64, AppendMap_String_VarintU64)
114114
register(CoderString, CoderZigZag32, AppendMap_String_ZigZag32)
115115
register(CoderString, CoderZigZag64, AppendMap_String_ZigZag64)

‎internal/wire/encoder_packed.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ package wire
1919
import "unsafe"
2020

2121
func init() {
22-
appendPackedFuncs[CoderVarint32] = UnsafeAppendPackedVarintU32
22+
appendPackedFuncs[CoderVarintU32] = UnsafeAppendPackedVarintU32
2323
appendPackedFuncs[CoderVarintI32] = UnsafeAppendPackedVarintI32
2424
appendPackedFuncs[CoderVarint64] = UnsafeAppendPackedVarintU64
2525
appendPackedFuncs[CoderZigZag32] = UnsafeAppendPackedZigZag32

‎internal/wire/size.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
type SizeFunc func(p unsafe.Pointer) int
2626

2727
var sizeFuncs = map[CoderType]SizeFunc{
28-
CoderVarint32: UnsafeSizeVarintU32,
28+
CoderVarintU32: UnsafeSizeVarintU32,
2929
CoderVarintI32: UnsafeSizeVarintI32,
3030
CoderVarint64: UnsafeSizeVarintU64,
3131
CoderZigZag32: UnsafeSizeZigZag32,

‎internal/wire/size_map.go‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -68,20 +68,20 @@ func init() {
6868
mapSizeFuncs[mapEncoderFuncKey{K: k, V: v}] = f
6969
}
7070

71-
// CoderVarint32 keys (Go: uint32)
72-
reg(CoderVarint32, CoderVarint32, makeSizeMap(szVarintU32, szVarintU32))
73-
reg(CoderVarint32, CoderVarintI32, makeSizeMap(szVarintU32, szVarintI32))
74-
reg(CoderVarint32, CoderVarint64, makeSizeMap(szVarintU32, szVarintU64))
75-
reg(CoderVarint32, CoderZigZag32, makeSizeMap(szVarintU32, szZigZag32))
76-
reg(CoderVarint32, CoderZigZag64, makeSizeMap(szVarintU32, szZigZag64))
77-
reg(CoderVarint32, CoderFixed32, makeSizeMap(szVarintU32, szFixed32))
78-
reg(CoderVarint32, CoderFixed64, makeSizeMap(szVarintU32, szFixed64))
79-
reg(CoderVarint32, CoderBool, makeSizeMap(szVarintU32, szBool))
80-
reg(CoderVarint32, CoderBytes, makeSizeMap(szVarintU32, szByteSlice))
81-
reg(CoderVarint32, CoderString, makeSizeMap(szVarintU32, szString))
71+
// CoderVarintU32 keys (Go: uint32)
72+
reg(CoderVarintU32, CoderVarintU32, makeSizeMap(szVarintU32, szVarintU32))
73+
reg(CoderVarintU32, CoderVarintI32, makeSizeMap(szVarintU32, szVarintI32))
74+
reg(CoderVarintU32, CoderVarint64, makeSizeMap(szVarintU32, szVarintU64))
75+
reg(CoderVarintU32, CoderZigZag32, makeSizeMap(szVarintU32, szZigZag32))
76+
reg(CoderVarintU32, CoderZigZag64, makeSizeMap(szVarintU32, szZigZag64))
77+
reg(CoderVarintU32, CoderFixed32, makeSizeMap(szVarintU32, szFixed32))
78+
reg(CoderVarintU32, CoderFixed64, makeSizeMap(szVarintU32, szFixed64))
79+
reg(CoderVarintU32, CoderBool, makeSizeMap(szVarintU32, szBool))
80+
reg(CoderVarintU32, CoderBytes, makeSizeMap(szVarintU32, szByteSlice))
81+
reg(CoderVarintU32, CoderString, makeSizeMap(szVarintU32, szString))
8282

8383
// CoderVarintI32 keys (Go: int32, signed varint)
84-
reg(CoderVarintI32, CoderVarint32, makeSizeMap(szVarintI32, szVarintU32))
84+
reg(CoderVarintI32, CoderVarintU32, makeSizeMap(szVarintI32, szVarintU32))
8585
reg(CoderVarintI32, CoderVarintI32, makeSizeMap(szVarintI32, szVarintI32))
8686
reg(CoderVarintI32, CoderVarint64, makeSizeMap(szVarintI32, szVarintU64))
8787
reg(CoderVarintI32, CoderZigZag32, makeSizeMap(szVarintI32, szZigZag32))
@@ -93,7 +93,7 @@ func init() {
9393
reg(CoderVarintI32, CoderString, makeSizeMap(szVarintI32, szString))
9494

9595
// CoderVarint64 keys (Go: uint64)
96-
reg(CoderVarint64, CoderVarint32, makeSizeMap(szVarintU64, szVarintU32))
96+
reg(CoderVarint64, CoderVarintU32, makeSizeMap(szVarintU64, szVarintU32))
9797
reg(CoderVarint64, CoderVarintI32, makeSizeMap(szVarintU64, szVarintI32))
9898
reg(CoderVarint64, CoderVarint64, makeSizeMap(szVarintU64, szVarintU64))
9999
reg(CoderVarint64, CoderZigZag32, makeSizeMap(szVarintU64, szZigZag32))
@@ -105,7 +105,7 @@ func init() {
105105
reg(CoderVarint64, CoderString, makeSizeMap(szVarintU64, szString))
106106

107107
// CoderZigZag32 keys (Go: int32)
108-
reg(CoderZigZag32, CoderVarint32, makeSizeMap(szZigZag32, szVarintU32))
108+
reg(CoderZigZag32, CoderVarintU32, makeSizeMap(szZigZag32, szVarintU32))
109109
reg(CoderZigZag32, CoderVarintI32, makeSizeMap(szZigZag32, szVarintI32))
110110
reg(CoderZigZag32, CoderVarint64, makeSizeMap(szZigZag32, szVarintU64))
111111
reg(CoderZigZag32, CoderZigZag32, makeSizeMap(szZigZag32, szZigZag32))
@@ -117,7 +117,7 @@ func init() {
117117
reg(CoderZigZag32, CoderString, makeSizeMap(szZigZag32, szString))
118118

119119
// CoderZigZag64 keys (Go: int64)
120-
reg(CoderZigZag64, CoderVarint32, makeSizeMap(szZigZag64, szVarintU32))
120+
reg(CoderZigZag64, CoderVarintU32, makeSizeMap(szZigZag64, szVarintU32))
121121
reg(CoderZigZag64, CoderVarintI32, makeSizeMap(szZigZag64, szVarintI32))
122122
reg(CoderZigZag64, CoderVarint64, makeSizeMap(szZigZag64, szVarintU64))
123123
reg(CoderZigZag64, CoderZigZag32, makeSizeMap(szZigZag64, szZigZag32))
@@ -129,7 +129,7 @@ func init() {
129129
reg(CoderZigZag64, CoderString, makeSizeMap(szZigZag64, szString))
130130

131131
// CoderFixed32 keys (Go: uint32)
132-
reg(CoderFixed32, CoderVarint32, makeSizeMap(szFixed32, szVarintU32))
132+
reg(CoderFixed32, CoderVarintU32, makeSizeMap(szFixed32, szVarintU32))
133133
reg(CoderFixed32, CoderVarintI32, makeSizeMap(szFixed32, szVarintI32))
134134
reg(CoderFixed32, CoderVarint64, makeSizeMap(szFixed32, szVarintU64))
135135
reg(CoderFixed32, CoderZigZag32, makeSizeMap(szFixed32, szZigZag32))
@@ -141,7 +141,7 @@ func init() {
141141
reg(CoderFixed32, CoderString, makeSizeMap(szFixed32, szString))
142142

143143
// CoderFixed64 keys (Go: uint64)
144-
reg(CoderFixed64, CoderVarint32, makeSizeMap(szFixed64, szVarintU32))
144+
reg(CoderFixed64, CoderVarintU32, makeSizeMap(szFixed64, szVarintU32))
145145
reg(CoderFixed64, CoderVarintI32, makeSizeMap(szFixed64, szVarintI32))
146146
reg(CoderFixed64, CoderVarint64, makeSizeMap(szFixed64, szVarintU64))
147147
reg(CoderFixed64, CoderZigZag32, makeSizeMap(szFixed64, szZigZag32))
@@ -153,7 +153,7 @@ func init() {
153153
reg(CoderFixed64, CoderString, makeSizeMap(szFixed64, szString))
154154

155155
// CoderBool keys (Go: bool)
156-
reg(CoderBool, CoderVarint32, makeSizeMap(szBool, szVarintU32))
156+
reg(CoderBool, CoderVarintU32, makeSizeMap(szBool, szVarintU32))
157157
reg(CoderBool, CoderVarintI32, makeSizeMap(szBool, szVarintI32))
158158
reg(CoderBool, CoderVarint64, makeSizeMap(szBool, szVarintU64))
159159
reg(CoderBool, CoderZigZag32, makeSizeMap(szBool, szZigZag32))
@@ -165,7 +165,7 @@ func init() {
165165
reg(CoderBool, CoderString, makeSizeMap(szBool, szString))
166166

167167
// CoderString keys (Go: string)
168-
reg(CoderString, CoderVarint32, makeSizeMap(szString, szVarintU32))
168+
reg(CoderString, CoderVarintU32, makeSizeMap(szString, szVarintU32))
169169
reg(CoderString, CoderVarintI32, makeSizeMap(szString, szVarintI32))
170170
reg(CoderString, CoderVarint64, makeSizeMap(szString, szVarintU64))
171171
reg(CoderString, CoderZigZag32, makeSizeMap(szString, szZigZag32))

‎internal/wire/wire.go‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,23 @@ func SizeVarint(v uint64) int {
6666
return protowire.SizeVarint(v)
6767
}
6868

69+
// CoderType identifies a protobuf field encoding strategy. It is used as a key
70+
// to look up type-specialized encode, decode, and size functions (AppendFunc,
71+
// SizeFunc, SizeMapFunc, etc.) so the hot path dispatches through a function
72+
// pointer instead of a type switch.
6973
type CoderType int8
7074

71-
const ( // used for coder func mapping
72-
CoderVarint32 = 1 + iota
73-
CoderVarint64
74-
CoderVarintI32 // int32 with sign extension to 64-bit
75-
CoderZigZag32
76-
CoderZigZag64
77-
CoderFixed32
78-
CoderFixed64
79-
CoderBytes
80-
CoderString
81-
CoderBool
82-
CoderStruct
83-
CoderUnknown
75+
const (
76+
CoderVarintU32 CoderType = 1 + iota // uint32 varint (also used for enum uint32)
77+
CoderVarintI32 // int32 varint, sign-extended to 64-bit per protobuf spec
78+
CoderVarint64 // uint64 varint
79+
CoderZigZag32 // sint32 zigzag encoding
80+
CoderZigZag64 // sint64 zigzag encoding
81+
CoderFixed32 // fixed32 / sfixed32 / float (4-byte little-endian)
82+
CoderFixed64 // fixed64 / sfixed64 / double (8-byte little-endian)
83+
CoderBytes // bytes (length-prefixed)
84+
CoderString // string (length-prefixed)
85+
CoderBool // bool (single varint byte)
86+
CoderStruct // embedded message (length-prefixed, recursive)
87+
CoderUnknown // unsupported or unresolved type
8488
)

0 commit comments

Comments
 (0)