hyperbee2 2.0.1 → 2.0.3

package/lib/ranges.js

@@ -24,7 +24,8 @@ class RangeIterator {
     this.end = lte || lt || null
     this.inclusive = !!(reverse ? lte : gte)
     this.compare = (reverse ? gte : lte) ? 0 : -1
-    this.prefetching = prefetch
+    this.prefetch = prefetch
+    this.prefetching = null
   }
 
   async open() {
@@ -112,7 +113,7 @@ class RangeIterator {
 
         if (c > this.compare) break
 
-        if (this.prefetching && !v.children.length && this.stack.length) this.prefetch()
+        if (this.prefetch && !v.children.length && this.stack.length) this.prefetchNext()
 
         this.stack.push(top)
         if (this.limit !== -1) this.limit--
@@ -123,14 +124,17 @@ class RangeIterator {
     return null
   }
 
-  prefetch() {
+  prefetchNext() {
     // TODO: dbl check this for off-by-ones with the offset and keys and children
-    this.prefetching = false
-    if (this.limit < this.tree.context.minKeys) return
+    let limit = this.limit
+
+    if (limit < this.tree.context.minKeys) return
 
     const parent = this.stack[this.stack.length - 1]
     const pv = parent.node.value
-    if (!pv) return
+    if (!pv || pv === this.prefetching) return
+
+    this.prefetching = pv
 
     for (let i = parent.offset >> 1; i < pv.children.length; i++) {
       const k = pv.keys.get(i)
@@ -147,6 +151,9 @@ class RangeIterator {
 
       const c = pv.children.get(i)
       if (!c.value) this.tree.inflate(c, this.activeRequests).catch(noop)
+
+      limit = Math.max(limit - this.tree.context.minKeys, 0)
+      if (limit === 0) break
     }
   }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hyperbee2",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "btree",
   "main": "index.js",
   "files": [