Skip to content

N
neoppod
Commit 5c5ba580 authored by Kirill Smelkov's avatar Kirill Smelkov
Browse files
Options

.

parent cb13a9f4
Hide whitespace changes
Inline Side-by-side
Showing with 96 additions and 89 deletions
t/neo/storage/fs1/filestorage.go
View file @ 5c5ba580
......@@ -148,21 +148,22 @@ func bug(e xerr, format string, a ...interface{}) {
}
// // noEOF returns err, but changes io.EOF -> io.ErrUnexpectedEOF
// func NoEOF(err error) error {
// if err == io.EOF {
// err = io.ErrUnexpectedEOF
// }
// return err
// }
//
// // okEOF returns err, but changes io.EOF -> nil
// func okEOF(err error) error {
// if err == io.EOF {
// err = nil
// }
// return err
// }
// XXX -> xio ?
// noEOF returns err, but changes io.EOF -> io.ErrUnexpectedEOF
func noEOF(err error) error {
if err == io.EOF {
err = io.ErrUnexpectedEOF
}
return err
}
// okEOF returns err, but changes io.EOF -> nil
func okEOF(err error) error {
if err == io.EOF {
err = nil
}
return err
}
// --- Transaction record ---
......@@ -268,7 +269,7 @@ func (txnh *TxnHeader) Load(r io.ReaderAt /* *os.File */, pos int64, flags TxnLo
// EOF after txn header is not good - because at least
// redundant length should be also there
return txnh.err("read", xio.NoEOF(err))
return txnh.err("read", noEOF(err))
}
txnh.Tid = zodb.Tid(binary.BigEndian.Uint64(work[8+0:]))
......@@ -294,7 +295,7 @@ func (txnh *TxnHeader) Load(r io.ReaderAt /* *os.File */, pos int64, flags TxnLo
lext := binary.BigEndian.Uint16(work[8+21:])
lstr := int(luser) + int(ldesc) + int(lext)
if TxnHeaderFixSize + lstr + 8 > txnh.Len {
if TxnHeaderFixSize + int64(lstr) + 8 > txnh.Len {
return decodeErr(txnh, "strings overlap with txn boundary: %v / %v", lstr, txnh.Len)
}
......@@ -331,7 +332,7 @@ func (txnh *TxnHeader) loadStrings(r io.ReaderAt /* *os.File */) error {
// we rely on Load leaving len(workMem) = sum of all strings length ...
_, err := r.ReadAt(txnh.workMem, txnh.Pos + TxnHeaderFixSize)
if err != nil {
return txnh.err("read strings", xio.noEOF(err))
return txnh.err("read strings", noEOF(err))
}
// ... and presetting x to point to appropriate places in .workMem .
......@@ -442,7 +443,7 @@ func (dh *DataHeader) load(r io.ReaderAt /* *os.File */, pos int64, tmpBuf *[Dat
_, err := r.ReadAt(tmpBuf[:], pos)
if err != nil {
return dh.err("read", xio.noEOF(err))
return dh.err("read", noEOF(err))
}
// XXX also check oid.Valid() ?
......@@ -542,7 +543,7 @@ func (dh *DataHeader) LoadBack(r io.ReaderAt /* *os.File */) error {
var xxx [8]byte // XXX escapes ?
_, err := r.ReadAt(xxx[:], dh.Pos + DataHeaderSize)
if err != nil {
return dh.err("read data", xio.noEOF(err))
return dh.err("read data", noEOF(err))
}
backPos := int64(binary.BigEndian.Uint64(xxx[:]))
......@@ -651,7 +652,7 @@ func (dh *DataHeader) LoadData(r io.ReaderAt /* *os.File */, buf *[]byte) error
}
_, err := r.ReadAt(*buf, dh.Pos + DataHeaderSize)
if err != nil {
return dh.err("read data", xio.noEOF(err)) // XXX recheck
return dh.err("read data", noEOF(err)) // XXX recheck
}
return nil
......@@ -945,7 +946,7 @@ func (fs *FileStorage) Iterate(tidMin, tidMax zodb.Tid) zodb.IStorageIterator {
for {
err = iter.NextTxn(LoadNoStrings)
if err != nil {
err = xio.OkEOF(err)
err = okEOF(err)
break
}
}
......
t/neo/storage/fs1/filestorage_test.go
View file @ 5c5ba580
......@@ -37,14 +37,16 @@ type dbEntry struct {
type txnEntry struct {
Header DataHeader
rawData []byte // what is on disk, e.g. it can be backpointer
userData []byte // data client should see on load; nil means same as RawData
userData []byte // data client should see on load; `sameAsRaw` means same as RawData
dataTid zodb.Tid // data tid client should see on iter; 0 means same as Header.Tid
}
var sameAsRaw = []byte{0}
// Data returns data a client should see
func (txe *txnEntry) Data() []byte {
data := txe.userData
if data == nil {
if len(data) > 0 && &data[0] == &sameAsRaw[0] {
data = txe.rawData
}
return data
......@@ -74,7 +76,7 @@ func checkLoad(t *testing.T, fs *FileStorage, xid zodb.Xid, expect oidLoadedOk)
if tid != expect.tid {
t.Errorf("load %v: returned tid unexpected: %v ; want: %v", xid, tid, expect.tid)
}
if !bytes.Equal(data, expect.data) {
if !bytes.Equal(data, expect.data) { // XXX -> reflect.DeepEqual
t.Errorf("load %v: different data:\nhave: %q\nwant: %q", xid, data, expect.data)
}
}
......
t/neo/storage/fs1/py/gen-testdata
View file @ 5c5ba580
......@@ -39,6 +39,7 @@ def xtime():
time.time = xtime
# prepare transaction for a commit
def precommit(user, description, extension):
txn = transaction.get()
txn.user = user
......@@ -50,6 +51,7 @@ def commit(user, description, extension):
txn = precommit(user, description, extension)
txn.commit()
class Object(Persistent):
# .value
def __init__(self, value):
......@@ -201,7 +203,7 @@ def main():
datatid = hex64(drec.data_txn)
else:
rawdata = drec.data
data = "/* same as ^^^ */ nil"
data = "/* same as ^^^ */ sameAsRaw"
datatid = "/* same as ^^^ */ 0"
emit("\t\t\t\t[]byte(%s)," % escapeqq(rawdata))
......
t/neo/storage/fs1/testdata_expect_test.go
View file @ 5c5ba580
......@@ -43,7 +43,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 60,
},
[]byte("(cpersistent.mapping\nPersistentMapping\nq\x01Nt.}q\x02U\x04dataq\x03}q\x04s."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -73,7 +73,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 95,
},
[]byte("cpersistent.mapping\nPersistentMapping\nq\x01.}q\x02U\x04dataq\x03}q\x04U\x01f(U\x08\x00\x00\x00\x00\x00\x00\x00\x01q\x05c__main__\nObject\nq\x06tQss."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
{
......@@ -86,7 +86,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04f0.0q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -116,7 +116,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04f0.1q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -146,7 +146,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 116,
},
[]byte("cpersistent.mapping\nPersistentMapping\nq\x01.}q\x02U\x04dataq\x03}q\x04(U\x01c(U\x08\x00\x00\x00\x00\x00\x00\x00\x02q\x05c__main__\nObject\nq\x06tQU\x01f(U\x08\x00\x00\x00\x00\x00\x00\x00\x01q\x07h\x06tQus."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
{
......@@ -159,7 +159,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04c0.2q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -189,7 +189,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 136,
},
[]byte("cpersistent.mapping\nPersistentMapping\nq\x01.}q\x02U\x04dataq\x03}q\x04(U\x01c(U\x08\x00\x00\x00\x00\x00\x00\x00\x02q\x05c__main__\nObject\nq\x06tQU\x01b(U\x08\x00\x00\x00\x00\x00\x00\x00\x03q\x07h\x06tQU\x01f(U\x08\x00\x00\x00\x00\x00\x00\x00\x01q\x08h\x06tQus."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
{
......@@ -202,7 +202,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04b0.3q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -232,7 +232,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 156,
},
[]byte("cpersistent.mapping\nPersistentMapping\nq\x01.}q\x02U\x04dataq\x03}q\x04(U\x01c(U\x08\x00\x00\x00\x00\x00\x00\x00\x02q\x05c__main__\nObject\nq\x06tQU\x01b(U\x08\x00\x00\x00\x00\x00\x00\x00\x03q\x07h\x06tQU\x01d(U\x08\x00\x00\x00\x00\x00\x00\x00\x04q\x08h\x06tQU\x01f(U\x08\x00\x00\x00\x00\x00\x00\x00\x01q\th\x06tQus."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
{
......@@ -245,7 +245,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04d0.4q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -275,7 +275,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04c0.5q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -305,7 +305,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04f0.6q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -335,7 +335,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04c0.7q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -365,7 +365,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04d0.8q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -395,7 +395,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 176,
},
[]byte("cpersistent.mapping\nPersistentMapping\nq\x01.}q\x02U\x04dataq\x03}q\x04(U\x01c(U\x08\x00\x00\x00\x00\x00\x00\x00\x02q\x05c__main__\nObject\nq\x06tQU\x01b(U\x08\x00\x00\x00\x00\x00\x00\x00\x03q\x07h\x06tQU\x01e(U\x08\x00\x00\x00\x00\x00\x00\x00\x05q\x08h\x06tQU\x01d(U\x08\x00\x00\x00\x00\x00\x00\x00\x04q\th\x06tQU\x01f(U\x08\x00\x00\x00\x00\x00\x00\x00\x01q\nh\x06tQus."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
{
......@@ -408,7 +408,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04e0.9q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -438,7 +438,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 196,
},
[]byte("cpersistent.mapping\nPersistentMapping\nq\x01.}q\x02U\x04dataq\x03}q\x04(U\x01c(U\x08\x00\x00\x00\x00\x00\x00\x00\x02q\x05c__main__\nObject\nq\x06tQU\x01b(U\x08\x00\x00\x00\x00\x00\x00\x00\x03q\x07h\x06tQU\x01e(U\x08\x00\x00\x00\x00\x00\x00\x00\x05q\x08h\x06tQU\x01d(U\x08\x00\x00\x00\x00\x00\x00\x00\x04q\th\x06tQU\x01g(U\x08\x00\x00\x00\x00\x00\x00\x00\x06q\nh\x06tQU\x01f(U\x08\x00\x00\x00\x00\x00\x00\x00\x01q\x0bh\x06tQus."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
{
......@@ -451,7 +451,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05g0.10q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -481,7 +481,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05d0.11q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -511,7 +511,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05b0.12q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -541,7 +541,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05f0.13q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -571,7 +571,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05e0.14q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -601,7 +601,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05b0.15q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -631,7 +631,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05g0.16q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -661,7 +661,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05g0.17q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -691,7 +691,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05f0.18q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -721,7 +721,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05g0.19q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -751,7 +751,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05c0.20q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -781,7 +781,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05f0.21q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -811,7 +811,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05g0.22q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -841,7 +841,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05e0.23q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -871,7 +871,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05d0.24q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -961,7 +961,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 196,
},
[]byte("cpersistent.mapping\nPersistentMapping\nq\x01.}q\x02U\x04dataq\x03}q\x04(U\x01c(U\x08\x00\x00\x00\x00\x00\x00\x00\x07q\x05c__main__\nObject\nq\x06tQU\x01b(U\x08\x00\x00\x00\x00\x00\x00\x00\x03q\x07h\x06tQU\x01e(U\x08\x00\x00\x00\x00\x00\x00\x00\x05q\x08h\x06tQU\x01d(U\x08\x00\x00\x00\x00\x00\x00\x00\x04q\th\x06tQU\x01g(U\x08\x00\x00\x00\x00\x00\x00\x00\x06q\nh\x06tQU\x01f(U\x08\x00\x00\x00\x00\x00\x00\x00\x01q\x0bh\x06tQus."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
{
......@@ -974,7 +974,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 28,
},
[]byte("c__main__\nObject\nq\x01.U\x03c0*q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -1034,7 +1034,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04d1.0q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -1064,7 +1064,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04e1.1q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -1094,7 +1094,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04g1.2q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -1124,7 +1124,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04g1.3q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -1154,7 +1154,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04d1.4q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -1184,7 +1184,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04g1.5q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -1214,7 +1214,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04b1.6q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -1244,7 +1244,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04f1.7q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -1274,7 +1274,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04d1.8q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -1304,7 +1304,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 216,
},
[]byte("cpersistent.mapping\nPersistentMapping\nq\x01.}q\x02U\x04dataq\x03}q\x04(U\x01a(U\x08\x00\x00\x00\x00\x00\x00\x00\x08q\x05c__main__\nObject\nq\x06tQU\x01c(U\x08\x00\x00\x00\x00\x00\x00\x00\x07q\x07h\x06tQU\x01b(U\x08\x00\x00\x00\x00\x00\x00\x00\x03q\x08h\x06tQU\x01e(U\x08\x00\x00\x00\x00\x00\x00\x00\x05q\th\x06tQU\x01d(U\x08\x00\x00\x00\x00\x00\x00\x00\x04q\nh\x06tQU\x01g(U\x08\x00\x00\x00\x00\x00\x00\x00\x06q\x0bh\x06tQU\x01f(U\x08\x00\x00\x00\x00\x00\x00\x00\x01q\x0ch\x06tQus."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
{
......@@ -1317,7 +1317,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04a1.9q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -1347,7 +1347,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05f1.10q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -1377,7 +1377,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05c1.11q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -1407,7 +1407,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05f1.12q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -1437,7 +1437,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05e1.13q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -1467,7 +1467,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05a1.14q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -1497,7 +1497,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05d1.15q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -1527,7 +1527,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05g1.16q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -1557,7 +1557,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05b1.17q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -1587,7 +1587,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05c1.18q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -1617,7 +1617,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05g1.19q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -1647,7 +1647,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05b1.20q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -1677,7 +1677,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05d1.21q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -1707,7 +1707,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05b1.22q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -1737,7 +1737,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05g1.23q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -1767,7 +1767,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05f1.24q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......@@ -1857,7 +1857,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 216,
},
[]byte("cpersistent.mapping\nPersistentMapping\nq\x01.}q\x02U\x04dataq\x03}q\x04(U\x01a(U\x08\x00\x00\x00\x00\x00\x00\x00\x08q\x05c__main__\nObject\nq\x06tQU\x01c(U\x08\x00\x00\x00\x00\x00\x00\x00\x07q\x07h\x06tQU\x01b(U\x08\x00\x00\x00\x00\x00\x00\x00\x03q\x08h\x06tQU\x01e(U\x08\x00\x00\x00\x00\x00\x00\x00\tq\th\x06tQU\x01d(U\x08\x00\x00\x00\x00\x00\x00\x00\x04q\nh\x06tQU\x01g(U\x08\x00\x00\x00\x00\x00\x00\x00\x06q\x0bh\x06tQU\x01f(U\x08\x00\x00\x00\x00\x00\x00\x00\x01q\x0ch\x06tQus."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
{
......@@ -1870,7 +1870,7 @@ var _1fs_dbEntryv = [...]dbEntry{
DataLen: 28,
},
[]byte("c__main__\nObject\nq\x01.U\x03e1*q\x02."),
/* same as ^^^ */ nil,
/* same as ^^^ */ sameAsRaw,
/* same as ^^^ */ 0,
},
},
......
t/neo/zodb/str.go
View file @ 5c5ba580
......@@ -6,7 +6,7 @@ package zodb
import (
"fmt"
"encoding/hex"
//"encoding/hex"
)
func (tid Tid) String() string {
......@@ -39,6 +39,7 @@ func (xid Xid) String() string {
}
/*
func ParseTid(s string) (Tid, error) {
// -> scanf("%016x")
var b[8]byte
......@@ -50,3 +51,4 @@ func ParseTid(s string) (Tid, error) {
...
}
}
*/
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