.

wcfs/internal/xbtree.py

@@ -33,7 +33,7 @@ It is primarily used to verify ΔBTail in wcfs.
 - `AllStructs` generates all possible BTree topology structures with given keys.
 
 
-Topology encoding   XXX values
+Topology encoding
 -----------------
 
 Topology encoding provides way to represent structure of a Tree as path-like string.
@@ -48,9 +48,9 @@ The following example illustrates topology encoding represented by string
        / \
      [ ] [ ]            T-T/        represents two empty Tree([])
       ↓   ↓
-     |1|[ 5 ]           B1-T5/      represent Bucket(1) and Tree([5])
+     |1|[ 5 ]           B1-T5/      represent Bucket([1]) and Tree([5])
          / \
-        || |7|8|9|      B-B7,8,9    represents empty Bucket() and Bucket(7,8,9)
+        || |7|8|9|      B-B7,8,9    represents empty Bucket([]) and Bucket([7,8,9])
 
 
 Topology encoding specification:
@@ -59,12 +59,19 @@ A Tree is encoded by level-order traversal, delimiting layers with "/".
 Inside a layer Tree and Bucket nodes are signalled as
 
     "T<keys>"       ; Tree
-    "B<keys>"       ; Bucket    XXX values
+    "B<keys>"       ; Bucket with only keys
+    "B<keys+values>"; Bucket with keys and values
 
 Keys are represented as ","-delimited list of integers. For example Tree
-with [1,3,5] keys is represented as
+or Bucket with [1,3,5] keys are represented as
 
     "T1,3,5"        ; Tree([1,3,5])
+    "B1,3,5"        ; Bucket([1,3,5])
+
+Keys+values are represented as ","-delimited list of "<key>:<value>" pairs. For
+example Bucket corresponding to {1:1, 2:4, 3:9} is represented as
+
+    "B1:1,2:4,3:9"  ; Bucket([1,2,3], [1,4,9])
 
 Nodes inside one layer are delimited with "-". For example a layer consisting
 of an empty Tree, a Tree with [1,3] keys, and Bucket with [4,5] keys is