Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Z
zodbtools
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
zodbtools
Commits
628dd541
Commit
628dd541
authored
Apr 28, 2020
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
a2e4dd23
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
22 additions
and
22 deletions
+22
-22
zodbtools/test/test_commit.py
zodbtools/test/test_commit.py
+1
-1
zodbtools/zodbdump.py
zodbtools/zodbdump.py
+21
-21
No files found.
zodbtools/test/test_commit.py
View file @
628dd541
...
@@ -58,7 +58,7 @@ def test_zodbcommit(zext):
...
@@ -58,7 +58,7 @@ def test_zodbcommit(zext):
zodbdump
(
stor
,
p64
(
u64
(
head
)
+
1
),
None
,
out
=
buf
)
zodbdump
(
stor
,
p64
(
u64
(
head
)
+
1
),
None
,
out
=
buf
)
dumped
=
buf
.
getvalue
()
dumped
=
buf
.
getvalue
()
assert
dumped
==
''
.
join
([
_
.
zdump
()
for
_
in
(
t1
,
t2
)])
assert
dumped
==
b
''
.
join
([
_
.
zdump
()
for
_
in
(
t1
,
t2
)])
# ObjectCopy. XXX zodbcommit handled ObjectCopy by actually copying data,
# ObjectCopy. XXX zodbcommit handled ObjectCopy by actually copying data,
# not referencing previous transaction via backpointer.
# not referencing previous transaction via backpointer.
...
...
zodbtools/zodbdump.py
View file @
628dd541
...
@@ -67,7 +67,7 @@ import sys
...
@@ -67,7 +67,7 @@ import sys
import
logging
as
log
import
logging
as
log
import
re
import
re
from
golang.gcompat
import
qq
from
golang.gcompat
import
qq
from
golang
import
func
,
defer
,
strconv
from
golang
import
func
,
defer
,
strconv
,
b
# txn_raw_extension returns raw extension from txn metadata
# txn_raw_extension returns raw extension from txn metadata
def
txn_raw_extension
(
stor
,
txn
):
def
txn_raw_extension
(
stor
,
txn
):
...
@@ -96,11 +96,11 @@ def zodbdump(stor, tidmin, tidmax, hashonly=False, out=asbinstream(sys.stdout)):
...
@@ -96,11 +96,11 @@ def zodbdump(stor, tidmin, tidmax, hashonly=False, out=asbinstream(sys.stdout)):
for
txn
in
stor
.
iterator
(
tidmin
,
tidmax
):
for
txn
in
stor
.
iterator
(
tidmin
,
tidmax
):
# XXX .status not covered by IStorageTransactionInformation
# XXX .status not covered by IStorageTransactionInformation
# XXX but covered by BaseStorage.TransactionRecord
# XXX but covered by BaseStorage.TransactionRecord
out
.
write
(
"txn %s %s
\
n
user %s
\
n
description %s
\
n
extension %s
\
n
"
%
(
out
.
write
(
b
(
"txn %s %s
\
n
user %s
\
n
description %s
\
n
extension %s
\
n
"
%
(
ashex
(
txn
.
tid
),
qq
(
txn
.
status
),
ashex
(
txn
.
tid
),
qq
(
txn
.
status
),
qq
(
txn
.
user
),
qq
(
txn
.
user
),
qq
(
txn
.
description
),
qq
(
txn
.
description
),
qq
(
txn_raw_extension
(
stor
,
txn
))
))
qq
(
txn_raw_extension
(
stor
,
txn
))
))
)
objv
=
txnobjv
(
txn
)
objv
=
txnobjv
(
txn
)
...
@@ -120,18 +120,18 @@ def zodbdump(stor, tidmin, tidmax, hashonly=False, out=asbinstream(sys.stdout)):
...
@@ -120,18 +120,18 @@ def zodbdump(stor, tidmin, tidmax, hashonly=False, out=asbinstream(sys.stdout)):
entry
+=
"%i sha1:%s"
%
(
len
(
obj
.
data
),
ashex
(
sha1
(
obj
.
data
)))
entry
+=
"%i sha1:%s"
%
(
len
(
obj
.
data
),
ashex
(
sha1
(
obj
.
data
)))
write_data
=
True
write_data
=
True
out
.
write
(
entry
)
out
.
write
(
b
(
entry
)
)
if
write_data
:
if
write_data
:
if
hashonly
:
if
hashonly
:
out
.
write
(
" -"
)
out
.
write
(
b
" -"
)
else
:
else
:
out
.
write
(
"
\
n
"
)
out
.
write
(
b
"
\
n
"
)
out
.
write
(
obj
.
data
)
out
.
write
(
obj
.
data
)
out
.
write
(
"
\
n
"
)
out
.
write
(
b
"
\
n
"
)
out
.
write
(
"
\
n
"
)
out
.
write
(
b
"
\
n
"
)
# ----------------------------------------
# ----------------------------------------
# XPickler is Pickler that tries to save objects stably
# XPickler is Pickler that tries to save objects stably
...
@@ -452,15 +452,15 @@ class Transaction(object):
...
@@ -452,15 +452,15 @@ class Transaction(object):
def
_extension
(
self
):
def
_extension
(
self
):
return
self
.
extension
return
self
.
extension
# zdump returns
text
representation of a record in zodbdump format.
# zdump returns
semi text-binary
representation of a record in zodbdump format.
def
zdump
(
self
):
def
zdump
(
self
):
# -> bytes
z
=
'txn %s %s
\
n
'
%
(
ashex
(
self
.
tid
),
qq
(
self
.
status
))
z
=
b
(
'txn %s %s
\
n
'
%
(
ashex
(
self
.
tid
),
qq
(
self
.
status
)
))
z
+=
'user %s
\
n
'
%
qq
(
self
.
user
)
z
+=
b
(
'user %s
\
n
'
%
qq
(
self
.
user
)
)
z
+=
'description %s
\
n
'
%
qq
(
self
.
description
)
z
+=
b
(
'description %s
\
n
'
%
qq
(
self
.
description
)
)
z
+=
'extension %s
\
n
'
%
qq
(
self
.
extension_bytes
)
z
+=
b
(
'extension %s
\
n
'
%
qq
(
self
.
extension_bytes
)
)
for
obj
in
self
.
objv
:
for
obj
in
self
.
objv
:
z
+=
obj
.
zdump
()
z
+=
obj
.
zdump
()
z
+=
'
\
n
'
z
+=
b
'
\
n
'
return
z
return
z
...
@@ -477,7 +477,7 @@ class ObjectDelete(Object):
...
@@ -477,7 +477,7 @@ class ObjectDelete(Object):
super
(
ObjectDelete
,
self
).
__init__
(
oid
)
super
(
ObjectDelete
,
self
).
__init__
(
oid
)
def
zdump
(
self
):
def
zdump
(
self
):
return
'obj %s delete
\
n
'
%
(
ashex
(
self
.
oid
))
return
b
'obj %s delete
\
n
'
%
(
ashex
(
self
.
oid
))
# ObjectCopy represents object data copy.
# ObjectCopy represents object data copy.
class
ObjectCopy
(
Object
):
class
ObjectCopy
(
Object
):
...
@@ -487,7 +487,7 @@ class ObjectCopy(Object):
...
@@ -487,7 +487,7 @@ class ObjectCopy(Object):
self
.
copy_from
=
copy_from
self
.
copy_from
=
copy_from
def
zdump
(
self
):
def
zdump
(
self
):
return
'obj %s from %s
\
n
'
%
(
ashex
(
self
.
oid
),
ashex
(
self
.
copy_from
))
return
b
'obj %s from %s
\
n
'
%
(
ashex
(
self
.
oid
),
ashex
(
self
.
copy_from
))
# ObjectData represents record with object data.
# ObjectData represents record with object data.
class
ObjectData
(
Object
):
class
ObjectData
(
Object
):
...
@@ -507,13 +507,13 @@ class ObjectData(Object):
...
@@ -507,13 +507,13 @@ class ObjectData(Object):
size
=
data
.
size
size
=
data
.
size
else
:
else
:
size
=
len
(
data
)
size
=
len
(
data
)
z
=
'obj %s %d %s:%s'
%
(
ashex
(
self
.
oid
),
size
,
self
.
hashfunc
,
ashex
(
self
.
hash_
))
z
=
b
(
'obj %s %d %s:%s'
%
(
ashex
(
self
.
oid
),
size
,
self
.
hashfunc
,
ashex
(
self
.
hash_
)
))
if
hashonly
:
if
hashonly
:
z
+=
' -'
z
+=
b
' -'
else
:
else
:
z
+=
'
\
n
'
z
+=
b
'
\
n
'
z
+=
data
z
+=
data
z
+=
'
\
n
'
z
+=
b
'
\
n
'
return
z
return
z
# HashOnly indicated that this ObjectData record contains only hash and does not contain object data.
# HashOnly indicated that this ObjectData record contains only hash and does not contain object data.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment