hyperbee2 1.0.0 → 1.1.0

package/index.js

@@ -11,8 +11,9 @@ class Hyperbee {
   constructor(store, options = {}) {
     const {
       key = null,
-      core = key ? store.get(key) : store.get({ key, name: 'bee' }),
-      context = new CoreContext(store, core, core),
+      encryption = null,
+      core = key ? store.get(key) : store.get({ key, name: 'bee', encryption }),
+      context = new CoreContext(store, core, core, encryption),
       maxCacheSize = 4096,
       cache = new NodeCache(maxCacheSize),
       root = null,

package/lib/context.js

@@ -1,11 +1,14 @@
 const b4a = require('b4a')
+const ScopeLock = require('scope-lock')
 const { decodeBlock } = require('./encoding.js')
 
 class CoreContext {
-  constructor(store, local, core, other = new Map()) {
+  constructor(store, local, core, encryption, lock = new ScopeLock(), other = new Map()) {
     this.store = store
     this.local = local
     this.core = core
+    this.encryption = encryption
+    this.lock = lock
     this.other = other
     this.length = 0
     this.checkpoint = 0
@@ -43,7 +46,7 @@ class CoreContext {
 
   async getCoreOffset(context, core, activeRequests) {
     if (core !== 0 && core - 1 >= context.cores.length) await context.update(activeRequests)
-    const key = core === 0 ? context.core.key : context.cores[core - 1]
+    const key = core === 0 ? context.core.key : context.cores[core - 1].key
 
     if (b4a.equals(key, this.core.key)) return 0
 
@@ -90,7 +93,8 @@ class CoreContext {
     if (index === 0) return this.core
     if (index > this.cores.length) throw new Error('Bad core index: ' + index)
     if (this.opened[index - 1] === null) {
-      this.opened[index - 1] = this.store.get(this.cores[index - 1].key)
+      const key = this.cores[index - 1].key
+      this.opened[index - 1] = this.store.get({ key, encryption: this.encryption })
     }
     return this.opened[index - 1]
   }
@@ -113,7 +117,8 @@ class CoreContext {
     const hex = b4a.toString(key, 'hex')
     if (this.other.has(hex)) return this.other.get(hex)
 
-    const ctx = new CoreContext(this.store, this.local, this.store.get(key))
+    const hc = this.store.get({ key, encryption: this.encryption })
+    const ctx = new CoreContext(this.store, this.local, hc, this.encryption, this.lock, this.other)
     this.other.set(hex, ctx)
     return ctx
   }
@@ -127,7 +132,7 @@ class CoreContext {
     if (this.other.has(hex)) return this.other.get(hex)
 
     const hc = this.getCore(core)
-    const ctx = new CoreContext(this.store, this.local, hc)
+    const ctx = new CoreContext(this.store, this.local, hc, this.encryption, this.lock, this.other)
     this.other.set(hex, ctx)
     return ctx
   }

package/lib/tree.js

@@ -4,6 +4,10 @@ const T = 5
 const MIN_KEYS = T - 1
 const MAX_CHILDREN = MIN_KEYS * 2 + 1
 
+const UNCHANGED = 0
+const CHANGED = 1
+const NEEDS_SPLIT = 2
+
 class DataPointer {
   constructor(context, core, seq, offset, changed, key, value) {
     this.context = context
@@ -40,6 +44,10 @@ class TreeNode {
     this.children = children
   }
 
+  isEmpty() {
+    return this.keys.length === 0 && this.children.length === 0
+  }
+
   put(context, key, value, child) {
     let s = 0
     let e = this.keys.length
@@ -52,8 +60,9 @@ class TreeNode {
       c = b4a.compare(key, k.key)
 
       if (c === 0) {
+        if (b4a.equals(k.value, value)) return UNCHANGED
         this.keys[mid] = new DataPointer(context, 0, 0, 0, true, key, value)
-        return true
+        return CHANGED
       }
 
       if (c < 0) e = mid
@@ -64,7 +73,7 @@ class TreeNode {
     this.keys.splice(i, 0, new DataPointer(context, 0, 0, 0, true, key, value))
     if (child) this.children.splice(i + 1, 0, child)
 
-    return this.keys.length < MAX_CHILDREN
+    return this.keys.length < MAX_CHILDREN ? CHANGED : NEEDS_SPLIT
   }
 
   setValue(context, i, value) {
@@ -123,6 +132,10 @@ exports.T = T
 exports.MIN_KEYS = MIN_KEYS
 exports.MAX_CHILDREN = MAX_CHILDREN
 
+exports.UNCHANGED = UNCHANGED
+exports.CHANGED = CHANGED
+exports.NEEDS_SPLIT = NEEDS_SPLIT
+
 exports.TreeNodePointer = TreeNodePointer
 exports.TreeNode = TreeNode
 exports.DataPointer = DataPointer

package/lib/write.js

@@ -1,7 +1,14 @@
 const b4a = require('b4a')
 const c = require('compact-encoding')
-const { TreeNode, TreeNodePointer, MIN_KEYS } = require('./tree.js')
 const { Block } = require('./encoding.js')
+const {
+  TreeNode,
+  TreeNodePointer,
+  MIN_KEYS,
+  UNCHANGED,
+  CHANGED,
+  NEEDS_SPLIT
+} = require('./tree.js')
 
 module.exports = class WriteBatch {
   constructor(tree, { length = -1, key = null, autoUpdate = true } = {}) {
@@ -11,7 +18,6 @@ module.exports = class WriteBatch {
     this.length = length
     this.key = key
     this.closed = false
-    this.flushing = false
     this.root = null
     this.ops = []
   }
@@ -40,40 +46,44 @@ module.exports = class WriteBatch {
   }
 
   async flush() {
-    if (this.flushing) throw new Error('Already flushed')
-    this.flushing = true
-
-    const ops = this.ops
-    this.ops = []
-
-    const root = await this.tree.bootstrap()
-
-    const length = this._getLength(root)
-    const context = this._getContext(root)
-
-    const changed = length === 0
-    const seq = length === 0 ? 0 : length - 1
-
-    this.length = length
-    this.root = new TreeNodePointer(
-      context,
-      0,
-      seq,
-      0,
-      changed,
-      changed ? new TreeNode([], []) : null
-    )
-
-    for (const op of ops) {
-      if (op.put) await this._put(op.key, op.value)
-      else await this._delete(op.key)
-    }
+    const lock = this.tree.context.lock
+    await lock.lock()
+
+    try {
+      const ops = this.ops
+      this.ops = []
+
+      const root = await this.tree.bootstrap()
+
+      const length = this._getLength(root)
+      const context = this._getContext(root)
+
+      const changed = length === 0
+      const seq = length === 0 ? 0 : length - 1
+
+      this.length = length
+      this.root = new TreeNodePointer(
+        context,
+        0,
+        seq,
+        0,
+        changed,
+        changed ? new TreeNode([], []) : null
+      )
+
+      for (const op of ops) {
+        if (op.put) await this._put(op.key, op.value)
+        else await this._delete(op.key)
+      }
 
-    await this._flush()
-    await this.snapshot.close()
+      await this._flush()
+      await this.snapshot.close()
 
-    if (this.autoUpdate) {
-      this.tree.update(this.root)
+      if (this.autoUpdate) {
+        this.tree.update(this.root)
+      }
+    } finally {
+      lock.unlock()
     }
   }
 
@@ -105,7 +115,7 @@ module.exports = class WriteBatch {
         c = b4a.compare(target, m.key)
 
         if (c === 0) {
-          if (b4a.compare(m.value, value)) return
+          if (b4a.equals(m.value, value)) return
           v.setValue(this.tree.context, mid, value)
           for (let i = 0; i < stack.length; i++) stack[i].changed = true
           return
@@ -120,27 +130,29 @@ module.exports = class WriteBatch {
     }
 
     const v = ptr.value ? this.snapshot.bump(ptr) : await this.snapshot.inflate(ptr)
-    let needsSplit = !v.put(this.tree.context, target, value, null)
+    let status = v.put(this.tree.context, target, value, null)
+
+    if (status === UNCHANGED) return
 
     ptr.changed = true
 
     for (let i = 0; i < stack.length; i++) stack[i].changed = true
 
-    while (needsSplit) {
+    while (status === NEEDS_SPLIT) {
       const v = ptr.value ? this.snapshot.bump(ptr) : await this.snapshot.inflate(ptr)
       const parent = stack.pop()
       const { median, right } = v.split(this.tree.context)
 
       if (parent) {
         const p = parent.value ? this.snapshot.bump(parent) : await this.snapshot.inflate(parent)
-        needsSplit = !p.put(this.tree.context, median.key, median.value, right)
+        status = p.put(this.tree.context, median.key, median.value, right)
         ptr = parent
       } else {
         this.root = new TreeNodePointer(this.tree.context, 0, 0, 0, true, new TreeNode([], []))
         this.root.value.keys.push(median)
         this.root.value.children.push(ptr, right)
         this.snapshot.bump(this.root)
-        needsSplit = false
+        status = UNCHANGED
       }
     }
   }
@@ -333,6 +345,14 @@ module.exports = class WriteBatch {
       }
     }
 
+    // if only the root was marked dirty and is === current bootstrap the batch is a noop - skip
+    if (update.node.length === 1 && update.keys.length === 0) {
+      const b = await this.tree.bootstrap()
+      const n = update.node[0]
+      if (b && b.context === n.context && b.core === n.core && b.seq === n.seq) return
+      if (!b && n.isEmpty()) return
+    }
+
     const length = context.core.length
     const blocks = new Array(batch.length)
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hyperbee2",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "description": "btree",
   "main": "index.js",
   "files": [
@@ -20,6 +20,7 @@
     "hypercore": "^11.15.0",
     "hyperschema": "^1.14.0",
     "protocol-buffers-encodings": "^1.2.0",
+    "scope-lock": "^1.2.4",
     "streamx": "^2.22.1"
   },
   "devDependencies": {