code health: replace deprecated EncodeSliceLen and DecodeSliceLen

oleg-jukovec · oleg-jukovec · commit 283d54986f31 · 2022-06-02T15:44:53.000+03:00
EncodeSlieceLen[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/msgpack@v2.9.2+incompatible#Encoder.EncodeSliceLen 2. https://pkg.go.dev/github.com/vmihailenco/msgpack@v2.9.2+incompatible#Decoder.DecodeSliceLen Part of #124
diff --git a/client_tools.go b/client_tools.go
@@ -11,7 +11,7 @@ type IntKey struct {
 }
 
 func (k IntKey) EncodeMsgpack(enc *msgpack.Encoder) error {
-	enc.EncodeSliceLen(1)
+	enc.EncodeArrayLen(1)
 	enc.EncodeInt(k.I)
 	return nil
 }
@@ -23,7 +23,7 @@ type UintKey struct {
 }
 
 func (k UintKey) EncodeMsgpack(enc *msgpack.Encoder) error {
-	enc.EncodeSliceLen(1)
+	enc.EncodeArrayLen(1)
 	enc.EncodeUint(k.I)
 	return nil
 }
@@ -35,7 +35,7 @@ type StringKey struct {
 }
 
 func (k StringKey) EncodeMsgpack(enc *msgpack.Encoder) error {
-	enc.EncodeSliceLen(1)
+	enc.EncodeArrayLen(1)
 	enc.EncodeString(k.S)
 	return nil
 }
@@ -47,7 +47,7 @@ type IntIntKey struct {
 }
 
 func (k IntIntKey) EncodeMsgpack(enc *msgpack.Encoder) error {
-	enc.EncodeSliceLen(2)
+	enc.EncodeArrayLen(2)
 	enc.EncodeInt(k.I1)
 	enc.EncodeInt(k.I2)
 	return nil
@@ -61,7 +61,7 @@ type Op struct {
 }
 
 func (o Op) EncodeMsgpack(enc *msgpack.Encoder) error {
-	enc.EncodeSliceLen(3)
+	enc.EncodeArrayLen(3)
 	enc.EncodeString(o.Op)
 	enc.EncodeInt(o.Field)
 	return enc.Encode(o.Arg)
@@ -76,7 +76,7 @@ type OpSplice struct {
 }
 
 func (o OpSplice) EncodeMsgpack(enc *msgpack.Encoder) error {
-	enc.EncodeSliceLen(5)
+	enc.EncodeArrayLen(5)
 	enc.EncodeString(o.Op)
 	enc.EncodeInt(o.Field)
 	enc.EncodeInt(o.Pos)
diff --git a/example_custom_unpacking_test.go b/example_custom_unpacking_test.go
@@ -25,7 +25,7 @@ type Tuple3 struct {
 }
 
 func (c *Tuple2) EncodeMsgpack(e *msgpack.Encoder) error {
-	if err := e.EncodeSliceLen(3); err != nil {
+	if err := e.EncodeArrayLen(3); err != nil {
 		return err
 	}
 	if err := e.EncodeUint(c.Cid); err != nil {
@@ -41,7 +41,7 @@ func (c *Tuple2) EncodeMsgpack(e *msgpack.Encoder) error {
 func (c *Tuple2) DecodeMsgpack(d *msgpack.Decoder) error {
 	var err error
 	var l int
-	if l, err = d.DecodeSliceLen(); err != nil {
+	if l, err = d.DecodeArrayLen(); err != nil {
 		return err
 	}
 	if l != 3 {
@@ -53,7 +53,7 @@ func (c *Tuple2) DecodeMsgpack(d *msgpack.Decoder) error {
 	if c.Orig, err = d.DecodeString(); err != nil {
 		return err
 	}
-	if l, err = d.DecodeSliceLen(); err != nil {
+	if l, err = d.DecodeArrayLen(); err != nil {
 		return err
 	}
 	c.Members = make([]Member, l)
diff --git a/queue/queue.go b/queue/queue.go
@@ -342,7 +342,7 @@ type queueData struct {
 func (qd *queueData) DecodeMsgpack(d *msgpack.Decoder) error {
 	var err error
 	var l int
-	if l, err = d.DecodeSliceLen(); err != nil {
+	if l, err = d.DecodeArrayLen(); err != nil {
 		return err
 	}
 	if l > 1 {
diff --git a/queue/queue_test.go b/queue/queue_test.go
@@ -218,7 +218,7 @@ type customData struct {
 func (c *customData) DecodeMsgpack(d *msgpack.Decoder) error {
 	var err error
 	var l int
-	if l, err = d.DecodeSliceLen(); err != nil {
+	if l, err = d.DecodeArrayLen(); err != nil {
 		return err
 	}
 	if l != 1 {
@@ -231,7 +231,7 @@ func (c *customData) DecodeMsgpack(d *msgpack.Decoder) error {
 }
 
 func (c *customData) EncodeMsgpack(e *msgpack.Encoder) error {
-	if err := e.EncodeSliceLen(1); err != nil {
+	if err := e.EncodeArrayLen(1); err != nil {
 		return err
 	}
 	if err := e.EncodeString(c.customField); err != nil {
diff --git a/queue/task.go b/queue/task.go
@@ -17,7 +17,7 @@ type Task struct {
 func (t *Task) DecodeMsgpack(d *msgpack.Decoder) error {
 	var err error
 	var l int
-	if l, err = d.DecodeSliceLen(); err != nil {
+	if l, err = d.DecodeArrayLen(); err != nil {
 		return err
 	}
 	if l < 3 {
diff --git a/request.go b/request.go
@@ -140,7 +140,7 @@ type single struct {
 func (s *single) DecodeMsgpack(d *msgpack.Decoder) error {
 	var err error
 	var len int
-	if len, err = d.DecodeSliceLen(); err != nil {
+	if len, err = d.DecodeArrayLen(); err != nil {
 		return err
 	}
 	if s.found = len >= 1; !s.found {
@@ -423,7 +423,7 @@ func encodeSQLBind(enc *msgpack.Encoder, from interface{}) error {
 	}
 
 	encodeNamedFromMap := func(mp map[string]interface{}) error {
-		if err := enc.EncodeSliceLen(len(mp)); err != nil {
+		if err := enc.EncodeArrayLen(len(mp)); err != nil {
 			return err
 		}
 		for k, v := range mp {
@@ -435,7 +435,7 @@ func encodeSQLBind(enc *msgpack.Encoder, from interface{}) error {
 	}
 
 	encodeNamedFromStruct := func(val reflect.Value) error {
-		if err := enc.EncodeSliceLen(val.NumField()); err != nil {
+		if err := enc.EncodeArrayLen(val.NumField()); err != nil {
 			return err
 		}
 		cached, ok := lowerCaseNames.Load(val.Type())
@@ -469,7 +469,7 @@ func encodeSQLBind(enc *msgpack.Encoder, from interface{}) error {
 		if !ok {
 			castedKVSlice := from.([]KeyValueBind)
 			t := len(castedKVSlice)
-			if err := enc.EncodeSliceLen(t); err != nil {
+			if err := enc.EncodeArrayLen(t); err != nil {
 				return err
 			}
 			for _, v := range castedKVSlice {
@@ -480,7 +480,7 @@ func encodeSQLBind(enc *msgpack.Encoder, from interface{}) error {
 			return nil
 		}
 
-		if err := enc.EncodeSliceLen(len(castedSlice)); err != nil {
+		if err := enc.EncodeArrayLen(len(castedSlice)); err != nil {
 			return err
 		}
 		for i := 0; i < len(castedSlice); i++ {
diff --git a/tarantool_test.go b/tarantool_test.go
@@ -23,7 +23,7 @@ type Member struct {
 }
 
 func (m *Member) EncodeMsgpack(e *msgpack.Encoder) error {
-	if err := e.EncodeSliceLen(2); err != nil {
+	if err := e.EncodeArrayLen(2); err != nil {
 		return err
 	}
 	if err := e.EncodeString(m.Name); err != nil {
@@ -38,7 +38,7 @@ func (m *Member) EncodeMsgpack(e *msgpack.Encoder) error {
 func (m *Member) DecodeMsgpack(d *msgpack.Decoder) error {
 	var err error
 	var l int
-	if l, err = d.DecodeSliceLen(); err != nil {
+	if l, err = d.DecodeArrayLen(); err != nil {
 		return err
 	}
 	if l != 2 {
diff --git a/uuid/uuid_test.go b/uuid/uuid_test.go
@@ -36,7 +36,7 @@ type TupleUUID struct {
 func (t *TupleUUID) DecodeMsgpack(d *msgpack.Decoder) error {
 	var err error
 	var l int
-	if l, err = d.DecodeSliceLen(); err != nil {
+	if l, err = d.DecodeArrayLen(); err != nil {
 		return err
 	}
 	if l != 1 {

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ type IntKey struct {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`func (k IntKey) EncodeMsgpack(enc *msgpack.Encoder) error {`
`14`		`- enc.EncodeSliceLen(1)`
	`14`	`+ enc.EncodeArrayLen(1)`
`15`	`15`	`enc.EncodeInt(k.I)`
`16`	`16`	`return nil`
`17`	`17`	`}`
`@@ -23,7 +23,7 @@ type UintKey struct {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`func (k UintKey) EncodeMsgpack(enc *msgpack.Encoder) error {`
`26`		`- enc.EncodeSliceLen(1)`
	`26`	`+ enc.EncodeArrayLen(1)`
`27`	`27`	`enc.EncodeUint(k.I)`
`28`	`28`	`return nil`
`29`	`29`	`}`
`@@ -35,7 +35,7 @@ type StringKey struct {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`func (k StringKey) EncodeMsgpack(enc *msgpack.Encoder) error {`
`38`		`- enc.EncodeSliceLen(1)`
	`38`	`+ enc.EncodeArrayLen(1)`
`39`	`39`	`enc.EncodeString(k.S)`
`40`	`40`	`return nil`
`41`	`41`	`}`
`@@ -47,7 +47,7 @@ type IntIntKey struct {`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`func (k IntIntKey) EncodeMsgpack(enc *msgpack.Encoder) error {`
`50`		`- enc.EncodeSliceLen(2)`
	`50`	`+ enc.EncodeArrayLen(2)`
`51`	`51`	`enc.EncodeInt(k.I1)`
`52`	`52`	`enc.EncodeInt(k.I2)`
`53`	`53`	`return nil`
`@@ -61,7 +61,7 @@ type Op struct {`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`func (o Op) EncodeMsgpack(enc *msgpack.Encoder) error {`
`64`		`- enc.EncodeSliceLen(3)`
	`64`	`+ enc.EncodeArrayLen(3)`
`65`	`65`	`enc.EncodeString(o.Op)`
`66`	`66`	`enc.EncodeInt(o.Field)`
`67`	`67`	`return enc.Encode(o.Arg)`
`@@ -76,7 +76,7 @@ type OpSplice struct {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`func (o OpSplice) EncodeMsgpack(enc *msgpack.Encoder) error {`
`79`		`- enc.EncodeSliceLen(5)`
	`79`	`+ enc.EncodeArrayLen(5)`
`80`	`80`	`enc.EncodeString(o.Op)`
`81`	`81`	`enc.EncodeInt(o.Field)`
`82`	`82`	`enc.EncodeInt(o.Pos)`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ type Tuple3 struct {`
`25`	`25`	`}`
`26`	`26`
`27`	`27`	`func (c Tuple2) EncodeMsgpack(e msgpack.Encoder) error {`
`28`		`- if err := e.EncodeSliceLen(3); err != nil {`
	`28`	`+ if err := e.EncodeArrayLen(3); err != nil {`
`29`	`29`	`return err`
`30`	`30`	`}`
`31`	`31`	`if err := e.EncodeUint(c.Cid); err != nil {`
`@@ -41,7 +41,7 @@ func (c Tuple2) EncodeMsgpack(e msgpack.Encoder) error {`
`41`	`41`	`func (c Tuple2) DecodeMsgpack(d msgpack.Decoder) error {`
`42`	`42`	`var err error`
`43`	`43`	`var l int`
`44`		`- if l, err = d.DecodeSliceLen(); err != nil {`
	`44`	`+ if l, err = d.DecodeArrayLen(); err != nil {`
`45`	`45`	`return err`
`46`	`46`	`}`
`47`	`47`	`if l != 3 {`
`@@ -53,7 +53,7 @@ func (c Tuple2) DecodeMsgpack(d msgpack.Decoder) error {`
`53`	`53`	`if c.Orig, err = d.DecodeString(); err != nil {`
`54`	`54`	`return err`
`55`	`55`	`}`
`56`		`- if l, err = d.DecodeSliceLen(); err != nil {`
	`56`	`+ if l, err = d.DecodeArrayLen(); err != nil {`
`57`	`57`	`return err`
`58`	`58`	`}`
`59`	`59`	`c.Members = make([]Member, l)`
Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ type queueData struct {`
`342`	`342`	`func (qd queueData) DecodeMsgpack(d msgpack.Decoder) error {`
`343`	`343`	`var err error`
`344`	`344`	`var l int`
`345`		`- if l, err = d.DecodeSliceLen(); err != nil {`
	`345`	`+ if l, err = d.DecodeArrayLen(); err != nil {`
`346`	`346`	`return err`
`347`	`347`	`}`
`348`	`348`	`if l > 1 {`
Original file line number	Diff line number	Diff line change
`@@ -218,7 +218,7 @@ type customData struct {`
`218`	`218`	`func (c customData) DecodeMsgpack(d msgpack.Decoder) error {`
`219`	`219`	`var err error`
`220`	`220`	`var l int`
`221`		`- if l, err = d.DecodeSliceLen(); err != nil {`
	`221`	`+ if l, err = d.DecodeArrayLen(); err != nil {`
`222`	`222`	`return err`
`223`	`223`	`}`
`224`	`224`	`if l != 1 {`
`@@ -231,7 +231,7 @@ func (c customData) DecodeMsgpack(d msgpack.Decoder) error {`
`231`	`231`	`}`
`232`	`232`
`233`	`233`	`func (c customData) EncodeMsgpack(e msgpack.Encoder) error {`
`234`		`- if err := e.EncodeSliceLen(1); err != nil {`
	`234`	`+ if err := e.EncodeArrayLen(1); err != nil {`
`235`	`235`	`return err`
`236`	`236`	`}`
`237`	`237`	`if err := e.EncodeString(c.customField); err != nil {`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ type Task struct {`
`17`	`17`	`func (t Task) DecodeMsgpack(d msgpack.Decoder) error {`
`18`	`18`	`var err error`
`19`	`19`	`var l int`
`20`		`- if l, err = d.DecodeSliceLen(); err != nil {`
	`20`	`+ if l, err = d.DecodeArrayLen(); err != nil {`
`21`	`21`	`return err`
`22`	`22`	`}`
`23`	`23`	`if l < 3 {`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ type single struct {`
`140`	`140`	`func (s single) DecodeMsgpack(d msgpack.Decoder) error {`
`141`	`141`	`var err error`
`142`	`142`	`var len int`
`143`		`- if len, err = d.DecodeSliceLen(); err != nil {`
	`143`	`+ if len, err = d.DecodeArrayLen(); err != nil {`
`144`	`144`	`return err`
`145`	`145`	`}`
`146`	`146`	`if s.found = len >= 1; !s.found {`
`@@ -423,7 +423,7 @@ func encodeSQLBind(enc *msgpack.Encoder, from interface{}) error {`
`423`	`423`	`}`
`424`	`424`
`425`	`425`	`encodeNamedFromMap := func(mp map[string]interface{}) error {`
`426`		`- if err := enc.EncodeSliceLen(len(mp)); err != nil {`
	`426`	`+ if err := enc.EncodeArrayLen(len(mp)); err != nil {`
`427`	`427`	`return err`
`428`	`428`	`}`
`429`	`429`	`for k, v := range mp {`
`@@ -435,7 +435,7 @@ func encodeSQLBind(enc *msgpack.Encoder, from interface{}) error {`
`435`	`435`	`}`
`436`	`436`
`437`	`437`	`encodeNamedFromStruct := func(val reflect.Value) error {`
`438`		`- if err := enc.EncodeSliceLen(val.NumField()); err != nil {`
	`438`	`+ if err := enc.EncodeArrayLen(val.NumField()); err != nil {`
`439`	`439`	`return err`
`440`	`440`	`}`
`441`	`441`	`cached, ok := lowerCaseNames.Load(val.Type())`
`@@ -469,7 +469,7 @@ func encodeSQLBind(enc *msgpack.Encoder, from interface{}) error {`
`469`	`469`	`if !ok {`
`470`	`470`	`castedKVSlice := from.([]KeyValueBind)`
`471`	`471`	`t := len(castedKVSlice)`
`472`		`- if err := enc.EncodeSliceLen(t); err != nil {`
	`472`	`+ if err := enc.EncodeArrayLen(t); err != nil {`
`473`	`473`	`return err`
`474`	`474`	`}`
`475`	`475`	`for _, v := range castedKVSlice {`
`@@ -480,7 +480,7 @@ func encodeSQLBind(enc *msgpack.Encoder, from interface{}) error {`
`480`	`480`	`return nil`
`481`	`481`	`}`
`482`	`482`
`483`		`- if err := enc.EncodeSliceLen(len(castedSlice)); err != nil {`
	`483`	`+ if err := enc.EncodeArrayLen(len(castedSlice)); err != nil {`
`484`	`484`	`return err`
`485`	`485`	`}`
`486`	`486`	`for i := 0; i < len(castedSlice); i++ {`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ type Member struct {`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`func (m Member) EncodeMsgpack(e msgpack.Encoder) error {`
`26`		`- if err := e.EncodeSliceLen(2); err != nil {`
	`26`	`+ if err := e.EncodeArrayLen(2); err != nil {`
`27`	`27`	`return err`
`28`	`28`	`}`
`29`	`29`	`if err := e.EncodeString(m.Name); err != nil {`
`@@ -38,7 +38,7 @@ func (m Member) EncodeMsgpack(e msgpack.Encoder) error {`
`38`	`38`	`func (m Member) DecodeMsgpack(d msgpack.Decoder) error {`
`39`	`39`	`var err error`
`40`	`40`	`var l int`
`41`		`- if l, err = d.DecodeSliceLen(); err != nil {`
	`41`	`+ if l, err = d.DecodeArrayLen(); err != nil {`
`42`	`42`	`return err`
`43`	`43`	`}`
`44`	`44`	`if l != 2 {`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ type TupleUUID struct {`
`36`	`36`	`func (t TupleUUID) DecodeMsgpack(d msgpack.Decoder) error {`
`37`	`37`	`var err error`
`38`	`38`	`var l int`
`39`		`- if l, err = d.DecodeSliceLen(); err != nil {`
	`39`	`+ if l, err = d.DecodeArrayLen(); err != nil {`
`40`	`40`	`return err`
`41`	`41`	`}`
`42`	`42`	`if l != 1 {`