Commit d5d3842c authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 8e1f48ce
...@@ -27,11 +27,11 @@ digraph { ...@@ -27,11 +27,11 @@ digraph {
nowcfs [label="!wcfs mode"] nowcfs [label="!wcfs mode"]
ZODB_go_inv [label="ZODB/go\ninvalidations"] ZODB_go_inv [label="ZODB/go\ninvalidations"]
Btree_read [label="BTree read"] Btree_read [label="BTree read", style=filled fillcolor=lightyellow]
ZBlk_read [label="ZBigFile / ZBlk* read"] ZBlk_read [label="ZBigFile / ZBlk* read", style=filled fillcolor=lightyellow]
ZODB_read [label="ZODB deserialize object"] ZODB_read [label="ZODB deserialize object", style=filled fillcolor=lightyellow]
ZODB_binary [label="Adapt to zodbpickle.binary"]; ZODB_binary [label="Adapt to zodbpickle.binary"];
ogorek_persref [label="ogórek:\npersistent references", style=filled fillcolor=grey95]; ogorek_persref [label="ogórek:\npersistent references", style=filled fillcolor=lightyellow];
Sinvtree [label="server: inv. tree"] Sinvtree [label="server: inv. tree"]
δR [label="δR encoding"] δR [label="δR encoding"]
......
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<!-- Btree_read --> <!-- Btree_read -->
<g id="node7" class="node"> <g id="node7" class="node">
<title>Btree_read</title> <title>Btree_read</title>
<ellipse fill="none" stroke="#000000" cx="136.2405" cy="-188.6102" rx="50.0912" ry="18"/> <ellipse fill="#ffffe0" stroke="#000000" cx="136.2405" cy="-188.6102" rx="50.0912" ry="18"/>
<text text-anchor="middle" x="136.2405" y="-184.9102" font-family="Times,serif" font-size="14.00" fill="#000000">BTree read</text> <text text-anchor="middle" x="136.2405" y="-184.9102" font-family="Times,serif" font-size="14.00" fill="#000000">BTree read</text>
</g> </g>
<!-- wcfs_simple&#45;&gt;Btree_read --> <!-- wcfs_simple&#45;&gt;Btree_read -->
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
<!-- ZBlk_read --> <!-- ZBlk_read -->
<g id="node8" class="node"> <g id="node8" class="node">
<title>ZBlk_read</title> <title>ZBlk_read</title>
<ellipse fill="none" stroke="#000000" cx="294.2405" cy="-188.6102" rx="89.8845" ry="18"/> <ellipse fill="#ffffe0" stroke="#000000" cx="294.2405" cy="-188.6102" rx="89.8845" ry="18"/>
<text text-anchor="middle" x="294.2405" y="-184.9102" font-family="Times,serif" font-size="14.00" fill="#000000">ZBigFile / ZBlk* read</text> <text text-anchor="middle" x="294.2405" y="-184.9102" font-family="Times,serif" font-size="14.00" fill="#000000">ZBigFile / ZBlk* read</text>
</g> </g>
<!-- wcfs_simple&#45;&gt;ZBlk_read --> <!-- wcfs_simple&#45;&gt;ZBlk_read -->
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
<!-- ZODB_read --> <!-- ZODB_read -->
<g id="node13" class="node"> <g id="node13" class="node">
<title>ZODB_read</title> <title>ZODB_read</title>
<ellipse fill="none" stroke="#000000" cx="215.2405" cy="-107.7401" rx="98.5829" ry="18"/> <ellipse fill="#ffffe0" stroke="#000000" cx="215.2405" cy="-107.7401" rx="98.5829" ry="18"/>
<text text-anchor="middle" x="215.2405" y="-104.0401" font-family="Times,serif" font-size="14.00" fill="#000000">ZODB deserialize object</text> <text text-anchor="middle" x="215.2405" y="-104.0401" font-family="Times,serif" font-size="14.00" fill="#000000">ZODB deserialize object</text>
</g> </g>
<!-- Btree_read&#45;&gt;ZODB_read --> <!-- Btree_read&#45;&gt;ZODB_read -->
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
<!-- ogorek_persref --> <!-- ogorek_persref -->
<g id="node15" class="node"> <g id="node15" class="node">
<title>ogorek_persref</title> <title>ogorek_persref</title>
<ellipse fill="#f2f2f2" stroke="#000000" cx="323.2405" cy="-26.8701" rx="90.5193" ry="26.7407"/> <ellipse fill="#ffffe0" stroke="#000000" cx="323.2405" cy="-26.8701" rx="90.5193" ry="26.7407"/>
<text text-anchor="middle" x="323.2405" y="-30.6701" font-family="Times,serif" font-size="14.00" fill="#000000">ogórek:</text> <text text-anchor="middle" x="323.2405" y="-30.6701" font-family="Times,serif" font-size="14.00" fill="#000000">ogórek:</text>
<text text-anchor="middle" x="323.2405" y="-15.6701" font-family="Times,serif" font-size="14.00" fill="#000000">persistent references</text> <text text-anchor="middle" x="323.2405" y="-15.6701" font-family="Times,serif" font-size="14.00" fill="#000000">persistent references</text>
</g> </g>
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
# #
# See COPYING file for full licensing terms. # See COPYING file for full licensing terms.
# See https://www.nexedi.com/licensing for rationale and options. # See https://www.nexedi.com/licensing for rationale and options.
"""test wcfs filesystem from outside as python client process"""
from wendelin.lib.testing import getTestDB from wendelin.lib.testing import getTestDB
from wendelin.bigfile.file_zodb import ZBigFile from wendelin.bigfile.file_zodb import ZBigFile
...@@ -66,8 +67,8 @@ def readfile(path): ...@@ -66,8 +67,8 @@ def readfile(path):
with open(path) as f: with open(path) as f:
return f.read() return f.read()
# ttime converts tid to transaction commit time. # tidtime converts tid to transaction commit time.
def ttime(tid): def tidtime(tid):
return TimeStamp(tid).timeTime() return TimeStamp(tid).timeTime()
...@@ -126,7 +127,7 @@ def test_bigfile_empty(): ...@@ -126,7 +127,7 @@ def test_bigfile_empty():
transaction.commit() transaction.commit()
tid2 = last._p_serial tid2 = last._p_serial
assert ttime(tid2) > ttime(tid1) assert tidtime(tid2) > tidtime(tid1)
wc = wcfs.join(testzurl, autostart=True) wc = wcfs.join(testzurl, autostart=True)
...@@ -146,7 +147,7 @@ def test_bigfile_empty(): ...@@ -146,7 +147,7 @@ def test_bigfile_empty():
os.mkdir(fpath) os.mkdir(fpath)
st = os.stat(fpath + "/head/data") st = os.stat(fpath + "/head/data")
assert st.st_size == 0 assert st.st_size == 0
assert st.st_mtime == ttime(tid1) assert st.st_mtime == tidtime(tid1)
assert readfile(fpath + "/head/at") == 'txn2' assert readfile(fpath + "/head/at") == 'txn2'
# XXX head/at = last txn of whole db # XXX head/at = last txn of whole db
......
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