[functional-tests/btree] btree-walk-and-count + stop using a spine.

functional-tests/persistent-data/btree.scm

@@ -7,6 +7,7 @@
           btree-open
           btree-lookup
           btree-each
+          btree-each-and-count
           le64-vt
 
           define-value-type
@@ -149,11 +150,11 @@
                       default)))))))
 
   ;;;;----------------------------------------------
-  ;;;; Walking the btree
+  ;;; Walk btree, counting metadata references
+  ;;;   (inc-fn <block>)
+  ;;;   (fn key value)
   ;;;;----------------------------------------------
-
+  (define (btree-each-and-count tree cache fn inc-fn)
-  ;;; Calls (fn key value) on every entry of the btree.
-  (define (btree-each tree sp fn)
     (let ((vt (btree-value-type tree)))
 
      (define (visit-leaf nr-entries keys vals)
@@ -168,16 +169,27 @@
               (visit-node (le64-vt 'ref vals index))
               (loop (+ 1 index)))))
 
-     (define (visit-node root)
+     (define (select-visitor header)
-             (spine-step sp (b root (get-flags))
+       (if (internal-node? header)
+           visit-internal
+           visit-leaf))
+
+     (define (visit-node bi)
+       (with-block (b cache bi (get-flags))
          (let* ((header (block->header b))
                 (nr-entries (ftype-ref BTreeNodeHeader (nr-entries) header))
                 (keys (block->keys b))
                 (vals (block->values b vt)))
-                               ((if (internal-node? header)
+               (inc-fn bi)
-                                    visit-internal
+               ((select-visitor header) nr-entries keys vals))))
-                                    visit-leaf) nr-entries keys vals))))
 
      (visit-node (btree-root tree))))
+
+  ;;; Calls (fn key value) on every entry of the btree.
+  (define (btree-each tree cache fn)
+    (define (noop bi) 'nil)
+
+    (btree-each-and-count tree cache fn noop))
 )
 
+