Skip to content

Commit 2554391

Browse files
lukasz-antoniaklukasz-antoniak
committed
Fix collection serialization for protocol V2
1 parent 6158d9e commit 2554391

File tree

6 files changed

+128
-48
lines changed

6 files changed

+128
-48
lines changed

‎datacodec/collection.go

+13-2
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,11 @@ func writeCollection(ext extractor, elementCodec Codec, size int, version primit
139139
} else if encodedElem, err := elementCodec.Encode(elem, version); err != nil {
140140
return nil, errCannotEncodeElement(i, err)
141141
} else {
142-
_ = primitive.WriteBytes(encodedElem, buf)
142+
if version.Uses4BytesCollectionLength() {
143+
_ = primitive.WriteBytes(encodedElem, buf)
144+
} else {
145+
_ = primitive.WriteShortSignedBytes(encodedElem, buf)
146+
}
143147
}
144148
}
145149
return buf.Bytes(), nil
@@ -154,7 +158,14 @@ func readCollection(source []byte, injectorFactory func(int) (injector, error),
154158
return err
155159
} else {
156160
for i := 0; i < size; i++ {
157-
if encodedElem, err := primitive.ReadBytes(reader); err != nil {
161+
var encodedElem []byte
162+
var err error
163+
if version.Uses4BytesCollectionLength() {
164+
encodedElem, err = primitive.ReadBytes(reader)
165+
} else {
166+
encodedElem, err = primitive.ReadShortSignedBytes(reader)
167+
}
168+
if err != nil {
158169
return errCannotReadElement(i, err)
159170
} else if decodedElem, err := inj.zeroElem(i, i); err != nil {
160171
return errCannotCreateElement(i, err)

‎datacodec/collection_test.go

+22-22
Original file line numberDiff line numberDiff line change
@@ -40,16 +40,16 @@ var (
4040
}
4141
listOneBytes2 = []byte{
4242
0, 1,
43-
0, 0, 0, 4,
43+
0, 4,
4444
0, 0, 0, 1,
4545
}
4646
listOneTwoThreeBytes2 = []byte{
4747
0, 3,
48-
0, 0, 0, 4,
48+
0, 4,
4949
0, 0, 0, 1,
50-
0, 0, 0, 4,
50+
0, 4,
5151
0, 0, 0, 2,
52-
0, 0, 0, 4,
52+
0, 4,
5353
0, 0, 0, 3,
5454
}
5555
listOneTwoThreeBytes4 = []byte{
@@ -63,13 +63,13 @@ var (
6363
}
6464
listAbcDefBytes2 = []byte{
6565
0, 2, // length of outer collection
66-
0, 0, 0, 9, // length of outer collection 1st element
66+
0, 7, // length of outer collection 1st element
6767
0, 1, // length of 1st inner collection
68-
0, 0, 0, 3, // length of 1st inner collection 1st element
68+
0, 3, // length of 1st inner collection 1st element
6969
a, b, c, // element
70-
0, 0, 0, 9, // length of outer collection 2nd element
70+
0, 7, // length of outer collection 2nd element
7171
0, 1, // length of 2nd inner collection
72-
0, 0, 0, 3, // length of 2nd inner collection 1st element
72+
0, 3, // length of 2nd inner collection 1st element
7373
d, e, f, // element
7474
}
7575
listAbcDefBytes4 = []byte{
@@ -85,13 +85,13 @@ var (
8585
}
8686
listAbcDefEmptyBytes2 = []byte{
8787
0, 2, // length of outer collection
88-
0, 0, 0, 16, // length of outer collection 1st element
88+
0, 12, // length of outer collection 1st element
8989
0, 2, // length of 1st inner collection
90-
0, 0, 0, 3, // length of 1st inner collection 1st element
90+
0, 3, // length of 1st inner collection 1st element
9191
a, b, c, // element
92-
0, 0, 0, 3, // length of 1st inner collection 2nd element
92+
0, 3, // length of 1st inner collection 2nd element
9393
d, e, f, // element
94-
0, 0, 0, 2, // length of outer collection 2nd element
94+
0, 2, // length of outer collection 2nd element
9595
0, 0, // length of 2nd inner collection
9696
}
9797
listAbcDefEmptyBytes4 = []byte{
@@ -116,11 +116,11 @@ var (
116116
}
117117
listOneTwoNullBytes2 = []byte{
118118
0, 3,
119-
0, 0, 0, 4,
119+
0, 4,
120120
0, 0, 0, 1,
121-
0, 0, 0, 4,
121+
0, 4,
122122
0, 0, 0, 2,
123-
255, 255, 255, 255,
123+
255, 255,
124124
}
125125
listAbcNullNullBytes4 = []byte{
126126
0, 0, 0, 2, // length of outer collection
@@ -133,12 +133,12 @@ var (
133133
}
134134
listAbcNullNullBytes2 = []byte{
135135
0, 2, // length of outer collection
136-
0, 0, 0, 13, // length of outer collection 1st element
136+
0, 9, // length of outer collection 1st element
137137
0, 2, // length of 1st inner collection
138-
0, 0, 0, 3, // length of 1st inner collection 1st element
138+
0, 3, // length of 1st inner collection 1st element
139139
a, b, c, // element
140-
255, 255, 255, 255, // inner collection 2nd element (null)
141-
255, 255, 255, 255, // outer collection 2nd element (null)
140+
255, 255, // inner collection 2nd element (null)
141+
255, 255, // outer collection 2nd element (null)
142142
}
143143
)
144144

@@ -304,7 +304,7 @@ func Test_collectionCodec_Encode(t *testing.T) {
304304
{"list<int> many elems", listOfInt, []int{1, 2, 3}, listOneTwoThreeBytes2, ""},
305305
{"list<int> many elems pointers", listOfInt, []*int{intPtr(1), intPtr(2), intPtr(3)}, listOneTwoThreeBytes2, ""},
306306
{"list<int> many elems interface{}", listOfInt, []interface{}{1, 2, 3}, listOneTwoThreeBytes2, ""},
307-
{"list<int> nil element", listOfInt, []interface{}{nil}, []byte{0x0, 0x1, 0xff, 0xff, 0xff, 0xff}, ""},
307+
{"list<int> nil element", listOfInt, []interface{}{nil}, []byte{0x0, 0x1, 0xff, 0xff}, ""},
308308
{"list<int> wrong source type", listOfInt, 123, nil, fmt.Sprintf("cannot encode int as CQL %s with %s: source type not supported", listOfInt.DataType(), version)},
309309
{"list<int> wrong source type nil", listOfInt, map[string]int(nil), nil, fmt.Sprintf("cannot encode map[string]int as CQL %s with %s: source type not supported", listOfInt.DataType(), version)},
310310
{"list<set<text>> nil untyped", listOfSetOfVarchar, nil, nil, ""},
@@ -314,8 +314,8 @@ func Test_collectionCodec_Encode(t *testing.T) {
314314
{"list<set<text>> array", listOfSetOfVarchar, [2][1]string{{"abc"}, {"def"}}, listAbcDefBytes2, ""},
315315
{"list<set<text>> pointers", listOfSetOfVarchar, [][]*string{{stringPtr("abc"), stringPtr("def")}, {}}, listAbcDefEmptyBytes2, ""},
316316
{"list<set<text>> many elems interface{}", listOfSetOfVarchar, [][]interface{}{{"abc", "def"}, {}}, listAbcDefEmptyBytes2, ""},
317-
{"list<set<text>> nil element", listOfSetOfVarchar, []interface{}{nil}, []byte{0x0, 0x1, 0xff, 0xff, 0xff, 0xff}, ""},
318-
{"list<set<text>> nil inner element", listOfSetOfVarchar, []interface{}{[]interface{}{nil}}, []byte{0x0, 0x1, 0x0, 0x0, 0x0, 0x6, 0x0, 0x1, 0xff, 0xff, 0xff, 0xff}, ""},
317+
{"list<set<text>> nil element", listOfSetOfVarchar, []interface{}{nil}, []byte{0x0, 0x1, 0xff, 0xff}, ""},
318+
{"list<set<text>> nil inner element", listOfSetOfVarchar, []interface{}{[]interface{}{nil}}, []byte{0x0, 0x1, 0x0, 0x4, 0x0, 0x1, 0xff, 0xff}, ""},
319319
{"list<set<text>> wrong source type", listOfSetOfVarchar, 123, nil, fmt.Sprintf("cannot encode int as CQL %s with %s: source type not supported", listOfSetOfVarchar.DataType(), version)},
320320
}
321321
for _, tt := range tests {

‎datacodec/map.go

+25-4
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,13 @@ func writeMap(ext keyValueExtractor, size int, keyCodec Codec, valueCodec Codec,
147147
} else if encodedValue, err := valueCodec.Encode(value, version); err != nil {
148148
return nil, errCannotEncodeMapValue(i, err)
149149
} else {
150-
_ = primitive.WriteBytes(encodedKey, buf)
151-
_ = primitive.WriteBytes(encodedValue, buf)
150+
if version.Uses4BytesCollectionLength() {
151+
_ = primitive.WriteBytes(encodedKey, buf)
152+
_ = primitive.WriteBytes(encodedValue, buf)
153+
} else {
154+
_ = primitive.WriteShortSignedBytes(encodedKey, buf)
155+
_ = primitive.WriteShortSignedBytes(encodedValue, buf)
156+
}
152157
}
153158
}
154159
return buf.Bytes(), nil
@@ -163,9 +168,25 @@ func readMap(source []byte, injectorFactory func(int) (keyValueInjector, error),
163168
return err
164169
} else {
165170
for i := 0; i < size; i++ {
166-
if encodedKey, err := primitive.ReadBytes(reader); err != nil {
171+
var encodedKey []byte
172+
var encodedValue []byte
173+
var err error
174+
175+
if version.Uses4BytesCollectionLength() {
176+
encodedKey, err = primitive.ReadBytes(reader)
177+
} else {
178+
encodedKey, err = primitive.ReadShortSignedBytes(reader)
179+
}
180+
if err != nil {
167181
return errCannotReadMapKey(i, err)
168-
} else if encodedValue, err := primitive.ReadBytes(reader); err != nil {
182+
}
183+
if version.Uses4BytesCollectionLength() {
184+
encodedValue, err = primitive.ReadBytes(reader)
185+
} else {
186+
encodedValue, err = primitive.ReadShortSignedBytes(reader)
187+
}
188+
189+
if err != nil {
169190
return errCannotReadMapValue(i, err)
170191
} else if decodedKey, err := inj.zeroKey(i); err != nil {
171192
return errCannotCreateMapKey(i, err)

‎datacodec/map_test.go

+20-20
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ type coordinates struct {
9797
var (
9898
mapOneTwoAbcBytes2 = []byte{
9999
0, 1,
100-
0, 0, 0, 4,
100+
0, 4,
101101
0, 0, 0, 12,
102-
0, 0, 0, 3,
102+
0, 3,
103103
a, b, c,
104104
}
105105
mapOneTwoAbcBytes4 = []byte{
@@ -111,13 +111,13 @@ var (
111111
}
112112
mapZeroOneTwoAbcBytes2 = []byte{
113113
0, 1, // length of outer collection
114-
0, 0, 0, 4, // length of outer collection 1st key
114+
0, 4, // length of outer collection 1st key
115115
0, 0, 0, 0, // 1st key
116-
0, 0, 0, 17, // length of outer collection 1st value
116+
0, 13, // length of outer collection 1st value
117117
0, 1, // length of 1st inner collection
118-
0, 0, 0, 4, // length of 1st inner collection 1st key
118+
0, 4, // length of 1st inner collection 1st key
119119
0, 0, 0, 12, // 1st inner collection 1st key
120-
0, 0, 0, 3, // length of 1st inner collection 1st value
120+
0, 3, // length of 1st inner collection 1st value
121121
a, b, c, // 1st inner collection 1st value
122122
}
123123
mapZeroOneTwoAbcBytes4 = []byte{
@@ -155,30 +155,30 @@ var (
155155
}
156156
mapCoordinatesBytes2 = []byte{
157157
0, 2,
158-
0, 0, 0, 1,
158+
0, 1,
159159
x,
160-
0, 0, 0, 4,
160+
0, 4,
161161
0x41, 0x45, 0x70, 0xa4,
162-
0, 0, 0, 1,
162+
0, 1,
163163
y,
164-
0, 0, 0, 4,
164+
0, 4,
165165
0xc2, 0x63, 0x1e, 0xb8,
166166
}
167167
mapCoordinatesEmptyBytes2 = []byte{
168168
0, 2,
169-
0, 0, 0, 1,
169+
0, 1,
170170
x,
171-
0, 0, 0, 4,
171+
0, 4,
172172
0, 0, 0, 0,
173-
0, 0, 0, 1,
173+
0, 1,
174174
y,
175-
0, 0, 0, 4,
175+
0, 4,
176176
0, 0, 0, 0,
177177
}
178178
mapNullAbcBytes2 = []byte{
179179
0, 1,
180-
255, 255, 255, 255,
181-
0, 0, 0, 3,
180+
255, 255,
181+
0, 3,
182182
a, b, c,
183183
}
184184
mapNullAbcBytes4 = []byte{
@@ -189,9 +189,9 @@ var (
189189
}
190190
mapOneTwoNullBytes2 = []byte{
191191
0, 1,
192-
0, 0, 0, 4,
192+
0, 4,
193193
0, 0, 0, 12,
194-
255, 255, 255, 255,
194+
255, 255,
195195
}
196196
mapOneTwoNullBytes4 = []byte{
197197
0, 0, 0, 1,
@@ -262,8 +262,8 @@ func Test_mapCodec_Encode(t *testing.T) {
262262
{"map<int,text> non-empty elems pointers", mapSimple, map[*int]*string{intPtr(12): stringPtr("abc")}, mapOneTwoAbcBytes2, ""},
263263
{"map<int,text> non-empty map pointer elems pointers", mapSimple, &map[*int]*string{intPtr(12): stringPtr("abc")}, mapOneTwoAbcBytes2, ""},
264264
{"map<int,text> non-empty interface{}", mapSimple, map[int]interface{}{12: "abc"}, mapOneTwoAbcBytes2, ""},
265-
{"map<int,text> nil key", mapSimple, map[interface{}]interface{}{nil: "abc"}, []byte{0x0, 0x1, 0xff, 0xff, 0xff, 0xff, 0x0, 0x0, 0x0, 0x3, a, b, c}, ""},
266-
{"map<int,text> nil value", mapSimple, map[int]interface{}{12: nil}, []byte{0x0, 0x1, 0x0, 0x0, 0x0, 0x4, 0x0, 0x0, 0x0, 0xc, 0xff, 0xff, 0xff, 0xff}, ""},
265+
{"map<int,text> nil key", mapSimple, map[interface{}]interface{}{nil: "abc"}, []byte{0x0, 0x1, 0xff, 0xff, 0x0, 0x3, a, b, c}, ""},
266+
{"map<int,text> nil value", mapSimple, map[int]interface{}{12: nil}, []byte{0x0, 0x1, 0x0, 0x4, 0x0, 0x0, 0x0, 0xc, 0xff, 0xff}, ""},
267267
{"map<int,text> wrong source type", mapSimple, 123, nil, fmt.Sprintf("cannot encode int as CQL %s with %s: source type not supported", mapSimple.DataType(), version)},
268268
{"map<int,text> wrong source type nil", mapSimple, []int(nil), nil, fmt.Sprintf("cannot encode []int as CQL %s with %s: source type not supported", mapSimple.DataType(), version)},
269269
{"map<int,text> wrong source type nil pointer", mapSimple, new([]int), nil, fmt.Sprintf("cannot encode *[]int as CQL %s with %s: source type not supported", mapSimple.DataType(), version)},

‎primitive/integers.go

+14
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,27 @@ func ReadShort(source io.Reader) (decoded uint16, err error) {
5252
return decoded, err
5353
}
5454

55+
func ReadShortSigned(source io.Reader) (decoded int16, err error) {
56+
if err = binary.Read(source, binary.BigEndian, &decoded); err != nil {
57+
err = fmt.Errorf("cannot read [short]: %w", err)
58+
}
59+
return decoded, err
60+
}
61+
5562
func WriteShort(i uint16, dest io.Writer) error {
5663
if err := binary.Write(dest, binary.BigEndian, i); err != nil {
5764
return fmt.Errorf("cannot write [short]: %w", err)
5865
}
5966
return nil
6067
}
6168

69+
func WriteShortSigned(i int16, dest io.Writer) error {
70+
if err := binary.Write(dest, binary.BigEndian, i); err != nil {
71+
return fmt.Errorf("cannot write [short]: %w", err)
72+
}
73+
return nil
74+
}
75+
6276
// [int]
6377

6478
func ReadInt(source io.Reader) (decoded int32, err error) {

‎primitive/short_bytes.go

+34
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,22 @@ func ReadShortBytes(source io.Reader) ([]byte, error) {
3838
}
3939
}
4040

41+
func ReadShortSignedBytes(source io.Reader) ([]byte, error) {
42+
if length, err := ReadShortSigned(source); err != nil {
43+
return nil, fmt.Errorf("cannot read [short bytes] length: %w", err)
44+
} else if length < 0 {
45+
return nil, nil
46+
} else if length == 0 {
47+
return []byte{}, nil
48+
} else {
49+
decoded := make([]byte, length)
50+
if _, err := io.ReadFull(source, decoded); err != nil {
51+
return nil, fmt.Errorf("cannot read [short bytes] content: %w", err)
52+
}
53+
return decoded, nil
54+
}
55+
}
56+
4157
func WriteShortBytes(b []byte, dest io.Writer) error {
4258
length := len(b)
4359
if err := WriteShort(uint16(length), dest); err != nil {
@@ -50,6 +66,24 @@ func WriteShortBytes(b []byte, dest io.Writer) error {
5066
return nil
5167
}
5268

69+
func WriteShortSignedBytes(b []byte, dest io.Writer) error {
70+
if b == nil {
71+
if err := WriteShortSigned(-1, dest); err != nil {
72+
return fmt.Errorf("cannot write null [bytes]: %w", err)
73+
}
74+
} else {
75+
length := len(b)
76+
if err := WriteShortSigned(int16(length), dest); err != nil {
77+
return fmt.Errorf("cannot write [short bytes] length: %w", err)
78+
} else if n, err := dest.Write(b); err != nil {
79+
return fmt.Errorf("cannot write [short bytes] content: %w", err)
80+
} else if n < length {
81+
return errors.New("not enough capacity to write [short bytes] content")
82+
}
83+
}
84+
return nil
85+
}
86+
5387
func LengthOfShortBytes(b []byte) int {
5488
return LengthOfShort + len(b)
5589
}

0 commit comments

Comments
 (0)