Skip to content

Commit 00650f6

Browse files
committed
code health: replace deprecated EncodeSliceLen and DecodeSliceLen
EncodeSliceLen[1] and DecodeSliceLen[2] are marked as deprecated in msgpack v2.9.2. The patch replaces it with EncodeArrayLen and DecodeArrayLen. 1. https://pkg.go.dev/github.com/vmihailenco/[email protected]+incompatible#Encoder.EncodeSliceLen 2. https://pkg.go.dev/github.com/vmihailenco/[email protected]+incompatible#Decoder.DecodeSliceLen Part of #124
1 parent d955230 commit 00650f6

10 files changed

+30
-30
lines changed

client_tools.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ type IntKey struct {
1111
}
1212

1313
func (k IntKey) EncodeMsgpack(enc *msgpack.Encoder) error {
14-
enc.EncodeSliceLen(1)
14+
enc.EncodeArrayLen(1)
1515
enc.EncodeInt(k.I)
1616
return nil
1717
}
@@ -23,7 +23,7 @@ type UintKey struct {
2323
}
2424

2525
func (k UintKey) EncodeMsgpack(enc *msgpack.Encoder) error {
26-
enc.EncodeSliceLen(1)
26+
enc.EncodeArrayLen(1)
2727
enc.EncodeUint(k.I)
2828
return nil
2929
}
@@ -35,7 +35,7 @@ type StringKey struct {
3535
}
3636

3737
func (k StringKey) EncodeMsgpack(enc *msgpack.Encoder) error {
38-
enc.EncodeSliceLen(1)
38+
enc.EncodeArrayLen(1)
3939
enc.EncodeString(k.S)
4040
return nil
4141
}
@@ -47,7 +47,7 @@ type IntIntKey struct {
4747
}
4848

4949
func (k IntIntKey) EncodeMsgpack(enc *msgpack.Encoder) error {
50-
enc.EncodeSliceLen(2)
50+
enc.EncodeArrayLen(2)
5151
enc.EncodeInt(k.I1)
5252
enc.EncodeInt(k.I2)
5353
return nil
@@ -61,7 +61,7 @@ type Op struct {
6161
}
6262

6363
func (o Op) EncodeMsgpack(enc *msgpack.Encoder) error {
64-
enc.EncodeSliceLen(3)
64+
enc.EncodeArrayLen(3)
6565
enc.EncodeString(o.Op)
6666
enc.EncodeInt(o.Field)
6767
return enc.Encode(o.Arg)
@@ -149,7 +149,7 @@ type OpSplice struct {
149149
}
150150

151151
func (o OpSplice) EncodeMsgpack(enc *msgpack.Encoder) error {
152-
enc.EncodeSliceLen(5)
152+
enc.EncodeArrayLen(5)
153153
enc.EncodeString(o.Op)
154154
enc.EncodeInt(o.Field)
155155
enc.EncodeInt(o.Pos)

datetime/datetime_test.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ type Tuple1 struct {
271271
}
272272

273273
func (t *Tuple1) EncodeMsgpack(e *msgpack.Encoder) error {
274-
if err := e.EncodeSliceLen(2); err != nil {
274+
if err := e.EncodeArrayLen(2); err != nil {
275275
return err
276276
}
277277
if err := e.Encode(&t.Datetime); err != nil {
@@ -283,7 +283,7 @@ func (t *Tuple1) EncodeMsgpack(e *msgpack.Encoder) error {
283283
func (t *Tuple1) DecodeMsgpack(d *msgpack.Decoder) error {
284284
var err error
285285
var l int
286-
if l, err = d.DecodeSliceLen(); err != nil {
286+
if l, err = d.DecodeArrayLen(); err != nil {
287287
return err
288288
}
289289
if l != 1 {
@@ -297,7 +297,7 @@ func (t *Tuple1) DecodeMsgpack(d *msgpack.Decoder) error {
297297
}
298298

299299
func (ev *Event) EncodeMsgpack(e *msgpack.Encoder) error {
300-
if err := e.EncodeSliceLen(2); err != nil {
300+
if err := e.EncodeArrayLen(2); err != nil {
301301
return err
302302
}
303303
if err := e.EncodeString(ev.Location); err != nil {
@@ -312,7 +312,7 @@ func (ev *Event) EncodeMsgpack(e *msgpack.Encoder) error {
312312
func (ev *Event) DecodeMsgpack(d *msgpack.Decoder) error {
313313
var err error
314314
var l int
315-
if l, err = d.DecodeSliceLen(); err != nil {
315+
if l, err = d.DecodeArrayLen(); err != nil {
316316
return err
317317
}
318318
if l != 2 {
@@ -330,7 +330,7 @@ func (ev *Event) DecodeMsgpack(d *msgpack.Decoder) error {
330330
}
331331

332332
func (c *Tuple2) EncodeMsgpack(e *msgpack.Encoder) error {
333-
if err := e.EncodeSliceLen(3); err != nil {
333+
if err := e.EncodeArrayLen(3); err != nil {
334334
return err
335335
}
336336
if err := e.EncodeUint(c.Cid); err != nil {
@@ -346,7 +346,7 @@ func (c *Tuple2) EncodeMsgpack(e *msgpack.Encoder) error {
346346
func (c *Tuple2) DecodeMsgpack(d *msgpack.Decoder) error {
347347
var err error
348348
var l int
349-
if l, err = d.DecodeSliceLen(); err != nil {
349+
if l, err = d.DecodeArrayLen(); err != nil {
350350
return err
351351
}
352352
if l != 3 {
@@ -358,7 +358,7 @@ func (c *Tuple2) DecodeMsgpack(d *msgpack.Decoder) error {
358358
if c.Orig, err = d.DecodeString(); err != nil {
359359
return err
360360
}
361-
if l, err = d.DecodeSliceLen(); err != nil {
361+
if l, err = d.DecodeArrayLen(); err != nil {
362362
return err
363363
}
364364
c.Events = make([]Event, l)

decimal/decimal_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ type TupleDecimal struct {
4141
}
4242

4343
func (t *TupleDecimal) EncodeMsgpack(e *msgpack.Encoder) error {
44-
if err := e.EncodeSliceLen(1); err != nil {
44+
if err := e.EncodeArrayLen(1); err != nil {
4545
return err
4646
}
4747
return e.EncodeValue(reflect.ValueOf(&t.number))
@@ -50,7 +50,7 @@ func (t *TupleDecimal) EncodeMsgpack(e *msgpack.Encoder) error {
5050
func (t *TupleDecimal) DecodeMsgpack(d *msgpack.Decoder) error {
5151
var err error
5252
var l int
53-
if l, err = d.DecodeSliceLen(); err != nil {
53+
if l, err = d.DecodeArrayLen(); err != nil {
5454
return err
5555
}
5656
if l != 1 {

example_custom_unpacking_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ type Tuple3 struct {
2525
}
2626

2727
func (c *Tuple2) EncodeMsgpack(e *msgpack.Encoder) error {
28-
if err := e.EncodeSliceLen(3); err != nil {
28+
if err := e.EncodeArrayLen(3); err != nil {
2929
return err
3030
}
3131
if err := e.EncodeUint(c.Cid); err != nil {
@@ -41,7 +41,7 @@ func (c *Tuple2) EncodeMsgpack(e *msgpack.Encoder) error {
4141
func (c *Tuple2) DecodeMsgpack(d *msgpack.Decoder) error {
4242
var err error
4343
var l int
44-
if l, err = d.DecodeSliceLen(); err != nil {
44+
if l, err = d.DecodeArrayLen(); err != nil {
4545
return err
4646
}
4747
if l != 3 {
@@ -53,7 +53,7 @@ func (c *Tuple2) DecodeMsgpack(d *msgpack.Decoder) error {
5353
if c.Orig, err = d.DecodeString(); err != nil {
5454
return err
5555
}
56-
if l, err = d.DecodeSliceLen(); err != nil {
56+
if l, err = d.DecodeArrayLen(); err != nil {
5757
return err
5858
}
5959
c.Members = make([]Member, l)

queue/queue.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -339,7 +339,7 @@ type queueData struct {
339339
func (qd *queueData) DecodeMsgpack(d *msgpack.Decoder) error {
340340
var err error
341341
var l int
342-
if l, err = d.DecodeSliceLen(); err != nil {
342+
if l, err = d.DecodeArrayLen(); err != nil {
343343
return err
344344
}
345345
if l > 1 {

queue/queue_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ type customData struct {
186186
func (c *customData) DecodeMsgpack(d *msgpack.Decoder) error {
187187
var err error
188188
var l int
189-
if l, err = d.DecodeSliceLen(); err != nil {
189+
if l, err = d.DecodeArrayLen(); err != nil {
190190
return err
191191
}
192192
if l != 1 {
@@ -199,7 +199,7 @@ func (c *customData) DecodeMsgpack(d *msgpack.Decoder) error {
199199
}
200200

201201
func (c *customData) EncodeMsgpack(e *msgpack.Encoder) error {
202-
if err := e.EncodeSliceLen(1); err != nil {
202+
if err := e.EncodeArrayLen(1); err != nil {
203203
return err
204204
}
205205
if err := e.EncodeString(c.customField); err != nil {

queue/task.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ type Task struct {
1717
func (t *Task) DecodeMsgpack(d *msgpack.Decoder) error {
1818
var err error
1919
var l int
20-
if l, err = d.DecodeSliceLen(); err != nil {
20+
if l, err = d.DecodeArrayLen(); err != nil {
2121
return err
2222
}
2323
if l < 3 {

request.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ type single struct {
200200
func (s *single) DecodeMsgpack(d *msgpack.Decoder) error {
201201
var err error
202202
var len int
203-
if len, err = d.DecodeSliceLen(); err != nil {
203+
if len, err = d.DecodeArrayLen(); err != nil {
204204
return err
205205
}
206206
if s.found = len >= 1; !s.found {
@@ -433,7 +433,7 @@ func encodeSQLBind(enc *msgpack.Encoder, from interface{}) error {
433433
}
434434

435435
encodeNamedFromMap := func(mp map[string]interface{}) error {
436-
if err := enc.EncodeSliceLen(len(mp)); err != nil {
436+
if err := enc.EncodeArrayLen(len(mp)); err != nil {
437437
return err
438438
}
439439
for k, v := range mp {
@@ -445,7 +445,7 @@ func encodeSQLBind(enc *msgpack.Encoder, from interface{}) error {
445445
}
446446

447447
encodeNamedFromStruct := func(val reflect.Value) error {
448-
if err := enc.EncodeSliceLen(val.NumField()); err != nil {
448+
if err := enc.EncodeArrayLen(val.NumField()); err != nil {
449449
return err
450450
}
451451
cached, ok := lowerCaseNames.Load(val.Type())
@@ -479,7 +479,7 @@ func encodeSQLBind(enc *msgpack.Encoder, from interface{}) error {
479479
if !ok {
480480
castedKVSlice := from.([]KeyValueBind)
481481
t := len(castedKVSlice)
482-
if err := enc.EncodeSliceLen(t); err != nil {
482+
if err := enc.EncodeArrayLen(t); err != nil {
483483
return err
484484
}
485485
for _, v := range castedKVSlice {
@@ -490,7 +490,7 @@ func encodeSQLBind(enc *msgpack.Encoder, from interface{}) error {
490490
return nil
491491
}
492492

493-
if err := enc.EncodeSliceLen(len(castedSlice)); err != nil {
493+
if err := enc.EncodeArrayLen(len(castedSlice)); err != nil {
494494
return err
495495
}
496496
for i := 0; i < len(castedSlice); i++ {

tarantool_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ type Member struct {
2727
}
2828

2929
func (m *Member) EncodeMsgpack(e *msgpack.Encoder) error {
30-
if err := e.EncodeSliceLen(2); err != nil {
30+
if err := e.EncodeArrayLen(2); err != nil {
3131
return err
3232
}
3333
if err := e.EncodeString(m.Name); err != nil {
@@ -42,7 +42,7 @@ func (m *Member) EncodeMsgpack(e *msgpack.Encoder) error {
4242
func (m *Member) DecodeMsgpack(d *msgpack.Decoder) error {
4343
var err error
4444
var l int
45-
if l, err = d.DecodeSliceLen(); err != nil {
45+
if l, err = d.DecodeArrayLen(); err != nil {
4646
return err
4747
}
4848
if l != 2 {

uuid/uuid_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ type TupleUUID struct {
3636
func (t *TupleUUID) DecodeMsgpack(d *msgpack.Decoder) error {
3737
var err error
3838
var l int
39-
if l, err = d.DecodeSliceLen(); err != nil {
39+
if l, err = d.DecodeArrayLen(); err != nil {
4040
return err
4141
}
4242
if l != 1 {

0 commit comments

Comments
 (0)