Commit 05e3d50a authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent b1aba2bf
...@@ -185,8 +185,6 @@ def Trees(zstor, r): ...@@ -185,8 +185,6 @@ def Trees(zstor, r):
print("txn %s -> tree(%s) %s" % (ashex(tid), ashex(ztree._p_oid), treetxt)) print("txn %s -> tree(%s) %s" % (ashex(tid), ashex(ztree._p_oid), treetxt))
# AllStructs generates subset of all possible tree changes in # AllStructs generates subset of all possible tree changes in
# between kv1 and kv2. See top-level documentation for details. # between kv1 and kv2. See top-level documentation for details.
@func @func
...@@ -214,8 +212,8 @@ def AllStructs(zstor, kv1txt, kv2txt, n, seed=None): ...@@ -214,8 +212,8 @@ def AllStructs(zstor, kv1txt, kv2txt, n, seed=None):
t2AllStructs = list(xbtree.AllStructs(kv2.keys(), maxdepth, maxsplit)) t2AllStructs = list(xbtree.AllStructs(kv2.keys(), maxdepth, maxsplit))
# create the tree # create the tree
ztree = zctx.root['treegen/tree'] = XLOTree() # XXX -> treegen/allstructs ? ztree = zctx.root['treegen/allstructs/tree'] = XLOTree() # XXX -> treegen/allstructs ?
commit('treegen/tree') commit('treegen/allstructs: init tree')
# XXX print something? # XXX print something?
# emit patches ztree with delta, adjusts tree structure and emits corresponding commit. # emit patches ztree with delta, adjusts tree structure and emits corresponding commit.
...@@ -225,7 +223,7 @@ def AllStructs(zstor, kv1txt, kv2txt, n, seed=None): ...@@ -225,7 +223,7 @@ def AllStructs(zstor, kv1txt, kv2txt, n, seed=None):
if treeTopo is not None: if treeTopo is not None:
xbtree.Restructure(ztree, treeTopo) xbtree.Restructure(ztree, treeTopo)
ttxt = zctx.ztreetxt(ztree) ttxt = zctx.ztreetxt(ztree)
tid = commit('%s -> %s' % (ttxt_prev, ttxt)) tid = commit('treegen/allstructs: %s -> %s' % (ttxt_prev, ttxt))
print('txn %s # %s -> %s' % (ashex(tid), ttxt_prev, ttxt)) print('txn %s # %s -> %s' % (ashex(tid), ttxt_prev, ttxt))
for (k,v) in delta: for (k,v) in delta:
vtxt = 'ø' vtxt = 'ø'
......
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