Skip to content

N
neoppod
Commit 2a1755e5 authored by Levin Zimmermann's avatar Levin Zimmermann
Browse files
Options

proto: Update 'Compression' to int to support different compression algorithms 

With nexedi/neoppod@fd80cc30 NEO/py added support to encode the compression
algorithm with the 'Compression' parameter. Before this, compression could
only be true (= with compression) or false (= without compression). Now
the absence of compression is encoded with 0. Any other number than 0
encodes a compression algorithm. The mapping is currently:

	1 = zlib

In the future, 2 could mean zstd [1].

[1] https://github.com/facebook/zstd/issues/1134
parent ca2eacb1
Hide whitespace changes
Inline Side-by-side
Showing with 164 additions and 139 deletions
go/neo/client.go
View file @ 2a1755e5
...@@ -381,7 +381,10 @@ func (c *Client) Load(ctx context.Context, xid zodb.Xid) (buf *mem.Buf, serial z ...@@ -381,7 +381,10 @@ func (c *Client) Load(ctx context.Context, xid zodb.Xid) (buf *mem.Buf, serial z
} }
} }
if resp.Compression { if resp.Compression != 0 {
if resp.Compression != 1 {
return nil, 0, fmt.Errorf("unsupported compression algorithm: %v", resp.Compression)
}
buf2 := &mem.Buf{Data: nil} buf2 := &mem.Buf{Data: nil}
udata, err := xzlib.Decompress(buf.Data) udata, err := xzlib.Decompress(buf.Data)
buf.Release() buf.Release()
......
go/neo/neo_test.go
View file @ 2a1755e5
...@@ -257,7 +257,7 @@ func _TestMasterStorage(t0 *tEnv) { ...@@ -257,7 +257,7 @@ func _TestMasterStorage(t0 *tEnv) {
Oid: xid1.Oid, Oid: xid1.Oid,
Serial: serial1, Serial: serial1,
NextSerial: proto.INVALID_TID, NextSerial: proto.INVALID_TID,
Compression: false, Compression: 0,
Data: buf1, Data: buf1,
DataSerial: 0, // XXX DataSerial: 0, // XXX
Checksum: sha1.Sum(buf1.Data), Checksum: sha1.Sum(buf1.Data),
...@@ -292,7 +292,7 @@ func _TestMasterStorage(t0 *tEnv) { ...@@ -292,7 +292,7 @@ func _TestMasterStorage(t0 *tEnv) {
Oid: xid1prev.Oid, Oid: xid1prev.Oid,
Serial: serial1prev, Serial: serial1prev,
NextSerial: serial1, NextSerial: serial1,
Compression: false, Compression: 0,
Data: buf1prev, Data: buf1prev,
DataSerial: 0, // XXX DataSerial: 0, // XXX
Checksum: sha1.Sum(buf1prev.Data), Checksum: sha1.Sum(buf1prev.Data),
......
go/neo/proto/proto.go
View file @ 2a1755e5
...@@ -336,6 +336,11 @@ func (a *Address) neoDecodeN(b []byte) (uint64, bool) { ...@@ -336,6 +336,11 @@ func (a *Address) neoDecodeN(b []byte) (uint64, bool) {
// Checksum is a SHA1 hash. // Checksum is a SHA1 hash.
type Checksum [20]byte type Checksum [20]byte
// Compression is an integer that tells the compression algorithm:
// 0 = no compression algorithm is used
// 1 = zlib is used
type Compression uint64
// PTid is Partition Table identifier. // PTid is Partition Table identifier.
// //
// Zero value means "invalid id" (<-> None in py.PPTID, nil in msgpack) // Zero value means "invalid id" (<-> None in py.PPTID, nil in msgpack)
...@@ -713,7 +718,7 @@ type AnswerRebaseObject struct { ...@@ -713,7 +718,7 @@ type AnswerRebaseObject struct {
Serial zodb.Tid Serial zodb.Tid
ConflictSerial zodb.Tid ConflictSerial zodb.Tid
// FIXME POption('data') // FIXME POption('data')
Compression bool Compression Compression
Checksum Checksum Checksum Checksum
Data *mem.Buf Data *mem.Buf
} }
...@@ -727,7 +732,7 @@ type AnswerRebaseObject struct { ...@@ -727,7 +732,7 @@ type AnswerRebaseObject struct {
type StoreObject struct { type StoreObject struct {
Oid zodb.Oid Oid zodb.Oid
Serial zodb.Tid Serial zodb.Tid
Compression bool Compression Compression
Checksum Checksum Checksum Checksum
Data []byte // TODO -> msg.Buf, separately (for writev) Data []byte // TODO -> msg.Buf, separately (for writev)
DataSerial zodb.Tid DataSerial zodb.Tid
...@@ -782,7 +787,7 @@ type AnswerObject struct { ...@@ -782,7 +787,7 @@ type AnswerObject struct {
Oid zodb.Oid Oid zodb.Oid
Serial zodb.Tid Serial zodb.Tid
NextSerial zodb.Tid NextSerial zodb.Tid
Compression bool Compression Compression
Checksum Checksum Checksum Checksum
Data *mem.Buf // TODO encode -> separately (for writev) Data *mem.Buf // TODO encode -> separately (for writev)
DataSerial zodb.Tid DataSerial zodb.Tid
...@@ -1217,7 +1222,7 @@ type AddTransaction struct { ...@@ -1217,7 +1222,7 @@ type AddTransaction struct {
type AddObject struct { type AddObject struct {
Oid zodb.Oid Oid zodb.Oid
Serial zodb.Tid Serial zodb.Tid
Compression bool Compression Compression
Checksum Checksum Checksum Checksum
Data *mem.Buf Data *mem.Buf
DataSerial zodb.Tid DataSerial zodb.Tid
......
go/neo/proto/proto_test.go
View file @ 2a1755e5
...@@ -182,7 +182,7 @@ func TestMsgMarshal(t *testing.T) { ...@@ -182,7 +182,7 @@ func TestMsgMarshal(t *testing.T) {
{&StoreObject{ {&StoreObject{
Oid: 0x0102030405060708, Oid: 0x0102030405060708,
Serial: 0x0a0b0c0d0e0f0102, Serial: 0x0a0b0c0d0e0f0102,
Compression: false, Compression: 0,
Checksum: Checksum{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20}, // XXX simpler? Checksum: Checksum{1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20}, // XXX simpler?
Data: []byte("hello world"), Data: []byte("hello world"),
DataSerial: 0x0a0b0c0d0e0f0103, DataSerial: 0x0a0b0c0d0e0f0103,
...@@ -190,6 +190,7 @@ func TestMsgMarshal(t *testing.T) { ...@@ -190,6 +190,7 @@ func TestMsgMarshal(t *testing.T) {
}, },
hex("01020304050607080a0b0c0d0e0f010200") + hex("01020304050607080a0b0c0d0e0f010200") +
hex("00000000000000") +
hex("0102030405060708090a0b0c0d0e0f1011121314") + hex("0102030405060708090a0b0c0d0e0f1011121314") +
hex("0000000b") + "hello world" + hex("0000000b") + "hello world" +
hex("0a0b0c0d0e0f01030a0b0c0d0e0f0104"), hex("0a0b0c0d0e0f01030a0b0c0d0e0f0104"),
...@@ -198,7 +199,7 @@ func TestMsgMarshal(t *testing.T) { ...@@ -198,7 +199,7 @@ func TestMsgMarshal(t *testing.T) {
hex("97") + hex("97") +
hex("c408") + hex("0102030405060708") + hex("c408") + hex("0102030405060708") +
hex("c408") + hex("0a0b0c0d0e0f0102") + hex("c408") + hex("0a0b0c0d0e0f0102") +
hex("c2") + hex("00") +
hex("c414") + hex("0102030405060708090a0b0c0d0e0f1011121314") + hex("c414") + hex("0102030405060708090a0b0c0d0e0f1011121314") +
hex("c40b") + "hello world" + hex("c40b") + "hello world" +
hex("c408") + hex("0a0b0c0d0e0f0103") + hex("c408") + hex("0a0b0c0d0e0f0103") +
......
go/neo/proto/zproto-marshal.go
View file @ 2a1755e5
...@@ -4815,18 +4815,18 @@ func (*AnswerRebaseObject) neoMsgCode() uint16 { ...@@ -4815,18 +4815,18 @@ func (*AnswerRebaseObject) neoMsgCode() uint16 {
} }
func (p *AnswerRebaseObject) neoMsgEncodedLenN() int { func (p *AnswerRebaseObject) neoMsgEncodedLenN() int {
return 41 + len(p.Data.XData()) return 48 + len(p.Data.XData())
} }
func (p *AnswerRebaseObject) neoMsgEncodeN(data []byte) { func (p *AnswerRebaseObject) neoMsgEncodeN(data []byte) {
binary.BigEndian.PutUint64(data[0:], uint64(p.Serial)) binary.BigEndian.PutUint64(data[0:], uint64(p.Serial))
binary.BigEndian.PutUint64(data[8:], uint64(p.ConflictSerial)) binary.BigEndian.PutUint64(data[8:], uint64(p.ConflictSerial))
(data[16:])[0] = bool2byte(p.Compression) binary.BigEndian.PutUint64(data[16:], uint64(p.Compression))
copy(data[17:], p.Checksum[:]) copy(data[24:], p.Checksum[:])
{ {
l := uint32(len(p.Data.XData())) l := uint32(len(p.Data.XData()))
binary.BigEndian.PutUint32(data[37:], l) binary.BigEndian.PutUint32(data[44:], l)
data = data[41:] data = data[48:]
copy(data, p.Data.XData()) copy(data, p.Data.XData())
data = data[l:] data = data[l:]
} }
...@@ -4834,16 +4834,16 @@ func (p *AnswerRebaseObject) neoMsgEncodeN(data []byte) { ...@@ -4834,16 +4834,16 @@ func (p *AnswerRebaseObject) neoMsgEncodeN(data []byte) {
func (p *AnswerRebaseObject) neoMsgDecodeN(data []byte) (int, error) { func (p *AnswerRebaseObject) neoMsgDecodeN(data []byte) (int, error) {
var nread uint64 var nread uint64
if len(data) < 41 { if len(data) < 48 {
goto overflow goto overflow
} }
p.Serial = zodb.Tid(binary.BigEndian.Uint64(data[0 : 0+8])) p.Serial = zodb.Tid(binary.BigEndian.Uint64(data[0 : 0+8]))
p.ConflictSerial = zodb.Tid(binary.BigEndian.Uint64(data[8 : 8+8])) p.ConflictSerial = zodb.Tid(binary.BigEndian.Uint64(data[8 : 8+8]))
p.Compression = byte2bool((data[16 : 16+1])[0]) p.Compression = Compression(binary.BigEndian.Uint64(data[16 : 16+8]))
copy(p.Checksum[:], data[17:37]) copy(p.Checksum[:], data[24:44])
{ {
l := binary.BigEndian.Uint32(data[37 : 37+4]) l := binary.BigEndian.Uint32(data[44 : 44+4])
data = data[41:] data = data[48:]
if uint64(len(data)) < uint64(l) { if uint64(len(data)) < uint64(l) {
goto overflow goto overflow
} }
...@@ -4852,7 +4852,7 @@ func (p *AnswerRebaseObject) neoMsgDecodeN(data []byte) (int, error) { ...@@ -4852,7 +4852,7 @@ func (p *AnswerRebaseObject) neoMsgDecodeN(data []byte) (int, error) {
copy(p.Data.Data, data[:l]) copy(p.Data.Data, data[:l])
data = data[l:] data = data[l:]
} }
return 41 + int(nread), nil return 48 + int(nread), nil
overflow: overflow:
return 0, ErrDecodeOverflow return 0, ErrDecodeOverflow
...@@ -4870,7 +4870,7 @@ func (p *AnswerRebaseObject) neoMsgEncodedLenM() int { ...@@ -4870,7 +4870,7 @@ func (p *AnswerRebaseObject) neoMsgEncodedLenM() int {
} else { } else {
size += 1 + 1 + 8 // mbin8 + 8 + [8]data size += 1 + 1 + 8 // mbin8 + 8 + [8]data
} }
return 23 + msgpack.ArrayHeadSize(reflect.TypeOf((*p)).NumField()) + msgpack.BinHeadSize(len(p.Data.XData())) + len(p.Data.XData()) + size return 22 + msgpack.ArrayHeadSize(reflect.TypeOf((*p)).NumField()) + msgpack.Uint64Size(uint64(p.Compression)) + msgpack.BinHeadSize(len(p.Data.XData())) + len(p.Data.XData()) + size
} }
func (p *AnswerRebaseObject) neoMsgEncodeM(data []byte) { func (p *AnswerRebaseObject) neoMsgEncodeM(data []byte) {
...@@ -4893,14 +4893,17 @@ func (p *AnswerRebaseObject) neoMsgEncodeM(data []byte) { ...@@ -4893,14 +4893,17 @@ func (p *AnswerRebaseObject) neoMsgEncodeM(data []byte) {
binary.BigEndian.PutUint64(data[2:], uint64(p.ConflictSerial)) binary.BigEndian.PutUint64(data[2:], uint64(p.ConflictSerial))
data = data[10:] data = data[10:]
} }
data[0] = byte(msgpack.Bool(p.Compression)) {
data[1] = byte(msgpack.Bin8) n := msgpack.PutUint64(data[0:], uint64(p.Compression))
data[2] = 20 data = data[0+n:]
copy(data[3:], p.Checksum[:]) }
data[0] = byte(msgpack.Bin8)
data[1] = 20
copy(data[2:], p.Checksum[:])
{ {
l := len(p.Data.XData()) l := len(p.Data.XData())
n := msgpack.PutBinHead(data[23:], l) n := msgpack.PutBinHead(data[22:], l)
data = data[23+n:] data = data[22+n:]
copy(data, p.Data.XData()) copy(data, p.Data.XData())
data = data[l:] data = data[l:]
} }
...@@ -4950,25 +4953,26 @@ func (p *AnswerRebaseObject) neoMsgDecodeM(data []byte) (int, error) { ...@@ -4950,25 +4953,26 @@ func (p *AnswerRebaseObject) neoMsgDecodeM(data []byte) (int, error) {
p.ConflictSerial = zodb.Tid(binary.BigEndian.Uint64(data[2:])) p.ConflictSerial = zodb.Tid(binary.BigEndian.Uint64(data[2:]))
data = data[10:] data = data[10:]
} }
if len(data) < 23 { {
goto overflow v, tail, err := msgp.ReadUint64Bytes(data)
if err != nil {
return 0, mdecodeErr("AnswerRebaseObject.Compression", err)
}
p.Compression = Compression(v)
nread += uint64(len(data) - len(tail))
data = tail
} }
switch op := msgpack.Op(data[0]); op { if len(data) < 22 {
default: goto overflow
return 0, mdecodeOpErr("AnswerRebaseObject.Compression", op, msgpack.True, msgpack.False)
case msgpack.True:
p.Compression = true
case msgpack.False:
p.Compression = false
} }
if op := msgpack.Op(data[1]); op != msgpack.Bin8 { if op := msgpack.Op(data[0]); op != msgpack.Bin8 {
return 0, mdecodeOpErr("AnswerRebaseObject.Checksum", op, msgpack.Bin8) return 0, mdecodeOpErr("AnswerRebaseObject.Checksum", op, msgpack.Bin8)
} }
if l := data[2]; l != 20 { if l := data[1]; l != 20 {
return 0, mdecodeLen8Err("AnswerRebaseObject.Checksum", l, 20) return 0, mdecodeLen8Err("AnswerRebaseObject.Checksum", l, 20)
} }
copy(p.Checksum[:], data[3:23]) copy(p.Checksum[:], data[2:22])
data = data[23:] data = data[22:]
{ {
b, tail, err := msgp.ReadBytesZC(data) b, tail, err := msgp.ReadBytesZC(data)
if err != nil { if err != nil {
...@@ -4979,7 +4983,7 @@ func (p *AnswerRebaseObject) neoMsgDecodeM(data []byte) (int, error) { ...@@ -4979,7 +4983,7 @@ func (p *AnswerRebaseObject) neoMsgDecodeM(data []byte) (int, error) {
nread += uint64(len(data) - len(tail)) nread += uint64(len(data) - len(tail))
data = tail data = tail
} }
return 23 + int(nread), nil return 22 + int(nread), nil
overflow: overflow:
return 0, ErrDecodeOverflow return 0, ErrDecodeOverflow
...@@ -4992,18 +4996,18 @@ func (*StoreObject) neoMsgCode() uint16 { ...@@ -4992,18 +4996,18 @@ func (*StoreObject) neoMsgCode() uint16 {
} }
func (p *StoreObject) neoMsgEncodedLenN() int { func (p *StoreObject) neoMsgEncodedLenN() int {
return 57 + len(p.Data) return 64 + len(p.Data)
} }
func (p *StoreObject) neoMsgEncodeN(data []byte) { func (p *StoreObject) neoMsgEncodeN(data []byte) {
binary.BigEndian.PutUint64(data[0:], uint64(p.Oid)) binary.BigEndian.PutUint64(data[0:], uint64(p.Oid))
binary.BigEndian.PutUint64(data[8:], uint64(p.Serial)) binary.BigEndian.PutUint64(data[8:], uint64(p.Serial))
(data[16:])[0] = bool2byte(p.Compression) binary.BigEndian.PutUint64(data[16:], uint64(p.Compression))
copy(data[17:], p.Checksum[:]) copy(data[24:], p.Checksum[:])
{ {
l := uint32(len(p.Data)) l := uint32(len(p.Data))
binary.BigEndian.PutUint32(data[37:], l) binary.BigEndian.PutUint32(data[44:], l)
data = data[41:] data = data[48:]
copy(data, p.Data) copy(data, p.Data)
data = data[l:] data = data[l:]
} }
...@@ -5013,16 +5017,16 @@ func (p *StoreObject) neoMsgEncodeN(data []byte) { ...@@ -5013,16 +5017,16 @@ func (p *StoreObject) neoMsgEncodeN(data []byte) {
func (p *StoreObject) neoMsgDecodeN(data []byte) (int, error) { func (p *StoreObject) neoMsgDecodeN(data []byte) (int, error) {
var nread uint64 var nread uint64
if len(data) < 41 { if len(data) < 48 {
goto overflow goto overflow
} }
p.Oid = zodb.Oid(binary.BigEndian.Uint64(data[0 : 0+8])) p.Oid = zodb.Oid(binary.BigEndian.Uint64(data[0 : 0+8]))
p.Serial = zodb.Tid(binary.BigEndian.Uint64(data[8 : 8+8])) p.Serial = zodb.Tid(binary.BigEndian.Uint64(data[8 : 8+8]))
p.Compression = byte2bool((data[16 : 16+1])[0]) p.Compression = Compression(binary.BigEndian.Uint64(data[16 : 16+8]))
copy(p.Checksum[:], data[17:37]) copy(p.Checksum[:], data[24:44])
{ {
l := binary.BigEndian.Uint32(data[37 : 37+4]) l := binary.BigEndian.Uint32(data[44 : 44+4])
data = data[41:] data = data[48:]
if uint64(len(data)) < 16+uint64(l) { if uint64(len(data)) < 16+uint64(l) {
goto overflow goto overflow
} }
...@@ -5033,7 +5037,7 @@ func (p *StoreObject) neoMsgDecodeN(data []byte) (int, error) { ...@@ -5033,7 +5037,7 @@ func (p *StoreObject) neoMsgDecodeN(data []byte) (int, error) {
} }
p.DataSerial = zodb.Tid(binary.BigEndian.Uint64(data[0 : 0+8])) p.DataSerial = zodb.Tid(binary.BigEndian.Uint64(data[0 : 0+8]))
p.Tid = zodb.Tid(binary.BigEndian.Uint64(data[8 : 8+8])) p.Tid = zodb.Tid(binary.BigEndian.Uint64(data[8 : 8+8]))
return 41 + int(nread), nil return 48 + int(nread), nil
overflow: overflow:
return 0, ErrDecodeOverflow return 0, ErrDecodeOverflow
...@@ -5061,7 +5065,7 @@ func (p *StoreObject) neoMsgEncodedLenM() int { ...@@ -5061,7 +5065,7 @@ func (p *StoreObject) neoMsgEncodedLenM() int {
} else { } else {
size += 1 + 1 + 8 // mbin8 + 8 + [8]data size += 1 + 1 + 8 // mbin8 + 8 + [8]data
} }
return 23 + msgpack.ArrayHeadSize(reflect.TypeOf((*p)).NumField()) + msgpack.BinHeadSize(len(p.Data)) + len(p.Data) + size return 22 + msgpack.ArrayHeadSize(reflect.TypeOf((*p)).NumField()) + msgpack.Uint64Size(uint64(p.Compression)) + msgpack.BinHeadSize(len(p.Data)) + len(p.Data) + size
} }
func (p *StoreObject) neoMsgEncodeM(data []byte) { func (p *StoreObject) neoMsgEncodeM(data []byte) {
...@@ -5084,14 +5088,17 @@ func (p *StoreObject) neoMsgEncodeM(data []byte) { ...@@ -5084,14 +5088,17 @@ func (p *StoreObject) neoMsgEncodeM(data []byte) {
binary.BigEndian.PutUint64(data[2:], uint64(p.Serial)) binary.BigEndian.PutUint64(data[2:], uint64(p.Serial))
data = data[10:] data = data[10:]
} }
data[0] = byte(msgpack.Bool(p.Compression)) {
data[1] = byte(msgpack.Bin8) n := msgpack.PutUint64(data[0:], uint64(p.Compression))
data[2] = 20 data = data[0+n:]
copy(data[3:], p.Checksum[:]) }
data[0] = byte(msgpack.Bin8)
data[1] = 20
copy(data[2:], p.Checksum[:])
{ {
l := len(p.Data) l := len(p.Data)
n := msgpack.PutBinHead(data[23:], l) n := msgpack.PutBinHead(data[22:], l)
data = data[23+n:] data = data[22+n:]
copy(data, p.Data) copy(data, p.Data)
data = data[l:] data = data[l:]
} }
...@@ -5159,25 +5166,26 @@ func (p *StoreObject) neoMsgDecodeM(data []byte) (int, error) { ...@@ -5159,25 +5166,26 @@ func (p *StoreObject) neoMsgDecodeM(data []byte) (int, error) {
p.Serial = zodb.Tid(binary.BigEndian.Uint64(data[2:])) p.Serial = zodb.Tid(binary.BigEndian.Uint64(data[2:]))
data = data[10:] data = data[10:]
} }
if len(data) < 23 { {
goto overflow v, tail, err := msgp.ReadUint64Bytes(data)
if err != nil {
return 0, mdecodeErr("StoreObject.Compression", err)
}
p.Compression = Compression(v)
nread += uint64(len(data) - len(tail))
data = tail
} }
switch op := msgpack.Op(data[0]); op { if len(data) < 22 {
default: goto overflow
return 0, mdecodeOpErr("StoreObject.Compression", op, msgpack.True, msgpack.False)
case msgpack.True:
p.Compression = true
case msgpack.False:
p.Compression = false
} }
if op := msgpack.Op(data[1]); op != msgpack.Bin8 { if op := msgpack.Op(data[0]); op != msgpack.Bin8 {
return 0, mdecodeOpErr("StoreObject.Checksum", op, msgpack.Bin8) return 0, mdecodeOpErr("StoreObject.Checksum", op, msgpack.Bin8)
} }
if l := data[2]; l != 20 { if l := data[1]; l != 20 {
return 0, mdecodeLen8Err("StoreObject.Checksum", l, 20) return 0, mdecodeLen8Err("StoreObject.Checksum", l, 20)
} }
copy(p.Checksum[:], data[3:23]) copy(p.Checksum[:], data[2:22])
data = data[23:] data = data[22:]
{ {
b, tail, err := msgp.ReadBytesZC(data) b, tail, err := msgp.ReadBytesZC(data)
if err != nil { if err != nil {
...@@ -5222,7 +5230,7 @@ func (p *StoreObject) neoMsgDecodeM(data []byte) (int, error) { ...@@ -5222,7 +5230,7 @@ func (p *StoreObject) neoMsgDecodeM(data []byte) (int, error) {
p.Tid = zodb.Tid(binary.BigEndian.Uint64(data[2:])) p.Tid = zodb.Tid(binary.BigEndian.Uint64(data[2:]))
data = data[10:] data = data[10:]
} }
return 23 + int(nread), nil return 22 + int(nread), nil
overflow: overflow:
return 0, ErrDecodeOverflow return 0, ErrDecodeOverflow
...@@ -6014,19 +6022,19 @@ func (*AnswerObject) neoMsgCode() uint16 { ...@@ -6014,19 +6022,19 @@ func (*AnswerObject) neoMsgCode() uint16 {
} }
func (p *AnswerObject) neoMsgEncodedLenN() int { func (p *AnswerObject) neoMsgEncodedLenN() int {
return 57 + len(p.Data.XData()) return 64 + len(p.Data.XData())
} }
func (p *AnswerObject) neoMsgEncodeN(data []byte) { func (p *AnswerObject) neoMsgEncodeN(data []byte) {
binary.BigEndian.PutUint64(data[0:], uint64(p.Oid)) binary.BigEndian.PutUint64(data[0:], uint64(p.Oid))
binary.BigEndian.PutUint64(data[8:], uint64(p.Serial)) binary.BigEndian.PutUint64(data[8:], uint64(p.Serial))
binary.BigEndian.PutUint64(data[16:], uint64(p.NextSerial)) binary.BigEndian.PutUint64(data[16:], uint64(p.NextSerial))
(data[24:])[0] = bool2byte(p.Compression) binary.BigEndian.PutUint64(data[24:], uint64(p.Compression))
copy(data[25:], p.Checksum[:]) copy(data[32:], p.Checksum[:])
{ {
l := uint32(len(p.Data.XData())) l := uint32(len(p.Data.XData()))
binary.BigEndian.PutUint32(data[45:], l) binary.BigEndian.PutUint32(data[52:], l)
data = data[49:] data = data[56:]
copy(data, p.Data.XData()) copy(data, p.Data.XData())
data = data[l:] data = data[l:]
} }
...@@ -6035,17 +6043,17 @@ func (p *AnswerObject) neoMsgEncodeN(data []byte) { ...@@ -6035,17 +6043,17 @@ func (p *AnswerObject) neoMsgEncodeN(data []byte) {
func (p *AnswerObject) neoMsgDecodeN(data []byte) (int, error) { func (p *AnswerObject) neoMsgDecodeN(data []byte) (int, error) {
var nread uint64 var nread uint64
if len(data) < 49 { if len(data) < 56 {
goto overflow goto overflow
} }
p.Oid = zodb.Oid(binary.BigEndian.Uint64(data[0 : 0+8])) p.Oid = zodb.Oid(binary.BigEndian.Uint64(data[0 : 0+8]))
p.Serial = zodb.Tid(binary.BigEndian.Uint64(data[8 : 8+8])) p.Serial = zodb.Tid(binary.BigEndian.Uint64(data[8 : 8+8]))
p.NextSerial = zodb.Tid(binary.BigEndian.Uint64(data[16 : 16+8])) p.NextSerial = zodb.Tid(binary.BigEndian.Uint64(data[16 : 16+8]))
p.Compression = byte2bool((data[24 : 24+1])[0]) p.Compression = Compression(binary.BigEndian.Uint64(data[24 : 24+8]))
copy(p.Checksum[:], data[25:45]) copy(p.Checksum[:], data[32:52])
{ {
l := binary.BigEndian.Uint32(data[45 : 45+4]) l := binary.BigEndian.Uint32(data[52 : 52+4])
data = data[49:] data = data[56:]
if uint64(len(data)) < 8+uint64(l) { if uint64(len(data)) < 8+uint64(l) {
goto overflow goto overflow
} }
...@@ -6055,7 +6063,7 @@ func (p *AnswerObject) neoMsgDecodeN(data []byte) (int, error) { ...@@ -6055,7 +6063,7 @@ func (p *AnswerObject) neoMsgDecodeN(data []byte) (int, error) {
data = data[l:] data = data[l:]
} }
p.DataSerial = zodb.Tid(binary.BigEndian.Uint64(data[0 : 0+8])) p.DataSerial = zodb.Tid(binary.BigEndian.Uint64(data[0 : 0+8]))
return 49 + int(nread), nil return 56 + int(nread), nil
overflow: overflow:
return 0, ErrDecodeOverflow return 0, ErrDecodeOverflow
...@@ -6083,7 +6091,7 @@ func (p *AnswerObject) neoMsgEncodedLenM() int { ...@@ -6083,7 +6091,7 @@ func (p *AnswerObject) neoMsgEncodedLenM() int {
} else { } else {
size += 1 + 1 + 8 // mbin8 + 8 + [8]data size += 1 + 1 + 8 // mbin8 + 8 + [8]data
} }
return 23 + msgpack.ArrayHeadSize(reflect.TypeOf((*p)).NumField()) + msgpack.BinHeadSize(len(p.Data.XData())) + len(p.Data.XData()) + size return 22 + msgpack.ArrayHeadSize(reflect.TypeOf((*p)).NumField()) + msgpack.Uint64Size(uint64(p.Compression)) + msgpack.BinHeadSize(len(p.Data.XData())) + len(p.Data.XData()) + size
} }
func (p *AnswerObject) neoMsgEncodeM(data []byte) { func (p *AnswerObject) neoMsgEncodeM(data []byte) {
...@@ -6115,14 +6123,17 @@ func (p *AnswerObject) neoMsgEncodeM(data []byte) { ...@@ -6115,14 +6123,17 @@ func (p *AnswerObject) neoMsgEncodeM(data []byte) {
binary.BigEndian.PutUint64(data[2:], uint64(p.NextSerial)) binary.BigEndian.PutUint64(data[2:], uint64(p.NextSerial))
data = data[10:] data = data[10:]
} }
data[0] = byte(msgpack.Bool(p.Compression)) {
data[1] = byte(msgpack.Bin8) n := msgpack.PutUint64(data[0:], uint64(p.Compression))
data[2] = 20 data = data[0+n:]
copy(data[3:], p.Checksum[:]) }
data[0] = byte(msgpack.Bin8)
data[1] = 20
copy(data[2:], p.Checksum[:])
{ {
l := len(p.Data.XData()) l := len(p.Data.XData())
n := msgpack.PutBinHead(data[23:], l) n := msgpack.PutBinHead(data[22:], l)
data = data[23+n:] data = data[22+n:]
copy(data, p.Data.XData()) copy(data, p.Data.XData())
data = data[l:] data = data[l:]
} }
...@@ -6198,25 +6209,26 @@ func (p *AnswerObject) neoMsgDecodeM(data []byte) (int, error) { ...@@ -6198,25 +6209,26 @@ func (p *AnswerObject) neoMsgDecodeM(data []byte) (int, error) {
p.NextSerial = zodb.Tid(binary.BigEndian.Uint64(data[2:])) p.NextSerial = zodb.Tid(binary.BigEndian.Uint64(data[2:]))
data = data[10:] data = data[10:]
} }
if len(data) < 23 { {
goto overflow v, tail, err := msgp.ReadUint64Bytes(data)
if err != nil {
return 0, mdecodeErr("AnswerObject.Compression", err)
}
p.Compression = Compression(v)
nread += uint64(len(data) - len(tail))
data = tail
} }
switch op := msgpack.Op(data[0]); op { if len(data) < 22 {
default: goto overflow
return 0, mdecodeOpErr("AnswerObject.Compression", op, msgpack.True, msgpack.False)
case msgpack.True:
p.Compression = true
case msgpack.False:
p.Compression = false
} }
if op := msgpack.Op(data[1]); op != msgpack.Bin8 { if op := msgpack.Op(data[0]); op != msgpack.Bin8 {
return 0, mdecodeOpErr("AnswerObject.Checksum", op, msgpack.Bin8) return 0, mdecodeOpErr("AnswerObject.Checksum", op, msgpack.Bin8)
} }
if l := data[2]; l != 20 { if l := data[1]; l != 20 {
return 0, mdecodeLen8Err("AnswerObject.Checksum", l, 20) return 0, mdecodeLen8Err("AnswerObject.Checksum", l, 20)
} }
copy(p.Checksum[:], data[3:23]) copy(p.Checksum[:], data[2:22])
data = data[23:] data = data[22:]
{ {
b, tail, err := msgp.ReadBytesZC(data) b, tail, err := msgp.ReadBytesZC(data)
if err != nil { if err != nil {
...@@ -6244,7 +6256,7 @@ func (p *AnswerObject) neoMsgDecodeM(data []byte) (int, error) { ...@@ -6244,7 +6256,7 @@ func (p *AnswerObject) neoMsgDecodeM(data []byte) (int, error) {
p.DataSerial = zodb.Tid(binary.BigEndian.Uint64(data[2:])) p.DataSerial = zodb.Tid(binary.BigEndian.Uint64(data[2:]))
data = data[10:] data = data[10:]
} }
return 23 + int(nread), nil return 22 + int(nread), nil
overflow: overflow:
return 0, ErrDecodeOverflow return 0, ErrDecodeOverflow
...@@ -12984,18 +12996,18 @@ func (*AddObject) neoMsgCode() uint16 { ...@@ -12984,18 +12996,18 @@ func (*AddObject) neoMsgCode() uint16 {
} }
func (p *AddObject) neoMsgEncodedLenN() int { func (p *AddObject) neoMsgEncodedLenN() int {
return 49 + len(p.Data.XData()) return 56 + len(p.Data.XData())
} }
func (p *AddObject) neoMsgEncodeN(data []byte) { func (p *AddObject) neoMsgEncodeN(data []byte) {
binary.BigEndian.PutUint64(data[0:], uint64(p.Oid)) binary.BigEndian.PutUint64(data[0:], uint64(p.Oid))
binary.BigEndian.PutUint64(data[8:], uint64(p.Serial)) binary.BigEndian.PutUint64(data[8:], uint64(p.Serial))
(data[16:])[0] = bool2byte(p.Compression) binary.BigEndian.PutUint64(data[16:], uint64(p.Compression))
copy(data[17:], p.Checksum[:]) copy(data[24:], p.Checksum[:])
{ {
l := uint32(len(p.Data.XData())) l := uint32(len(p.Data.XData()))
binary.BigEndian.PutUint32(data[37:], l) binary.BigEndian.PutUint32(data[44:], l)
data = data[41:] data = data[48:]
copy(data, p.Data.XData()) copy(data, p.Data.XData())
data = data[l:] data = data[l:]
} }
...@@ -13004,16 +13016,16 @@ func (p *AddObject) neoMsgEncodeN(data []byte) { ...@@ -13004,16 +13016,16 @@ func (p *AddObject) neoMsgEncodeN(data []byte) {
func (p *AddObject) neoMsgDecodeN(data []byte) (int, error) { func (p *AddObject) neoMsgDecodeN(data []byte) (int, error) {
var nread uint64 var nread uint64
if len(data) < 41 { if len(data) < 48 {
goto overflow goto overflow
} }
p.Oid = zodb.Oid(binary.BigEndian.Uint64(data[0 : 0+8])) p.Oid = zodb.Oid(binary.BigEndian.Uint64(data[0 : 0+8]))
p.Serial = zodb.Tid(binary.BigEndian.Uint64(data[8 : 8+8])) p.Serial = zodb.Tid(binary.BigEndian.Uint64(data[8 : 8+8]))
p.Compression = byte2bool((data[16 : 16+1])[0]) p.Compression = Compression(binary.BigEndian.Uint64(data[16 : 16+8]))
copy(p.Checksum[:], data[17:37]) copy(p.Checksum[:], data[24:44])
{ {
l := binary.BigEndian.Uint32(data[37 : 37+4]) l := binary.BigEndian.Uint32(data[44 : 44+4])
data = data[41:] data = data[48:]
if uint64(len(data)) < 8+uint64(l) { if uint64(len(data)) < 8+uint64(l) {
goto overflow goto overflow
} }
...@@ -13023,7 +13035,7 @@ func (p *AddObject) neoMsgDecodeN(data []byte) (int, error) { ...@@ -13023,7 +13035,7 @@ func (p *AddObject) neoMsgDecodeN(data []byte) (int, error) {
data = data[l:] data = data[l:]
} }
p.DataSerial = zodb.Tid(binary.BigEndian.Uint64(data[0 : 0+8])) p.DataSerial = zodb.Tid(binary.BigEndian.Uint64(data[0 : 0+8]))
return 41 + int(nread), nil return 48 + int(nread), nil
overflow: overflow:
return 0, ErrDecodeOverflow return 0, ErrDecodeOverflow
...@@ -13046,7 +13058,7 @@ func (p *AddObject) neoMsgEncodedLenM() int { ...@@ -13046,7 +13058,7 @@ func (p *AddObject) neoMsgEncodedLenM() int {
} else { } else {
size += 1 + 1 + 8 // mbin8 + 8 + [8]data size += 1 + 1 + 8 // mbin8 + 8 + [8]data
} }
return 23 + msgpack.ArrayHeadSize(reflect.TypeOf((*p)).NumField()) + msgpack.BinHeadSize(len(p.Data.XData())) + len(p.Data.XData()) + size return 22 + msgpack.ArrayHeadSize(reflect.TypeOf((*p)).NumField()) + msgpack.Uint64Size(uint64(p.Compression)) + msgpack.BinHeadSize(len(p.Data.XData())) + len(p.Data.XData()) + size
} }
func (p *AddObject) neoMsgEncodeM(data []byte) { func (p *AddObject) neoMsgEncodeM(data []byte) {
...@@ -13069,14 +13081,17 @@ func (p *AddObject) neoMsgEncodeM(data []byte) { ...@@ -13069,14 +13081,17 @@ func (p *AddObject) neoMsgEncodeM(data []byte) {
binary.BigEndian.PutUint64(data[2:], uint64(p.Serial)) binary.BigEndian.PutUint64(data[2:], uint64(p.Serial))
data = data[10:] data = data[10:]
} }
data[0] = byte(msgpack.Bool(p.Compression)) {
data[1] = byte(msgpack.Bin8) n := msgpack.PutUint64(data[0:], uint64(p.Compression))
data[2] = 20 data = data[0+n:]
copy(data[3:], p.Checksum[:]) }
data[0] = byte(msgpack.Bin8)
data[1] = 20
copy(data[2:], p.Checksum[:])
{ {
l := len(p.Data.XData()) l := len(p.Data.XData())
n := msgpack.PutBinHead(data[23:], l) n := msgpack.PutBinHead(data[22:], l)
data = data[23+n:] data = data[22+n:]
copy(data, p.Data.XData()) copy(data, p.Data.XData())
data = data[l:] data = data[l:]
} }
...@@ -13135,25 +13150,26 @@ func (p *AddObject) neoMsgDecodeM(data []byte) (int, error) { ...@@ -13135,25 +13150,26 @@ func (p *AddObject) neoMsgDecodeM(data []byte) (int, error) {
p.Serial = zodb.Tid(binary.BigEndian.Uint64(data[2:])) p.Serial = zodb.Tid(binary.BigEndian.Uint64(data[2:]))
data = data[10:] data = data[10:]
} }
if len(data) < 23 { {
goto overflow v, tail, err := msgp.ReadUint64Bytes(data)
if err != nil {
return 0, mdecodeErr("AddObject.Compression", err)
}
p.Compression = Compression(v)
nread += uint64(len(data) - len(tail))
data = tail
} }
switch op := msgpack.Op(data[0]); op { if len(data) < 22 {
default: goto overflow
return 0, mdecodeOpErr("AddObject.Compression", op, msgpack.True, msgpack.False)
case msgpack.True:
p.Compression = true
case msgpack.False:
p.Compression = false
} }
if op := msgpack.Op(data[1]); op != msgpack.Bin8 { if op := msgpack.Op(data[0]); op != msgpack.Bin8 {
return 0, mdecodeOpErr("AddObject.Checksum", op, msgpack.Bin8) return 0, mdecodeOpErr("AddObject.Checksum", op, msgpack.Bin8)
} }
if l := data[2]; l != 20 { if l := data[1]; l != 20 {
return 0, mdecodeLen8Err("AddObject.Checksum", l, 20) return 0, mdecodeLen8Err("AddObject.Checksum", l, 20)
} }
copy(p.Checksum[:], data[3:23]) copy(p.Checksum[:], data[2:22])
data = data[23:] data = data[22:]
{ {
b, tail, err := msgp.ReadBytesZC(data) b, tail, err := msgp.ReadBytesZC(data)
if err != nil { if err != nil {
...@@ -13181,7 +13197,7 @@ func (p *AddObject) neoMsgDecodeM(data []byte) (int, error) { ...@@ -13181,7 +13197,7 @@ func (p *AddObject) neoMsgDecodeM(data []byte) (int, error) {
p.DataSerial = zodb.Tid(binary.BigEndian.Uint64(data[2:])) p.DataSerial = zodb.Tid(binary.BigEndian.Uint64(data[2:]))
data = data[10:] data = data[10:]
} }
return 23 + int(nread), nil return 22 + int(nread), nil
overflow: overflow:
return 0, ErrDecodeOverflow return 0, ErrDecodeOverflow
......
go/neo/storage/fs1/fs1.go
View file @ 2a1755e5
...@@ -87,7 +87,7 @@ func (f *Backend) Load(ctx context.Context, xid zodb.Xid) (*proto.AnswerObject, ...@@ -87,7 +87,7 @@ func (f *Backend) Load(ctx context.Context, xid zodb.Xid) (*proto.AnswerObject,
Serial: serial, Serial: serial,
NextSerial: nextSerial, NextSerial: nextSerial,
Compression: false, Compression: 0,
Data: buf, Data: buf,
Checksum: xsha1.NEOSum(buf.Data), // XXX computing every time Checksum: xsha1.NEOSum(buf.Data), // XXX computing every time
......
go/neo/storage/sqlite/sqlite_test.go
View file @ 2a1755e5
...@@ -68,7 +68,7 @@ loop: ...@@ -68,7 +68,7 @@ loop:
buf := obj.Data buf := obj.Data
if obj.Compression { if obj.Compression != 0 {
b.Fatal("compression was used") b.Fatal("compression was used")
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7