Skip to content

N
neo
Commit c0d4586b authored by Kirill Smelkov's avatar Kirill Smelkov
Browse files
Options

.

parent b542beeb
Hide whitespace changes
Inline Side-by-side
Showing with 202 additions and 198 deletions
t/neo/storage/fs1/cmd/fstail/fstail.go
View file @ c0d4586b
......@@ -38,7 +38,7 @@ import (
// pyQuote quotes string the way python would do it
// specifically quote char is ' (not " as in go)
// XXX s = 'a\'bc'; print repr(s) -> "a'bc" (not 'a\'bc'
// XXX s = 'a\'bc'; print repr(s) -> "a'bc" (not 'a\'bc' <- XXX fix this
func pyQuote(s string) string {
out := pyQuoteBytes(mem.Bytes(s))
return mem.String(out)
......
t/neo/storage/fs1/cmd/fstail/testdata/1.fsdump.ok
View file @ c0d4586b
1979-01-03 21:01:31.300002: hash=ae95b81aacea7df69641c468891dd2321736a1e5
user='root1\nYour\nRoyal\nMagesty ' description='delete 1\nalpha beta gamma\n\nqqq ...' length=192 offset=11934 (+142)
1979-01-03 21:01:31.300002: hash=9176cad01fe2751a2317912476da043f2cd27085
user="root1\nYour\nRoyal\nMagesty' " description='delete 1\nalpha beta gamma\'delta"lambda\n\nqqq ...' length=206 offset=11948 (+156)
1979-01-03 21:01:30.200002: hash=5febc59008859e0bab6bdeb9fd876d002af0c922
user='' description='predelete 6' length=362 offset=11564 (+34)
1979-01-03 21:01:30.200002: hash=4c2bcec885530156e134f089e7255a0ad1f2eab0
user='' description='predelete 6' length=362 offset=11578 (+34)
1979-01-03 21:01:29.100002: hash=0360220321f1f6ee085b9b6f44512c7c0b1e1094
user='root1.1\nYour\nMagesty ' description='undo 1.1\nmore detailed description\n\nzzz ...\t\t' length=208 offset=11348 (+158)
1979-01-03 21:01:29.100002: hash=fd3148ac612b6ec793747165c73ce236a3b61702
user='root1.1\nYour\nMagesty ' description='undo 1.1\nmore detailed description\n\nzzz ...\t\t' length=208 offset=11362 (+158)
1979-01-03 21:01:28.000002: hash=d477644de8e45016e039bf4510a8e822460f5654
user='root1.0\nYour\nMagesty ' description='undo 1.0\nmore detailed description\n\nzzz ...\t' length=207 offset=11133 (+157)
1979-01-03 21:01:28.000002: hash=ef9928d3049ad902a5d98293d46358cea8f44319
user='root1.0\nYour\nMagesty ' description='undo 1.0\nmore detailed description\n\nzzz ...\t' length=207 offset=11147 (+157)
1979-01-03 21:01:25.800002: hash=8735a7c5ecf4568bb4ecdd1bdbf4144dad9d9a1b
user='user1.24' description='step 1.24' length=165 offset=10960 (+93)
1979-01-03 21:01:25.800002: hash=bc4c742d2821d463ffad5348f6c86d4ed44996cf
user='user1.24' description='step 1.24' length=165 offset=10974 (+93)
1979-01-03 21:01:24.700002: hash=fffc4d3ed8ebf888ed6b87ea149b12fde7072257
user='user1.23' description='step 1.23' length=165 offset=10787 (+93)
1979-01-03 21:01:24.700002: hash=ad2bfa76c1c7288f99831397715d120a84ac3e63
user='user1.23' description='step 1.23' length=165 offset=10801 (+93)
1979-01-03 21:01:23.600002: hash=283d46a7291eee3574a1fa43e09503ff2f98c014
user='user1.22' description='step 1.22' length=165 offset=10614 (+93)
1979-01-03 21:01:23.600002: hash=722921c9dd036f270f505d4e1645a63b62f6bac1
user='user1.22' description='step 1.22' length=165 offset=10628 (+93)
1979-01-03 21:01:22.500002: hash=b90bf29bf3376cfdd96a70c8c3447ad9cd7915fe
user='user1.21' description='step 1.21' length=165 offset=10441 (+93)
1979-01-03 21:01:22.500002: hash=f22d4cdd01d17a66d53e8727b1305c227983b194
user='user1.21' description='step 1.21' length=165 offset=10455 (+93)
1979-01-03 21:01:21.400002: hash=28677e54cd94cd2a34ae58b97dcbf9ba1c96e949
user='user1.20' description='step 1.20' length=165 offset=10268 (+93)
1979-01-03 21:01:21.400002: hash=e3c412c26b6522c046bdfe630eef32451b50ba69
user='user1.20' description='step 1.20' length=165 offset=10282 (+93)
1979-01-03 21:01:20.300002: hash=6a302f6e27f48d28b515cb4ebf164d58bf9f1cd6
user='user1.19' description='step 1.19' length=165 offset=10095 (+93)
1979-01-03 21:01:20.300002: hash=54cdd59a7131c0784bb3236471d857ed6f33f9b9
user='user1.19' description='step 1.19' length=165 offset=10109 (+93)
1979-01-03 21:01:19.200002: hash=18145b4716acc1a33c13c164595d381bc7b474ee
user='user1.18' description='step 1.18' length=165 offset=9922 (+93)
1979-01-03 21:01:19.200002: hash=20a4abf3c8a0984798374af5ed890e2910f46265
user='user1.18' description='step 1.18' length=165 offset=9936 (+93)
1979-01-03 21:01:18.100002: hash=1cfe8e357e75e15037154891ec847b5a0dddeabd
user='user1.17' description='step 1.17' length=165 offset=9749 (+93)
1979-01-03 21:01:18.100002: hash=a7c66e66a6e25cafe9b046b5a41993287ba3e296
user='user1.17' description='step 1.17' length=165 offset=9763 (+93)
1979-01-03 21:01:17.000002: hash=6d3b0999cb9f6c4a8367e5f492ca22445d8946f0
user='user1.16' description='step 1.16' length=165 offset=9576 (+93)
1979-01-03 21:01:17.000002: hash=a69f094230ca875a963524c93a35d23f0687308d
user='user1.16' description='step 1.16' length=165 offset=9590 (+93)
1979-01-03 21:01:15.900002: hash=30b720f0ab11edd5a74e55b4314ccc5782f04b79
user='user1.15' description='step 1.15' length=165 offset=9403 (+93)
1979-01-03 21:01:15.900002: hash=96316e0682da99e24c5d587b4bd4d2f3150eea8b
user='user1.15' description='step 1.15' length=165 offset=9417 (+93)
1979-01-03 21:01:14.800002: hash=5c4ccfee8f185b55d406d73a4d7661736bf2ed51
user='user1.14' description='step 1.14' length=165 offset=9230 (+93)
1979-01-03 21:01:14.800002: hash=da20e7ad9c0f55e7576dba5ffd9912c37d059232
user='user1.14' description='step 1.14' length=165 offset=9244 (+93)
1979-01-03 21:01:13.700002: hash=7f174a1329e8bd2e844e938d0f488c17dac6c181
user='user1.13' description='step 1.13' length=165 offset=9057 (+93)
1979-01-03 21:01:13.700002: hash=877241dc4a5f14d24a7779917310332f6c2e414e
user='user1.13' description='step 1.13' length=165 offset=9071 (+93)
1979-01-03 21:01:12.600002: hash=94f8601abc1b14aa1bc046278a64e1fa030173ba
user='user1.12' description='step 1.12' length=165 offset=8884 (+93)
1979-01-03 21:01:12.600002: hash=321ea792b7e67ac9339de238e817ca639d7f42ec
user='user1.12' description='step 1.12' length=165 offset=8898 (+93)
1979-01-03 21:01:11.500002: hash=ba816c6a0df59b7de877267e2bcb9358c7965e2d
user='user1.11' description='step 1.11' length=165 offset=8711 (+93)
1979-01-03 21:01:11.500002: hash=6b64527e3ba109266a8d68321147d54af8d6edc7
user='user1.11' description='step 1.11' length=165 offset=8725 (+93)
1979-01-03 21:01:10.400002: hash=07d37a188dc78f4a9ae6959fa15d0118a83ed307
user='user1.10' description='step 1.10' length=165 offset=8538 (+93)
1979-01-03 21:01:10.400002: hash=a5db043429fc63d48df1922ab60f3e6990d3561c
user='user1.10' description='step 1.10' length=165 offset=8552 (+93)
1979-01-03 21:01:09.300001: hash=f635079876c434af769286ff66e88770a26e85a9
user='user1.9' description='step 1.9' length=162 offset=8368 (+91)
1979-01-03 21:01:09.300001: hash=200139e7913a7ff53a34c6f5484b92128b246cde
user='user1.9' description='step 1.9' length=162 offset=8382 (+91)
1979-01-03 21:01:08.200001: hash=aa51431bcc1edecf5edde4d313935b9b7a4990f1
user='user1.8' description='step 1.8' length=162 offset=8198 (+91)
1979-01-03 21:01:08.200001: hash=39dfd11d1f24fb97387aeabf2a013f6ede6385dd
user='user1.8' description='step 1.8' length=162 offset=8212 (+91)
1979-01-03 21:01:07.100001: hash=8645d91242e4cf08ebf7872a57b7f7bcc8fdbc96
user='user1.7' description='step 1.7' length=162 offset=8028 (+91)
1979-01-03 21:01:07.100001: hash=9f7327cd475602bca99bf085aabf6051f2573313
user='user1.7' description='step 1.7' length=162 offset=8042 (+91)
1979-01-03 21:01:06.000001: hash=cdb959db250d5c2e85ea140783e9334eb01cfbba
user='user1.6' description='step 1.6' length=162 offset=7858 (+91)
1979-01-03 21:01:06.000001: hash=735edd1e61556098b0268dee9df1cae6a66aa938
user='user1.6' description='step 1.6' length=162 offset=7872 (+91)
1979-01-03 21:01:04.900001: hash=83cb769eba36d0a5dc5447e4b46ddd138fe6fdd8
user='user1.5' description='step 1.5' length=162 offset=7688 (+91)
1979-01-03 21:01:04.900001: hash=43863e7c4b4fb3f1bd400248d71fabbdac9456b6
user='user1.5' description='step 1.5' length=162 offset=7702 (+91)
1979-01-03 21:01:03.800001: hash=cf85f6460da24c29e48981c5f22672b362135b4e
user='user1.4' description='step 1.4' length=162 offset=7518 (+91)
1979-01-03 21:01:03.800001: hash=22ee061f2372fd74d03cf5dd54197bc3aa12a816
user='user1.4' description='step 1.4' length=162 offset=7532 (+91)
1979-01-03 21:01:02.700001: hash=f228f0b0142dc39ccfe7326422d625d68763e6ee
user='user1.3' description='step 1.3' length=162 offset=7348 (+91)
1979-01-03 21:01:02.700001: hash=be00cfff67f8f186cce0efb4be7af5525a8fdda7
user='user1.3' description='step 1.3' length=162 offset=7362 (+91)
1979-01-03 21:01:01.600001: hash=df413d5a85f1170bea04abe17bb02077c1b9ea7c
user='user1.2' description='step 1.2' length=162 offset=7178 (+91)
1979-01-03 21:01:01.600001: hash=152e5811cc260c0e9c28cf6bc0c5fb5c147b4daa
user='user1.2' description='step 1.2' length=162 offset=7192 (+91)
1979-01-03 21:01:00.500001: hash=a2f2f9980060b3f9d668ab68d33c6c27e202b019
user='user1.1' description='step 1.1' length=162 offset=7008 (+91)
1979-01-03 21:01:00.500001: hash=16e51f130683d896e8d182ebdd3bb80ae35d6050
user='user1.1' description='step 1.1' length=162 offset=7022 (+91)
1979-01-03 21:00:59.400001: hash=8618d58f2201169d9e0ea7e4627a6ba4dd4bd142
user='user1.0' description='step 1.0' length=162 offset=6838 (+91)
1979-01-03 21:00:59.400001: hash=17453ac2d8f8044d959f763516b56eda268e96ad
user='user1.0' description='step 1.0' length=162 offset=6852 (+91)
1979-01-03 21:00:45.100001: hash=51db603ba9898da20dbe162dd20e4a76aeacbfeb
user='root0\nYour\nRoyal\nMagesty ' description='delete 0\nalpha beta gamma\n\nqqq ...' length=192 offset=6638 (+142)
user="root0\nYour\nRoyal\nMagesty' " description='delete 0\nalpha beta gamma\'delta"lambda\n\nqqq ...' length=206 offset=6638 (+156)
1979-01-03 21:00:44.000001: hash=469f380f59f9a72dae5ee6351fa2e38efb170d86
user='' description='predelete 7' length=362 offset=6268 (+34)
......
t/neo/storage/fs1/py/gen-testdata
View file @ c0d4586b
......@@ -29,10 +29,14 @@ def hex64(packed):
# escape string into valid "..." string
def escapeqq(s):
# this escape almost everything except " character
q = s.encode("string_escape")
q = q.replace('"', r'\"')
return '"' + q + '"'
outv = []
# we don't want ' to be escaped
for _ in s.split("'"):
# this escape almost everything except " character
q = _.encode("string_escape")
q = q.replace('"', r'\"')
outv.append(q)
return '"' + "'".join(outv) + '"'
# make time.time() predictable
_xtime = time.mktime(time.strptime("04 Jan 1979", "%d %b %Y"))
......@@ -150,8 +154,8 @@ def main():
# Get serial via history.
obj_tid_lastchange = db.history(obj._p_oid)[0]['tid']
txn = precommit(u"root%i\nYour\nRoyal\nMagesty " % i,
u"delete %i\nalpha beta gamma\n\nqqq ..." % i,
txn = precommit(u"root%i\nYour\nRoyal\nMagesty' " % i,
u"delete %i\nalpha beta gamma'delta\"lambda\n\nqqq ..." % i,
ext("delete %s" % unpack64(obj._p_oid)))
stor.tpc_begin(txn)
stor.deleteObject(obj._p_oid, obj_tid_lastchange, txn)
......
t/neo/storage/fs1/testdata_expect_test.go
View file @ c0d4586b
......@@ -3,18 +3,18 @@ package fs1
import "../../zodb"
const _1fs_indexTopPos = 12134
const _1fs_indexTopPos = 12162
var _1fs_indexEntryv = [...]indexEntry{
{ 0, 11598},
{ 1, 10015},
{ 2, 9669},
{ 3, 10534},
{ 4, 7269},
{ 5, 11506},
{ 6, 12076},
{ 7, 6780},
{ 8, 8977},
{ 9, 11856},
{ 0, 11612},
{ 1, 10029},
{ 2, 9683},
{ 3, 10548},
{ 4, 7283},
{ 5, 11520},
{ 6, 12104},
{ 7, 6794},
{ 8, 8991},
{ 9, 11870},
}
var _1fs_dbEntryv = [...]dbEntry{
......@@ -996,12 +996,12 @@ var _1fs_dbEntryv = [...]dbEntry{
TxnHeader{
Pos: 6638,
LenPrev: 370,
Len: 200,
Len: 214,
TxnInfo: zodb.TxnInfo{
Tid: 0x0285cbacc06d3a4c,
Status: ' ',
User: []byte("root0\nYour\nRoyal\nMagesty "),
Description: []byte("delete 0\nalpha beta gamma\n\nqqq ..."),
User: []byte("root0\nYour\nRoyal\nMagesty' "),
Description: []byte("delete 0\nalpha beta gamma'delta\"lambda\n\nqqq ..."),
Extension: []byte("}q\x01(U\tx-cookieEU\x05ZM3QZU\x0bx-generatorq\x02U\x13zodb/py2 (delete 7)u."),
},
},
......@@ -1009,7 +1009,7 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 6780,
Pos: 6794,
Oid: 7,
Tid: 0x0285cbacc06d3a4c,
PrevRevPos: 5995,
......@@ -1024,8 +1024,8 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 6838,
LenPrev: 200,
Pos: 6852,
LenPrev: 214,
Len: 170,
TxnInfo: zodb.TxnInfo{
Tid: 0x0285cbacfd70a433,
......@@ -1039,11 +1039,11 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 6929,
Pos: 6943,
Oid: 8,
Tid: 0x0285cbacfd70a433,
PrevRevPos: 6560,
TxnPos: 6838,
TxnPos: 6852,
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04c1.0q\x02."),
......@@ -1054,7 +1054,7 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 7008,
Pos: 7022,
LenPrev: 170,
Len: 170,
TxnInfo: zodb.TxnInfo{
......@@ -1069,11 +1069,11 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 7099,
Pos: 7113,
Oid: 6,
Tid: 0x0285cbad02222280,
PrevRevPos: 3944,
TxnPos: 7008,
TxnPos: 7022,
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04e1.1q\x02."),
......@@ -1084,7 +1084,7 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 7178,
Pos: 7192,
LenPrev: 170,
Len: 170,
TxnInfo: zodb.TxnInfo{
......@@ -1099,11 +1099,11 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 7269,
Pos: 7283,
Oid: 4,
Tid: 0x0285cbad06d3a0cc,
PrevRevPos: 4463,
TxnPos: 7178,
TxnPos: 7192,
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04b1.2q\x02."),
......@@ -1114,7 +1114,7 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 7348,
Pos: 7362,
LenPrev: 170,
Len: 170,
TxnInfo: zodb.TxnInfo{
......@@ -1129,11 +1129,11 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 7439,
Pos: 7453,
Oid: 3,
Tid: 0x0285cbad0b851f19,
PrevRevPos: 6210,
TxnPos: 7348,
TxnPos: 7362,
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04g1.3q\x02."),
......@@ -1144,7 +1144,7 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 7518,
Pos: 7532,
LenPrev: 170,
Len: 170,
TxnInfo: zodb.TxnInfo{
......@@ -1159,11 +1159,11 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 7609,
Pos: 7623,
Oid: 3,
Tid: 0x0285cbad10369d66,
PrevRevPos: 7439,
TxnPos: 7518,
PrevRevPos: 7453,
TxnPos: 7532,
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04g1.4q\x02."),
......@@ -1174,7 +1174,7 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 7688,
Pos: 7702,
LenPrev: 170,
Len: 170,
TxnInfo: zodb.TxnInfo{
......@@ -1189,11 +1189,11 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 7779,
Pos: 7793,
Oid: 8,
Tid: 0x0285cbad14e81bb3,
PrevRevPos: 6929,
TxnPos: 7688,
PrevRevPos: 6943,
TxnPos: 7702,
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04c1.5q\x02."),
......@@ -1204,7 +1204,7 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 7858,
Pos: 7872,
LenPrev: 170,
Len: 170,
TxnInfo: zodb.TxnInfo{
......@@ -1219,11 +1219,11 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 7949,
Pos: 7963,
Oid: 1,
Tid: 0x0285cbad19999a00,
PrevRevPos: 3425,
TxnPos: 7858,
TxnPos: 7872,
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04f1.6q\x02."),
......@@ -1234,7 +1234,7 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 8028,
Pos: 8042,
LenPrev: 170,
Len: 170,
TxnInfo: zodb.TxnInfo{
......@@ -1249,11 +1249,11 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 8119,
Pos: 8133,
Oid: 2,
Tid: 0x0285cbad1e4b184c,
PrevRevPos: 4982,
TxnPos: 8028,
TxnPos: 8042,
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04d1.7q\x02."),
......@@ -1264,7 +1264,7 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 8198,
Pos: 8212,
LenPrev: 170,
Len: 170,
TxnInfo: zodb.TxnInfo{
......@@ -1279,11 +1279,11 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 8289,
Pos: 8303,
Oid: 8,
Tid: 0x0285cbad22fc9699,
PrevRevPos: 7779,
TxnPos: 8198,
PrevRevPos: 7793,
TxnPos: 8212,
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04c1.8q\x02."),
......@@ -1294,7 +1294,7 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 8368,
Pos: 8382,
LenPrev: 170,
Len: 170,
TxnInfo: zodb.TxnInfo{
......@@ -1309,11 +1309,11 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 8459,
Pos: 8473,
Oid: 8,
Tid: 0x0285cbad27ae14e6,
PrevRevPos: 8289,
TxnPos: 8368,
PrevRevPos: 8303,
TxnPos: 8382,
DataLen: 29,
},
[]byte("c__main__\nObject\nq\x01.U\x04c1.9q\x02."),
......@@ -1324,7 +1324,7 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 8538,
Pos: 8552,
LenPrev: 170,
Len: 173,
TxnInfo: zodb.TxnInfo{
......@@ -1339,11 +1339,11 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 8631,
Pos: 8645,
Oid: 6,
Tid: 0x0285cbad2c5f9333,
PrevRevPos: 7099,
TxnPos: 8538,
PrevRevPos: 7113,
TxnPos: 8552,
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05e1.10q\x02."),
......@@ -1354,7 +1354,7 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 8711,
Pos: 8725,
LenPrev: 173,
Len: 173,
TxnInfo: zodb.TxnInfo{
......@@ -1369,11 +1369,11 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 8804,
Pos: 8818,
Oid: 5,
Tid: 0x0285cbad31111180,
PrevRevPos: 4636,
TxnPos: 8711,
TxnPos: 8725,
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05a1.11q\x02."),
......@@ -1384,7 +1384,7 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 8884,
Pos: 8898,
LenPrev: 173,
Len: 173,
TxnInfo: zodb.TxnInfo{
......@@ -1399,11 +1399,11 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 8977,
Pos: 8991,
Oid: 8,
Tid: 0x0285cbad35c28fcc,
PrevRevPos: 8459,
TxnPos: 8884,
PrevRevPos: 8473,
TxnPos: 8898,
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05c1.12q\x02."),
......@@ -1414,7 +1414,7 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 9057,
Pos: 9071,
LenPrev: 173,
Len: 173,
TxnInfo: zodb.TxnInfo{
......@@ -1429,11 +1429,11 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 9150,
Pos: 9164,
Oid: 6,
Tid: 0x0285cbad3a740e19,
PrevRevPos: 8631,
TxnPos: 9057,
PrevRevPos: 8645,
TxnPos: 9071,
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05e1.13q\x02."),
......@@ -1444,7 +1444,7 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 9230,
Pos: 9244,
LenPrev: 173,
Len: 173,
TxnInfo: zodb.TxnInfo{
......@@ -1459,11 +1459,11 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 9323,
Pos: 9337,
Oid: 3,
Tid: 0x0285cbad3f258c66,
PrevRevPos: 7609,
TxnPos: 9230,
PrevRevPos: 7623,
TxnPos: 9244,
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05g1.14q\x02."),
......@@ -1474,7 +1474,7 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 9403,
Pos: 9417,
LenPrev: 173,
Len: 173,
TxnInfo: zodb.TxnInfo{
......@@ -1489,11 +1489,11 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 9496,
Pos: 9510,
Oid: 3,
Tid: 0x0285cbad43d70ab3,
PrevRevPos: 9323,
TxnPos: 9403,
PrevRevPos: 9337,
TxnPos: 9417,
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05g1.15q\x02."),
......@@ -1504,7 +1504,7 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 9576,
Pos: 9590,
LenPrev: 173,
Len: 173,
TxnInfo: zodb.TxnInfo{
......@@ -1519,11 +1519,11 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 9669,
Pos: 9683,
Oid: 2,
Tid: 0x0285cbad48888900,
PrevRevPos: 8119,
TxnPos: 9576,
PrevRevPos: 8133,
TxnPos: 9590,
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05d1.16q\x02."),
......@@ -1534,7 +1534,7 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 9749,
Pos: 9763,
LenPrev: 173,
Len: 173,
TxnInfo: zodb.TxnInfo{
......@@ -1549,11 +1549,11 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 9842,
Pos: 9856,
Oid: 3,
Tid: 0x0285cbad4d3a074c,
PrevRevPos: 9496,
TxnPos: 9749,
PrevRevPos: 9510,
TxnPos: 9763,
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05g1.17q\x02."),
......@@ -1564,7 +1564,7 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 9922,
Pos: 9936,
LenPrev: 173,
Len: 173,
TxnInfo: zodb.TxnInfo{
......@@ -1579,11 +1579,11 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 10015,
Pos: 10029,
Oid: 1,
Tid: 0x0285cbad51eb8599,
PrevRevPos: 7949,
TxnPos: 9922,
PrevRevPos: 7963,
TxnPos: 9936,
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05f1.18q\x02."),
......@@ -1594,7 +1594,7 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 10095,
Pos: 10109,
LenPrev: 173,
Len: 173,
TxnInfo: zodb.TxnInfo{
......@@ -1609,11 +1609,11 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 10188,
Pos: 10202,
Oid: 5,
Tid: 0x0285cbad569d03e6,
PrevRevPos: 8804,
TxnPos: 10095,
PrevRevPos: 8818,
TxnPos: 10109,
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05a1.19q\x02."),
......@@ -1624,7 +1624,7 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 10268,
Pos: 10282,
LenPrev: 173,
Len: 173,
TxnInfo: zodb.TxnInfo{
......@@ -1639,11 +1639,11 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 10361,
Pos: 10375,
Oid: 3,
Tid: 0x0285cbad5b4e8233,
PrevRevPos: 9842,
TxnPos: 10268,
PrevRevPos: 9856,
TxnPos: 10282,
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05g1.20q\x02."),
......@@ -1654,7 +1654,7 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 10441,
Pos: 10455,
LenPrev: 173,
Len: 173,
TxnInfo: zodb.TxnInfo{
......@@ -1669,11 +1669,11 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 10534,
Pos: 10548,
Oid: 3,
Tid: 0x0285cbad60000080,
PrevRevPos: 10361,
TxnPos: 10441,
PrevRevPos: 10375,
TxnPos: 10455,
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05g1.21q\x02."),
......@@ -1684,7 +1684,7 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 10614,
Pos: 10628,
LenPrev: 173,
Len: 173,
TxnInfo: zodb.TxnInfo{
......@@ -1699,11 +1699,11 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 10707,
Pos: 10721,
Oid: 6,
Tid: 0x0285cbad64b17ecc,
PrevRevPos: 9150,
TxnPos: 10614,
PrevRevPos: 9164,
TxnPos: 10628,
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05e1.22q\x02."),
......@@ -1714,7 +1714,7 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 10787,
Pos: 10801,
LenPrev: 173,
Len: 173,
TxnInfo: zodb.TxnInfo{
......@@ -1729,11 +1729,11 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 10880,
Pos: 10894,
Oid: 5,
Tid: 0x0285cbad6962fd19,
PrevRevPos: 10188,
TxnPos: 10787,
PrevRevPos: 10202,
TxnPos: 10801,
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05a1.23q\x02."),
......@@ -1744,7 +1744,7 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 10960,
Pos: 10974,
LenPrev: 173,
Len: 173,
TxnInfo: zodb.TxnInfo{
......@@ -1759,11 +1759,11 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 11053,
Pos: 11067,
Oid: 5,
Tid: 0x0285cbad6e147b66,
PrevRevPos: 10880,
TxnPos: 10960,
PrevRevPos: 10894,
TxnPos: 10974,
DataLen: 30,
},
[]byte("c__main__\nObject\nq\x01.U\x05a1.24q\x02."),
......@@ -1774,7 +1774,7 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 11133,
Pos: 11147,
LenPrev: 173,
Len: 215,
TxnInfo: zodb.TxnInfo{
......@@ -1789,14 +1789,14 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 11290,
Pos: 11304,
Oid: 6,
Tid: 0x0285cbad77777800,
PrevRevPos: 10707,
TxnPos: 11133,
PrevRevPos: 10721,
TxnPos: 11147,
DataLen: 0,
},
[]byte("\x00\x00\x00\x00\x00\x00#\xbe"),
[]byte("\x00\x00\x00\x00\x00\x00#\xcc"),
[]byte("c__main__\nObject\nq\x01.U\x05e1.13q\x02."),
0x0285cbad3a740e19,
},
......@@ -1804,7 +1804,7 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 11348,
Pos: 11362,
LenPrev: 215,
Len: 216,
TxnInfo: zodb.TxnInfo{
......@@ -1819,14 +1819,14 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 11506,
Pos: 11520,
Oid: 5,
Tid: 0x0285cbad7c28f64c,
PrevRevPos: 11053,
TxnPos: 11348,
PrevRevPos: 11067,
TxnPos: 11362,
DataLen: 0,
},
[]byte("\x00\x00\x00\x00\x00\x00*\x80"),
[]byte("\x00\x00\x00\x00\x00\x00*\x8e"),
[]byte("c__main__\nObject\nq\x01.U\x05a1.23q\x02."),
0x0285cbad6962fd19,
},
......@@ -1834,7 +1834,7 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 11564,
Pos: 11578,
LenPrev: 216,
Len: 370,
TxnInfo: zodb.TxnInfo{
......@@ -1849,11 +1849,11 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 11598,
Pos: 11612,
Oid: 0,
Tid: 0x0285cbad80da7499,
PrevRevPos: 6302,
TxnPos: 11564,
TxnPos: 11578,
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\x05q\x05c__main__\nObject\nq\x06tQU\x01c(U\x08\x00\x00\x00\x00\x00\x00\x00\x08q\x07h\x06tQU\x01b(U\x08\x00\x00\x00\x00\x00\x00\x00\x04q\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\x02q\nh\x06tQU\x01g(U\x08\x00\x00\x00\x00\x00\x00\x00\x03q\x0bh\x06tQU\x01f(U\x08\x00\x00\x00\x00\x00\x00\x00\x01q\x0ch\x06tQus."),
......@@ -1862,11 +1862,11 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
DataHeader{
Pos: 11856,
Pos: 11870,
Oid: 9,
Tid: 0x0285cbad80da7499,
PrevRevPos: 0,
TxnPos: 11564,
TxnPos: 11578,
DataLen: 28,
},
[]byte("c__main__\nObject\nq\x01.U\x03e1*q\x02."),
......@@ -1877,14 +1877,14 @@ var _1fs_dbEntryv = [...]dbEntry{
},
{
TxnHeader{
Pos: 11934,
Pos: 11948,
LenPrev: 370,
Len: 200,
Len: 214,
TxnInfo: zodb.TxnInfo{
Tid: 0x0285cbad858bf2e6,
Status: ' ',
User: []byte("root1\nYour\nRoyal\nMagesty "),
Description: []byte("delete 1\nalpha beta gamma\n\nqqq ..."),
User: []byte("root1\nYour\nRoyal\nMagesty' "),
Description: []byte("delete 1\nalpha beta gamma'delta\"lambda\n\nqqq ..."),
Extension: []byte("}q\x01(U\tx-cookieSU\x05MC4OMU\x0bx-generatorq\x02U\x13zodb/py2 (delete 6)u."),
},
},
......@@ -1892,11 +1892,11 @@ var _1fs_dbEntryv = [...]dbEntry{
[]txnEntry{
{
DataHeader{
Pos: 12076,
Pos: 12104,
Oid: 6,
Tid: 0x0285cbad858bf2e6,
PrevRevPos: 11290,
TxnPos: 11934,
PrevRevPos: 11304,
TxnPos: 11948,
DataLen: 0,
},
[]byte("\x00\x00\x00\x00\x00\x00\x00\x00"),
......
t/neo/zodb/cmd/zodbdump/zodbdump_test.go
View file @ c0d4586b
......@@ -2,7 +2,7 @@
package main
//go:generate sh -c "python2 -m zodbtool.zodbdump testdata/1.conf >testdata/1.zdump.pyok"
//go:generate sh -c "python2 -m zodbtools.zodbdump testdata/1.conf >testdata/1.zdump.pyok"
import (
"bytes"
......
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