Skip to content

Commit b7038ed

Browse files
period331period331
committed
opt: encoder support Uint64ToString
1 parent 918f5c6 commit b7038ed

File tree

10 files changed

+190
-12
lines changed

10 files changed

+190
-12
lines changed

‎api.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,9 @@ type Config struct {
9494

9595
// Encode Infinity or Nan float into `null`, instead of returning an error.
9696
EncodeNullForInfOrNan bool
97+
98+
// Uint64 into strings on Marshal
99+
Uint64ToString bool
97100
}
98101

99102
var (

‎encode_test.go‎

Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1224,4 +1224,120 @@ func TestMarshalInfOrNan(t *testing.T) {
12241224
assert.NotNil(t, err)
12251225
assert.True(t, strings.Contains(err.Error(), "json: unsupported value: NaN or ±Infinite"))
12261226
}
1227+
}
1228+
1229+
func TestUint64ToString(t *testing.T) {
1230+
int64ptr := int64(432556670863027541)
1231+
uint64ptr := uint64(12372850276778298372)
1232+
cases := []struct {
1233+
name string
1234+
val any
1235+
exceptTrue string
1236+
exceptFalse string
1237+
}{
1238+
{
1239+
name: "normal_map",
1240+
val: map[string]any{
1241+
"int": int(12),
1242+
"int64": int64(34),
1243+
"uint64": uint64(56),
1244+
},
1245+
exceptTrue: `{"int":12,"int64":34,"uint64":"56"}`,
1246+
exceptFalse: `{"int":12,"int64":34,"uint64":56}`,
1247+
},
1248+
{
1249+
name: "int_key_map",
1250+
val: map[int64]any{
1251+
int64(12): int(12),
1252+
int64(34): int64(34),
1253+
int64(56): uint64(56),
1254+
},
1255+
exceptTrue: `{"12":12,"34":34,"56":"56"}`,
1256+
exceptFalse: `{"12":12,"34":34,"56":56}`,
1257+
},
1258+
{
1259+
name: "uint_key_map",
1260+
val: map[uint64]any{
1261+
uint64(12): int(12),
1262+
uint64(34): int64(34),
1263+
uint64(56): uint64(56),
1264+
},
1265+
exceptTrue: `{"12":12,"34":34,"56":"56"}`,
1266+
exceptFalse: `{"12":12,"34":34,"56":56}`,
1267+
},
1268+
{
1269+
name: "normal_struct",
1270+
val: struct {
1271+
Int int `json:"int"`
1272+
Int64 int64 `json:"int64"`
1273+
Uint64 uint64 `json:"uint64"`
1274+
}{
1275+
Int: int(12),
1276+
Int64: int64(34),
1277+
Uint64: uint64(56),
1278+
},
1279+
exceptTrue: `{"int":12,"int64":34,"uint64":"56"}`,
1280+
exceptFalse: `{"int":12,"int64":34,"uint64":56}`,
1281+
},
1282+
{
1283+
name: "normal_slice",
1284+
val: []any{
1285+
int(12), int64(34), uint64(56),
1286+
},
1287+
exceptTrue: `[12,34,"56"]`,
1288+
exceptFalse: `[12,34,56]`,
1289+
},
1290+
{
1291+
name: "single_int64",
1292+
val: int64(34),
1293+
exceptTrue: `34`,
1294+
exceptFalse: `34`,
1295+
},
1296+
{
1297+
name: "single_uint64",
1298+
val: uint64(56),
1299+
exceptTrue: `"56"`,
1300+
exceptFalse: `56`,
1301+
},
1302+
{
1303+
name: "int64ptr",
1304+
val: struct {
1305+
Map map[string]any
1306+
}{map[string]any{"val": struct {
1307+
Int64Ptr any
1308+
Uint64Ptr any
1309+
Int64 any
1310+
Uint64 any
1311+
}{
1312+
Int64Ptr: &int64ptr,
1313+
Uint64Ptr: &uint64ptr,
1314+
Int64: int64(123),
1315+
Uint64: uint64(456),
1316+
}}},
1317+
exceptTrue: `{"Map":{"val":{"Int64Ptr":432556670863027541,` +
1318+
`"Uint64Ptr":"12372850276778298372","Int64":123,"Uint64":"456"}}}`,
1319+
exceptFalse: `{"Map":{"val":{"Int64Ptr":432556670863027541,` +
1320+
`"Uint64Ptr":12372850276778298372,"Int64":123,"Uint64":456}}}`,
1321+
},
1322+
}
1323+
1324+
check := func(t *testing.T, except string, testRes []byte) {
1325+
var tmp1 any
1326+
assert.Nil(t, Unmarshal([]byte(testRes), &tmp1))
1327+
var tmp2 any
1328+
assert.Nil(t, Unmarshal([]byte(except), &tmp2))
1329+
assert.Equal(t, tmp2, tmp1)
1330+
}
1331+
1332+
for _, c := range cases {
1333+
t.Run(c.name, func(t *testing.T) {
1334+
b, e := Config{Uint64ToString: true}.Froze().Marshal(c.val)
1335+
assert.Nil(t, e)
1336+
check(t, c.exceptTrue, b)
1337+
1338+
b, e = Config{Uint64ToString: false}.Froze().Marshal(c.val)
1339+
assert.Nil(t, e)
1340+
check(t, c.exceptFalse, b)
1341+
})
1342+
}
12271343
}

‎encoder/encoder_native.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ const (
7373

7474
// Encode Infinity or Nan float into `null`, instead of returning an error.
7575
EncodeNullForInfOrNan Options = encoder.EncodeNullForInfOrNan
76+
77+
// Uint64 into strings on Marshal
78+
Uint64ToString Options = encoder.Uint64ToString
7679
)
7780

7881

‎internal/encoder/alg/opts.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ const (
2525
BitValidateString
2626
BitNoValidateJSONMarshaler
2727
BitNoEncoderNewline
28-
BitEncodeNullForInfOrNan
28+
BitEncodeNullForInfOrNan
29+
BitUint64ToString
2930

3031
BitPointerValue = 63
3132
)

‎internal/encoder/compiler.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ func (self *Compiler) compileOps(p *ir.Program, sp int, vt reflect.Type) {
179179
case reflect.Bool:
180180
p.Add(ir.OP_bool)
181181
case reflect.Int:
182-
p.Add(ir.OP_int())
182+
p.Add(ir.OP_int(), ir.OP_i)
183183
case reflect.Int8:
184184
p.Add(ir.OP_i8)
185185
case reflect.Int16:
@@ -189,7 +189,7 @@ func (self *Compiler) compileOps(p *ir.Program, sp int, vt reflect.Type) {
189189
case reflect.Int64:
190190
p.Add(ir.OP_i64)
191191
case reflect.Uint:
192-
p.Add(ir.OP_uint())
192+
p.Add(ir.OP_uint(), ir.OP_ui)
193193
case reflect.Uint8:
194194
p.Add(ir.OP_u8)
195195
case reflect.Uint16:
@@ -301,7 +301,7 @@ func (self *Compiler) compileMapBodyTextKey(p *ir.Program, vk reflect.Type) {
301301
case reflect.Bool:
302302
p.Key(ir.OP_bool)
303303
case reflect.Int:
304-
p.Key(ir.OP_int())
304+
p.Key(ir.OP_int(), ir.OP_i)
305305
case reflect.Int8:
306306
p.Key(ir.OP_i8)
307307
case reflect.Int16:
@@ -311,7 +311,7 @@ func (self *Compiler) compileMapBodyTextKey(p *ir.Program, vk reflect.Type) {
311311
case reflect.Int64:
312312
p.Key(ir.OP_i64)
313313
case reflect.Uint:
314-
p.Key(ir.OP_uint())
314+
p.Key(ir.OP_uint(), ir.OP_ui)
315315
case reflect.Uint8:
316316
p.Key(ir.OP_u8)
317317
case reflect.Uint16:

‎internal/encoder/encoder.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@ const (
7373

7474
// Encode Infinity or Nan float into `null`, instead of returning an error.
7575
EncodeNullForInfOrNan Options = 1 << alg.BitEncodeNullForInfOrNan
76+
77+
// Uint64 into strings on Marshal
78+
Uint64ToString Options = 1 << alg.BitUint64ToString
7679
)
7780

7881
// Encoder represents a specific set of encoder configurations.

‎internal/encoder/ir/op.go‎

Lines changed: 32 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,12 @@ const (
3838
OP_i16
3939
OP_i32
4040
OP_i64
41+
OP_i
4142
OP_u8
4243
OP_u16
4344
OP_u32
4445
OP_u64
46+
OP_ui
4547
OP_f32
4648
OP_f64
4749
OP_str
@@ -99,10 +101,12 @@ var OpNames = [256]string{
99101
OP_i16: "i16",
100102
OP_i32: "i32",
101103
OP_i64: "i64",
104+
OP_i: "i",
102105
OP_u8: "u8",
103106
OP_u16: "u16",
104107
OP_u32: "u32",
105108
OP_u64: "u64",
109+
OP_ui: "ui",
106110
OP_f32: "f32",
107111
OP_f64: "f64",
108112
OP_str: "str",
@@ -197,12 +201,26 @@ func OP_is_zero_ints() Op {
197201

198202
type Instr struct {
199203
o Op
204+
co Op
205+
mapKey bool
200206
u int // union {op: 8, _: 8, vi: 48}, vi maybe int or len(str)
201207
p unsafe.Pointer // maybe GoString.Ptr, or *GoType
202208
}
203209

204-
func NewInsOp(op Op) Instr {
205-
return Instr{o: op}
210+
func NewInsOp(op Op, compatOp ...Op) Instr {
211+
i := Instr{o: op, co: op}
212+
if len(compatOp) == 1 {
213+
i.co = compatOp[0]
214+
}
215+
return i
216+
}
217+
218+
func NewInsKeyOp(op Op, compatOp ...Op) Instr {
219+
i := Instr{o: op, co: op, mapKey: true}
220+
if len(compatOp) == 1 {
221+
i.co = compatOp[0]
222+
}
223+
return i
206224
}
207225

208226
func NewInsVi(op Op, vi int) Instr {
@@ -255,6 +273,14 @@ func (self Instr) Op() Op {
255273
return Op(self.o)
256274
}
257275

276+
func (self Instr) CompatOp() Op {
277+
return Op(self.co)
278+
}
279+
280+
func (self Instr) IsMapKey() bool {
281+
return self.mapKey
282+
}
283+
258284
func (self Instr) Vi() int {
259285
return self.u
260286
}
@@ -410,14 +436,14 @@ func (self Program) Rel(v []int) {
410436
}
411437
}
412438

413-
func (self *Program) Add(op Op) {
414-
*self = append(*self, NewInsOp(op))
439+
func (self *Program) Add(op Op, co ...Op) {
440+
*self = append(*self, NewInsOp(op, co...))
415441
}
416442

417-
func (self *Program) Key(op Op) {
443+
func (self *Program) Key(op Op, co ...Op) {
418444
*self = append(*self,
419445
NewInsVi(OP_byte, '"'),
420-
NewInsOp(op),
446+
NewInsKeyOp(op, co...),
421447
NewInsVi(OP_byte, '"'),
422448
)
423449
}

‎internal/encoder/vm/vm.go‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,8 +152,18 @@ func Execute(b *[]byte, p unsafe.Pointer, s *vars.Stack, flags uint64, prog *ir.
152152
v := *(*uint32)(p)
153153
buf = alg.U64toa(buf, uint64(v))
154154
case ir.OP_u64:
155+
quote := false
156+
if ins.CompatOp() == ir.OP_u64 &&
157+
!ins.IsMapKey() &&
158+
flags&(1<<alg.BitUint64ToString) != 0 {
159+
buf = append(buf, '"')
160+
quote = true
161+
}
155162
v := *(*uint64)(p)
156163
buf = alg.U64toa(buf, uint64(v))
164+
if quote {
165+
buf = append(buf, '"')
166+
}
157167
case ir.OP_f32:
158168
v := *(*float32)(p)
159169
if math.IsNaN(float64(v)) || math.IsInf(float64(v), 0) {

‎internal/encoder/x86/assembler_regabi_amd64.go‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -860,8 +860,21 @@ func (self *Assembler) _asm_OP_u32(_ *ir.Instr) {
860860
self.store_int(16, _F_u64toa, "MOVLQZX")
861861
}
862862

863-
func (self *Assembler) _asm_OP_u64(_ *ir.Instr) {
863+
func (self *Assembler) _asm_OP_u64(i *ir.Instr) {
864+
if i.CompatOp() == ir.OP_i || i.IsMapKey() {
865+
self.store_int(20, _F_u64toa, "MOVQ")
866+
return
867+
}
868+
self.Emit("BTQ", jit.Imm(int64(alg.BitUint64ToString)), _ARG_fv)
869+
self.Sjmp("JC", "_ui64_to_string{n}")
870+
self.store_int(20, _F_u64toa, "MOVQ")
871+
self.Sjmp("JMP", "_ui64_to_string_end{n}")
872+
self.Link("_ui64_to_string{n}")
873+
874+
self.add_char('"')
864875
self.store_int(20, _F_u64toa, "MOVQ")
876+
self.add_char('"')
877+
self.Link("_ui64_to_string_end{n}")
865878
}
866879

867880
func (self *Assembler) _asm_OP_f32(_ *ir.Instr) {

‎sonic.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,9 @@ func (cfg Config) Froze() API {
7070
if cfg.EncodeNullForInfOrNan {
7171
api.encoderOpts |= encoder.EncodeNullForInfOrNan
7272
}
73+
if cfg.Uint64ToString {
74+
api.encoderOpts |= encoder.Uint64ToString
75+
}
7376

7477
// configure decoder options:
7578
if cfg.NoValidateJSONSkip {

0 commit comments

Comments
 (0)