Skip to content

Commit b9b8249

Browse files
lemirelemire
committed
Marking all the Msg serialization stuff as deprecated as per #165 (comment) 
1 parent 6559c39 commit b9b8249

File tree

5 files changed

+57
-57
lines changed

5 files changed

+57
-57
lines changed

‎arraycontainer_gen.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package roaring
66

77
import "github.com/tinylib/msgp/msgp"
88

9-
// DecodeMsg implements msgp.Decodable
9+
// Deprecated: DecodeMsg implements msgp.Decodable
1010
func (z *arrayContainer) DecodeMsg(dc *msgp.Reader) (err error) {
1111
var field []byte
1212
_ = field
@@ -49,7 +49,7 @@ func (z *arrayContainer) DecodeMsg(dc *msgp.Reader) (err error) {
4949
return
5050
}
5151

52-
// EncodeMsg implements msgp.Encodable
52+
// Deprecated: EncodeMsg implements msgp.Encodable
5353
func (z *arrayContainer) EncodeMsg(en *msgp.Writer) (err error) {
5454
// map header, size 1
5555
// write "content"
@@ -70,7 +70,7 @@ func (z *arrayContainer) EncodeMsg(en *msgp.Writer) (err error) {
7070
return
7171
}
7272

73-
// MarshalMsg implements msgp.Marshaler
73+
// Deprecated: MarshalMsg implements msgp.Marshaler
7474
func (z *arrayContainer) MarshalMsg(b []byte) (o []byte, err error) {
7575
o = msgp.Require(b, z.Msgsize())
7676
// map header, size 1
@@ -83,7 +83,7 @@ func (z *arrayContainer) MarshalMsg(b []byte) (o []byte, err error) {
8383
return
8484
}
8585

86-
// UnmarshalMsg implements msgp.Unmarshaler
86+
// Deprecated: UnmarshalMsg implements msgp.Unmarshaler
8787
func (z *arrayContainer) UnmarshalMsg(bts []byte) (o []byte, err error) {
8888
var field []byte
8989
_ = field
@@ -127,7 +127,7 @@ func (z *arrayContainer) UnmarshalMsg(bts []byte) (o []byte, err error) {
127127
return
128128
}
129129

130-
// Msgsize returns an upper bound estimate of the number of bytes occupied by the serialized message
130+
// Deprecated: Msgsize returns an upper bound estimate of the number of bytes occupied by the serialized message
131131
func (z *arrayContainer) Msgsize() (s int) {
132132
s = 1 + 8 + msgp.ArrayHeaderSize + (len(z.content) * (msgp.Uint16Size))
133133
return

‎bitmapcontainer_gen.go

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ package roaring
66

77
import "github.com/tinylib/msgp/msgp"
88

9-
// DecodeMsg implements msgp.Decodable
9+
// Deprecated: DecodeMsg implements msgp.Decodable
1010
func (z *bitmapContainer) DecodeMsg(dc *msgp.Reader) (err error) {
1111
var field []byte
1212
_ = field
@@ -54,7 +54,7 @@ func (z *bitmapContainer) DecodeMsg(dc *msgp.Reader) (err error) {
5454
return
5555
}
5656

57-
// EncodeMsg implements msgp.Encodable
57+
// Deprecated: EncodeMsg implements msgp.Encodable
5858
func (z *bitmapContainer) EncodeMsg(en *msgp.Writer) (err error) {
5959
// map header, size 2
6060
// write "cardinality"
@@ -84,7 +84,7 @@ func (z *bitmapContainer) EncodeMsg(en *msgp.Writer) (err error) {
8484
return
8585
}
8686

87-
// MarshalMsg implements msgp.Marshaler
87+
// Deprecated: MarshalMsg implements msgp.Marshaler
8888
func (z *bitmapContainer) MarshalMsg(b []byte) (o []byte, err error) {
8989
o = msgp.Require(b, z.Msgsize())
9090
// map header, size 2
@@ -100,7 +100,7 @@ func (z *bitmapContainer) MarshalMsg(b []byte) (o []byte, err error) {
100100
return
101101
}
102102

103-
// UnmarshalMsg implements msgp.Unmarshaler
103+
// Deprecated: UnmarshalMsg implements msgp.Unmarshaler
104104
func (z *bitmapContainer) UnmarshalMsg(bts []byte) (o []byte, err error) {
105105
var field []byte
106106
_ = field
@@ -149,13 +149,13 @@ func (z *bitmapContainer) UnmarshalMsg(bts []byte) (o []byte, err error) {
149149
return
150150
}
151151

152-
// Msgsize returns an upper bound estimate of the number of bytes occupied by the serialized message
152+
// Deprecated: Msgsize returns an upper bound estimate of the number of bytes occupied by the serialized message
153153
func (z *bitmapContainer) Msgsize() (s int) {
154154
s = 1 + 12 + msgp.IntSize + 7 + msgp.ArrayHeaderSize + (len(z.bitmap) * (msgp.Uint64Size))
155155
return
156156
}
157157

158-
// DecodeMsg implements msgp.Decodable
158+
// Deprecated: DecodeMsg implements msgp.Decodable
159159
func (z *bitmapContainerShortIterator) DecodeMsg(dc *msgp.Reader) (err error) {
160160
var field []byte
161161
_ = field
@@ -239,7 +239,7 @@ func (z *bitmapContainerShortIterator) DecodeMsg(dc *msgp.Reader) (err error) {
239239
return
240240
}
241241

242-
// EncodeMsg implements msgp.Encodable
242+
// Deprecated: EncodeMsg implements msgp.Encodable
243243
func (z *bitmapContainerShortIterator) EncodeMsg(en *msgp.Writer) (err error) {
244244
// map header, size 2
245245
// write "ptr"
@@ -291,7 +291,7 @@ func (z *bitmapContainerShortIterator) EncodeMsg(en *msgp.Writer) (err error) {
291291
return
292292
}
293293

294-
// MarshalMsg implements msgp.Marshaler
294+
// Deprecated: MarshalMsg implements msgp.Marshaler
295295
func (z *bitmapContainerShortIterator) MarshalMsg(b []byte) (o []byte, err error) {
296296
o = msgp.Require(b, z.Msgsize())
297297
// map header, size 2
@@ -317,7 +317,7 @@ func (z *bitmapContainerShortIterator) MarshalMsg(b []byte) (o []byte, err error
317317
return
318318
}
319319

320-
// UnmarshalMsg implements msgp.Unmarshaler
320+
// Deprecated: UnmarshalMsg implements msgp.Unmarshaler
321321
func (z *bitmapContainerShortIterator) UnmarshalMsg(bts []byte) (o []byte, err error) {
322322
var field []byte
323323
_ = field
@@ -402,7 +402,7 @@ func (z *bitmapContainerShortIterator) UnmarshalMsg(bts []byte) (o []byte, err e
402402
return
403403
}
404404

405-
// Msgsize returns an upper bound estimate of the number of bytes occupied by the serialized message
405+
// Deprecated: Msgsize returns an upper bound estimate of the number of bytes occupied by the serialized message
406406
func (z *bitmapContainerShortIterator) Msgsize() (s int) {
407407
s = 1 + 4
408408
if z.ptr == nil {

‎roaring.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ func (rb *Bitmap) ToBytes() ([]byte, error) {
5252
return rb.highlowcontainer.toBytes()
5353
}
5454

55-
// WriteToMsgpack writes a msgpack2/snappy-streaming compressed serialized
55+
// Deprecated: WriteToMsgpack writes a msgpack2/snappy-streaming compressed serialized
5656
// version of this bitmap to stream. The format is not
5757
// compatible with the WriteTo() format, and is
5858
// experimental: it may produce smaller on disk
@@ -101,7 +101,7 @@ func (rb *Bitmap) HasRunCompression() bool {
101101
return rb.highlowcontainer.hasRunCompression()
102102
}
103103

104-
// ReadFromMsgpack reads a msgpack2/snappy-streaming serialized
104+
// Deprecated: ReadFromMsgpack reads a msgpack2/snappy-streaming serialized
105105
// version of this bitmap from stream. The format is
106106
// expected is that written by the WriteToMsgpack()
107107
// call; see additional notes there.

‎roaringarray_gen.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/tinylib/msgp/msgp"
99
)
1010

11-
// DecodeMsg implements msgp.Decodable
11+
// Deprecated: DecodeMsg implements msgp.Decodable
1212
func (z *containerSerz) DecodeMsg(dc *msgp.Reader) (err error) {
1313
var field []byte
1414
_ = field
@@ -48,7 +48,7 @@ func (z *containerSerz) DecodeMsg(dc *msgp.Reader) (err error) {
4848
return
4949
}
5050

51-
// EncodeMsg implements msgp.Encodable
51+
// Deprecated: EncodeMsg implements msgp.Encodable
5252
func (z *containerSerz) EncodeMsg(en *msgp.Writer) (err error) {
5353
// map header, size 2
5454
// write "t"
@@ -72,7 +72,7 @@ func (z *containerSerz) EncodeMsg(en *msgp.Writer) (err error) {
7272
return
7373
}
7474

75-
// MarshalMsg implements msgp.Marshaler
75+
// Deprecated: MarshalMsg implements msgp.Marshaler
7676
func (z *containerSerz) MarshalMsg(b []byte) (o []byte, err error) {
7777
o = msgp.Require(b, z.Msgsize())
7878
// map header, size 2
@@ -88,7 +88,7 @@ func (z *containerSerz) MarshalMsg(b []byte) (o []byte, err error) {
8888
return
8989
}
9090

91-
// UnmarshalMsg implements msgp.Unmarshaler
91+
// Deprecated: UnmarshalMsg implements msgp.Unmarshaler
9292
func (z *containerSerz) UnmarshalMsg(bts []byte) (o []byte, err error) {
9393
var field []byte
9494
_ = field
@@ -129,13 +129,13 @@ func (z *containerSerz) UnmarshalMsg(bts []byte) (o []byte, err error) {
129129
return
130130
}
131131

132-
// Msgsize returns an upper bound estimate of the number of bytes occupied by the serialized message
132+
// Deprecated: Msgsize returns an upper bound estimate of the number of bytes occupied by the serialized message
133133
func (z *containerSerz) Msgsize() (s int) {
134134
s = 1 + 2 + msgp.Uint8Size + 2 + z.r.Msgsize()
135135
return
136136
}
137137

138-
// DecodeMsg implements msgp.Decodable
138+
// Deprecated: DecodeMsg implements msgp.Decodable
139139
func (z *contype) DecodeMsg(dc *msgp.Reader) (err error) {
140140
{
141141
var zajw uint8
@@ -148,7 +148,7 @@ func (z *contype) DecodeMsg(dc *msgp.Reader) (err error) {
148148
return
149149
}
150150

151-
// EncodeMsg implements msgp.Encodable
151+
// Deprecated: EncodeMsg implements msgp.Encodable
152152
func (z contype) EncodeMsg(en *msgp.Writer) (err error) {
153153
err = en.WriteUint8(uint8(z))
154154
if err != nil {
@@ -157,14 +157,14 @@ func (z contype) EncodeMsg(en *msgp.Writer) (err error) {
157157
return
158158
}
159159

160-
// MarshalMsg implements msgp.Marshaler
160+
// Deprecated: MarshalMsg implements msgp.Marshaler
161161
func (z contype) MarshalMsg(b []byte) (o []byte, err error) {
162162
o = msgp.Require(b, z.Msgsize())
163163
o = msgp.AppendUint8(o, uint8(z))
164164
return
165165
}
166166

167-
// UnmarshalMsg implements msgp.Unmarshaler
167+
// Deprecated: UnmarshalMsg implements msgp.Unmarshaler
168168
func (z *contype) UnmarshalMsg(bts []byte) (o []byte, err error) {
169169
{
170170
var zwht uint8
@@ -178,13 +178,13 @@ func (z *contype) UnmarshalMsg(bts []byte) (o []byte, err error) {
178178
return
179179
}
180180

181-
// Msgsize returns an upper bound estimate of the number of bytes occupied by the serialized message
181+
// Deprecated: Msgsize returns an upper bound estimate of the number of bytes occupied by the serialized message
182182
func (z contype) Msgsize() (s int) {
183183
s = msgp.Uint8Size
184184
return
185185
}
186186

187-
// DecodeMsg implements msgp.Decodable
187+
// Deprecated: DecodeMsg implements msgp.Decodable
188188
func (z *roaringArray) DecodeMsg(dc *msgp.Reader) (err error) {
189189
var field []byte
190190
_ = field
@@ -295,7 +295,7 @@ func (z *roaringArray) DecodeMsg(dc *msgp.Reader) (err error) {
295295
return
296296
}
297297

298-
// EncodeMsg implements msgp.Encodable
298+
// Deprecated: EncodeMsg implements msgp.Encodable
299299
func (z *roaringArray) EncodeMsg(en *msgp.Writer) (err error) {
300300
// map header, size 4
301301
// write "keys"
@@ -370,7 +370,7 @@ func (z *roaringArray) EncodeMsg(en *msgp.Writer) (err error) {
370370
return
371371
}
372372

373-
// MarshalMsg implements msgp.Marshaler
373+
// Deprecated: MarshalMsg implements msgp.Marshaler
374374
func (z *roaringArray) MarshalMsg(b []byte) (o []byte, err error) {
375375
o = msgp.Require(b, z.Msgsize())
376376
// map header, size 4
@@ -407,7 +407,7 @@ func (z *roaringArray) MarshalMsg(b []byte) (o []byte, err error) {
407407
return
408408
}
409409

410-
// UnmarshalMsg implements msgp.Unmarshaler
410+
// Deprecated: UnmarshalMsg implements msgp.Unmarshaler
411411
func (z *roaringArray) UnmarshalMsg(bts []byte) (o []byte, err error) {
412412
var field []byte
413413
_ = field
@@ -519,7 +519,7 @@ func (z *roaringArray) UnmarshalMsg(bts []byte) (o []byte, err error) {
519519
return
520520
}
521521

522-
// Msgsize returns an upper bound estimate of the number of bytes occupied by the serialized message
522+
// Deprecated: Msgsize returns an upper bound estimate of the number of bytes occupied by the serialized message
523523
func (z *roaringArray) Msgsize() (s int) {
524524
s = 1 + 5 + msgp.ArrayHeaderSize + (len(z.keys) * (msgp.Uint16Size)) + 16 + msgp.ArrayHeaderSize + (len(z.needCopyOnWrite) * (msgp.BoolSize)) + 12 + msgp.BoolSize + 8 + msgp.ArrayHeaderSize
525525
for zxhx := range z.conserz {

0 commit comments

Comments
 (0)