hyperbee2 2.0.1 → 2.0.4

package/index.js

@@ -182,7 +182,9 @@ class Hyperbee {
       children[i] = inflateChild(context, d, ptr, block, activeRequests)
     }
 
-    ptr.value = new TreeNode(await Promise.all(keys), await Promise.all(children))
+    const value = new TreeNode(await Promise.all(keys), await Promise.all(children))
+    if (!ptr.value) ptr.value = value
+
     this.bump(ptr)
 
     return ptr.value

package/lib/cache.js

@@ -10,10 +10,11 @@ module.exports = class NodeCache {
   }
 
   empty() {
-    const maxSize = this.maxSize
-    this.maxSize = 0
-    this.gc()
-    this.maxSize = maxSize
+    while (this.size > 0) {
+      const old = this.oldest()
+      this.remove(old)
+      old.value = null
+    }
   }
 
   gc() {

package/lib/compression.js

@@ -94,7 +94,14 @@ class CompressedArray {
   }
 
   flush(max, min) {
-    if (this.delta.length <= max) return this.delta
+    let overflow = false
+    for (const d of this.delta) {
+      if (d.index < 256) continue // has to be uint3, only happens in rebalances/splits
+      overflow = true
+      break
+    }
+
+    if (this.delta.length <= max && !overflow) return this.delta
 
     const direct = []
     while (this.delta.length && this.delta[this.delta.length - 1].type !== OP_COHORT) {
@@ -102,7 +109,7 @@ class CompressedArray {
     }
     direct.reverse()
 
-    if (direct.length > min && direct.length < this.entries.length) {
+    if (direct.length > min && direct.length < this.entries.length && !overflow) {
       const co = new DeltaCohort(true, null, [])
       for (const d of direct) {
         co.deltas.push(d)

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/lib/write.js

@@ -8,7 +8,6 @@ const {
   ValuePointer,
   TreeNode,
   TreeNodePointer,
-  MIN_KEYS,
   INSERTED,
   NEEDS_SPLIT
 } = require('./tree.js')
@@ -272,7 +271,7 @@ module.exports = class WriteBatch {
 
       const v = ptr.value ? this.snapshot.bump(ptr) : await this.snapshot.inflate(ptr)
 
-      if (v.keys.length >= MIN_KEYS) return root
+      if (v.keys.length >= minKeys) return root
 
       const p = parent.value ? this.snapshot.bump(parent) : await this.snapshot.inflate(parent)
 

package/package.json

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