.

go/neo/client/client.go

@@ -379,7 +379,7 @@ func (c *Client) LastOid(ctx context.Context) (zodb.Oid, error) {
 	panic("TODO")
 }
 
-func (c *Client) Load(ctx context.Context, xid zodb.Xid) (data []byte, serial zodb.Tid, err error) {
+func (c *Client) Load(ctx context.Context, xid zodb.Xid) (data *zodb.Buf, serial zodb.Tid, err error) {
 	defer func() {
 		switch err.(type) {
 		case nil:
@@ -448,16 +448,21 @@ func (c *Client) Load(ctx context.Context, xid zodb.Xid) (data []byte, serial zo
 
 	data = resp.Data
 
-	//checksum := sha1.Sum(data)
+	//checksum := sha1.Sum(data.Data)
 	//if checksum != resp.Checksum {
 	//	return nil, 0, fmt.Errorf("data corrupt: checksum mismatch")
 	//}
 
 	if resp.Compression {
-		data, err = decompress(resp.Data, make([]byte, 0, len(resp.Data)))
+		data2 := zodb.BufAlloc(len(data.Data))
+		data2.Data = data2.Data[:0]
+		udata, err = decompress(resp.Data, data2)
+		data.Free()
 		if err != nil {
+			data2.Free()
 			return nil, 0, fmt.Errorf("data corrupt: %v", err)
 		}
+		data = data2
 	}
 
 	// reply.NextSerial

go/neo/client/util.go

@@ -23,7 +23,7 @@ func lclose(ctx context.Context, c io.Closer) {
 // decompress decompresses data according to zlib encoding.
 //
 // out buffer, if there is enough capacity, is used for decompression destination.
-// if out has not not enough capacity a new buffer is allocated and used.
+// if out has not enough capacity a new buffer is allocated and used.
 //
 // return: destination buffer with full decompressed data or error.
 func decompress(in []byte, out []byte) (data []byte, err error) {

go/neo/proto.go

@@ -646,7 +646,8 @@ type AnswerObject struct {
 	NextSerial      zodb.Tid	// XXX but there it is out of sync
 	Compression     bool
 	Checksum        Checksum
-	Data            []byte          // TODO separately (for writev)
+//	Data            []byte          // TODO separately (for writev)
+	Data            *zodb.Buf
 	DataSerial      zodb.Tid
 }
 

go/zodb/buffer.go

@@ -59,6 +59,14 @@ func init() {
 //
 // buffer memory is not initialized.
 func BufAlloc(size int) *Buf {
+	return BufAlloc64(int64(size))
+}
+
+func BufAlloc64(size int64) *Buf {
+	if size < 0 {
+		panic("invalid size")
+	}
+
 	// order = min i: 2^i >= size
 	order := xmath.CeilLog2(uint64(size))
 

go/zodb/storage/fs1/filestorage.go

@@ -238,7 +238,7 @@ func (dh *DataHeader) Free() {
 	dhPool.Put(dh)
 }
 
-func (fs *FileStorage) Load(_ context.Context, xid zodb.Xid) (data []byte, tid zodb.Tid, err error) {
+func (fs *FileStorage) Load(_ context.Context, xid zodb.Xid) (data *zodb.Buf, tid zodb.Tid, err error) {
 	// lookup in index position of oid data record within latest transaction who changed this oid
 	dataPos, ok := fs.index.Get(xid.Oid)
 	if !ok {
@@ -284,7 +284,7 @@ func (fs *FileStorage) Load(_ context.Context, xid zodb.Xid) (data []byte, tid z
 	tid = dh.Tid
 
 	// TODO data -> slab
-	err = dh.LoadData(fs.file, &data)
+	data, err = dh.LoadData(fs.file)
 	if err != nil {
 		return nil, 0, &ErrXidLoad{xid, err}
 	}

go/zodb/storage/fs1/format.go

@@ -667,31 +667,29 @@ func (dh *DataHeader) loadNext(r io.ReaderAt, txnh *TxnHeader) error {
 
 // LoadData loads data for the data record taking backpointers into account.
 //
-// Data is loaded into *buf, which, if needed, is reallocated to hold whole loading data size.
 // NOTE on success dh state is changed to data header of original data transaction
 // NOTE "deleted" records are indicated via returning *buf=nil
-// TODO buf -> slab
-func (dh *DataHeader) LoadData(r io.ReaderAt, buf *[]byte)  error {
+func (dh *DataHeader) LoadData(r io.ReaderAt) (*zodb.Buf, error) {
 	// scan via backpointers
 	for dh.DataLen == 0 {
 		err := dh.LoadBack(r)
 		if err != nil {
 			if err == io.EOF {
-				*buf = nil // deleted
-				return nil
+				return nil, nil // deleted
 			}
-			return err	// XXX recheck
+			return nil, err	// XXX recheck
 		}
 	}
 
 	// now read actual data
-	*buf = xbytes.Realloc64(*buf, dh.DataLen)
-	_, err := r.ReadAt(*buf, dh.Pos + DataHeaderSize)
+	buf := zodb.BufAlloc64(dh.DataLen)
+	_, err := r.ReadAt(buf.Data, dh.Pos + DataHeaderSize)
 	if err != nil {
-		return dh.err("read data", noEOF(err))	// XXX recheck
+		buf.Free()
+		return nil, dh.err("read data", noEOF(err))	// XXX recheck
 	}
 
-	return nil
+	return buf, nil
 }
 
 // --- raw iteration ---

go/zodb/zodb.go

@@ -158,8 +158,7 @@ type IStorage interface {
 	//
 	// XXX currently deleted data is returned as data=nil	-- is it ok?
 	// TODO specify error when data not found -> ErrOidMissing | ErrXidMissing
-	// TODO data []byte -> something allocated from slab ?
-	Load(ctx context.Context, xid Xid) (data []byte, serial Tid, err error)	// XXX -> StorageRecordInformation ?
+	Load(ctx context.Context, xid Xid) (data *Buf, serial Tid, err error)	// XXX -> StorageRecordInformation ?
 
 	// Prefetch(ctx, xid Xid)	(no error)
 

go/zodb/zodbtools/catobj.go

@@ -34,12 +34,13 @@ import (
 // Catobj dumps content of one ZODB object
 // The object is printed in raw form without any headers (see Dumpobj)
 func Catobj(ctx context.Context, w io.Writer, stor zodb.IStorage, xid zodb.Xid) error {
-	data, _, err := stor.Load(ctx, xid)
+	buf, _, err := stor.Load(ctx, xid)
 	if err != nil {
 		return err
 	}
 
-	_, err = w.Write(data)	// NOTE delted data are returned as err by Load
+	_, err = w.Write(buf.Data)	// NOTE deleted data are returned as err by Load
+	buf.Free()
 	return err		// XXX err ctx ?
 }
 
@@ -47,7 +48,7 @@ func Catobj(ctx context.Context, w io.Writer, stor zodb.IStorage, xid zodb.Xid)
 func Dumpobj(ctx context.Context, w io.Writer, stor zodb.IStorage, xid zodb.Xid, hashOnly bool) error {
 	var objInfo zodb.StorageRecordInformation
 
-	data, tid, err := stor.Load(ctx, xid)
+	buf, tid, err := stor.Load(ctx, xid)
 	if err != nil {
 		return err
 	}
@@ -55,11 +56,12 @@ func Dumpobj(ctx context.Context, w io.Writer, stor zodb.IStorage, xid zodb.Xid,
 	// XXX hack - TODO rework IStorage.Load to fill-in objInfo directly
 	objInfo.Oid = xid.Oid
 	objInfo.Tid = tid
-	objInfo.Data = data
+	objInfo.Data = buf.Data
 	objInfo.DataTid = tid	// XXX generally wrong
 
 	d := dumper{W: w, HashOnly: hashOnly}
 	err = d.DumpData(&objInfo)
+	buf.Free()
 	return err
 }