.

t/neo/storage/fs1/filestorage_test.go

@@ -12,13 +12,22 @@ import (
 
 // one entry inside transaction
 type txnEntry struct {
-	header	DataHeader
-	data	[]byte
+	Header	DataHeader
+	rawData	[]byte		// what is on disk, e.g. it can be backpointer
+	data	[]byte		// data client should see on load; nil means same as RawData
+}
+
+func (txe *txnEntry) Data() []byte {
+	data := txe.data
+	if data == nil {
+		data = txe.rawData
+	}
+	return data
 }
 
 type dbEntry struct {
-	header	TxnHeader
-	entryv	[]txnEntry
+	Header	TxnHeader
+	Entryv	[]txnEntry
 }
 
 func TestLoad(t *testing.T) {
@@ -28,11 +37,8 @@ func TestLoad(t *testing.T) {
 	}
 
 	for _, dbe := range _1fs_dbEntryv {
-		for _, txe := range dbe.entryv {
-			txh := txe.header
-			if txh.DataLen == 0 {
-				continue	// FIXME skipping backpointers
-			}
+		for _, txe := range dbe.Entryv {
+			txh := txe.Header
 
 			xid := zodb.Xid{zodb.XTid{txh.Tid, false}, txh.Oid}	// loadSerial
 			data, tid, err := fs.Load(xid)
@@ -42,8 +48,8 @@ func TestLoad(t *testing.T) {
 			if tid != txh.Tid {
 				t.Errorf("load %v: returned tid unexpected: %v", xid)
 			}
-			if !bytes.Equal(data, txe.data) {
-				t.Errorf("load %v: different data:\nhave: %s\nwant: %s", xid, strconv.Quote(string(data)), strconv.Quote(string(txe.data)))
+			if !bytes.Equal(data, txe.Data()) {
+				t.Errorf("load %v: different data:\nhave: %s\nwant: %s", xid, strconv.Quote(string(data)), strconv.Quote(string(txe.Data())))
 			}
 		}
 	}

t/neo/storage/fs1/py/gen-testdata

@@ -151,7 +151,6 @@ def main():
                 emit("\t\t\t\tDataHeader{")
                 emit("\t\t\t\t\tOid:\t%i," % unpack64(drec.oid))
                 emit("\t\t\t\t\tTid:\t%s," % hex64(drec.tid))
-                # drec: .data .prev (=prev_txn)
 
                 emit("\t\t\t\t\tPrevDataRecPos:\t%i," % dh.prev)
                 emit("\t\t\t\t\tTxnPos:\t%i," % txn._tpos)
@@ -160,11 +159,14 @@ def main():
                 emit("\t\t\t\t},")
                 plen = dh.plen
                 if plen == 0:
-                    data = p64(dh.back) # back-pointer or 0 (= delete)
+                    rawdata = p64(dh.back) # back-pointer or 0 (= delete)
+                    data = "[]byte(%s)" % escapeqq(drec.data)     # XXX vs .data = None ?
                 else:
-                    data = drec.data
+                    rawdata = drec.data
+                    data = "nil"
 
-                emit("\t\t\t\t[]byte(%s)," % escapeqq(data))
+                emit("\t\t\t\t[]byte(%s)," % escapeqq(rawdata))
+                emit("\t\t\t\t%s /* same as ^^^ */," % data)
                 emit("\t\t\t},")
 
             emit("\t\t},")