hyperbee2 0.0.0 → 0.0.2

package/index.js

@@ -12,7 +12,7 @@ class Hyperbee {
     const {
       key = null,
       core = key ? store.get(key) : store.get({ key, name: 'bee' }),
-      context = new CoreContext(store, core),
+      context = new CoreContext(store, core, core),
       maxCacheSize = 4096,
       cache = new NodeCache(maxCacheSize),
       root = null,
@@ -64,9 +64,9 @@ class Hyperbee {
     return this.store.replicate(...opts)
   }
 
-  _makeView(root, writable, unbatch) {
+  _makeView(context, root, writable, unbatch) {
     return new Hyperbee(this.store, {
-      context: this.context,
+      context,
       cache: this.cache,
       root,
       view: true,
@@ -78,15 +78,15 @@ class Hyperbee {
   checkout({ length = this.core.length, key = null, writable = false } = {}) {
     const context = key ? this.context.getContextByKey(key) : this.context
     const root = length === 0 ? EMPTY : new TreeNodePointer(context, 0, length - 1, 0, false, null)
-    return this._makeView(root, writable, 0)
+    return this._makeView(context, root, writable, 0)
   }
 
   snapshot() {
-    return this._makeView(this.root, false, 0)
+    return this._makeView(this.context, this.root, false, 0)
   }
 
   undo(n) {
-    return this._makeView(this.root, true, n)
+    return this._makeView(this.context, this.root, true, n)
   }
 
   write(opts) {

package/lib/context.js

@@ -2,8 +2,9 @@ const b4a = require('b4a')
 const { decodeBlock } = require('./encoding.js')
 
 class CoreContext {
-  constructor(store, core, other = new Map()) {
+  constructor(store, local, core, other = new Map()) {
     this.store = store
+    this.local = local
     this.core = core
     this.other = other
     this.length = 0
@@ -101,11 +102,17 @@ class CoreContext {
     return block
   }
 
+  getLocalContext() {
+    return this.getContextByKey(this.local.key)
+  }
+
   getContextByKey(key) {
+    if (b4a.equals(key, this.core.key)) return this
+
     const hex = b4a.toString(key, 'hex')
     if (this.other.has(hex)) return this.other.get(hex)
 
-    const ctx = new CoreContext(this.store, this.store.get(key))
+    const ctx = new CoreContext(this.store, this.local, this.store.get(key))
     this.other.set(hex, ctx)
     return ctx
   }
@@ -119,7 +126,7 @@ class CoreContext {
     if (this.other.has(hex)) return this.other.get(hex)
 
     const hc = this.getCore(core)
-    const ctx = new CoreContext(this.store, hc)
+    const ctx = new CoreContext(this.store, this.local, hc)
     this.other.set(hex, ctx)
     return ctx
   }

package/lib/write.js

@@ -29,6 +29,16 @@ module.exports = class WriteBatch {
     this.length = 0
   }
 
+  _getContext(root) {
+    if (!this.key && !root) return this.tree.context
+    return this.key ? this.tree.context.getContextByKey(this.key) : root.context
+  }
+
+  _getLength(root) {
+    if (this.length > -1) return this.length
+    return root ? root.seq + 1 : 0
+  }
+
   async flush() {
     if (this.flushing) throw new Error('Already flushed')
     this.flushing = true
@@ -36,15 +46,14 @@ module.exports = class WriteBatch {
     const ops = this.ops
     this.ops = []
 
-    await this.tree.ready()
+    const root = await this.tree.bootstrap()
 
-    const length = this.length === -1 ? this.tree.core.length : this.length
+    const length = this._getLength(root)
+    const context = this._getContext(root)
 
     const changed = length === 0
     const seq = length === 0 ? 0 : length - 1
 
-    const context = this.key ? this.tree.context.getContextByKey(this.key) : this.tree.context
-
     this.length = length
     this.root = new TreeNodePointer(
       context,
@@ -279,8 +288,9 @@ module.exports = class WriteBatch {
     const update = { node: [], keys: [] }
     const batch = [update]
     const stack = [{ update, node: this.root }]
+    const context = this.tree.context.getLocalContext()
 
-    await this.tree.context.update(this.tree.activeRequests)
+    await context.update(this.tree.activeRequests)
 
     while (stack.length > 0) {
       const { update, node } = stack.pop()
@@ -292,12 +302,8 @@ module.exports = class WriteBatch {
         const k = node.value.keys[i]
 
         if (!k.changed) {
-          k.core = await this.tree.context.getCoreOffset(
-            k.context,
-            k.core,
-            this.tree.activeRequests
-          )
-          k.context = this.tree.context
+          k.core = await context.getCoreOffset(k.context, k.core, this.tree.activeRequests)
+          k.context = context
           continue
         }
 
@@ -311,12 +317,8 @@ module.exports = class WriteBatch {
         const n = node.value.children[i]
 
         if (!n.changed) {
-          n.core = await this.tree.context.getCoreOffset(
-            n.context,
-            n.core,
-            this.tree.activeRequests
-          )
-          n.context = this.tree.context
+          n.core = await context.getCoreOffset(n.context, n.core, this.tree.activeRequests)
+          n.context = context
           continue
         }
 
@@ -331,7 +333,7 @@ module.exports = class WriteBatch {
       }
     }
 
-    const length = this.tree.core.length
+    const length = context.core.length
     const blocks = new Array(batch.length)
 
     for (let i = 0; i < batch.length; i++) {
@@ -352,7 +354,7 @@ module.exports = class WriteBatch {
         if (block.data === null) block.data = []
 
         k.core = 0
-        k.context = this.tree.context
+        k.context = context
         k.seq = seq
         k.offset = block.data.length
         block.data.push(k)
@@ -362,7 +364,7 @@ module.exports = class WriteBatch {
         if (block.tree === null) block.tree = []
 
         n.core = 0
-        n.context = this.tree.context
+        n.context = context
         n.seq = seq
         n.offset = block.tree.length
         block.tree.push(n.value)
@@ -375,20 +377,20 @@ module.exports = class WriteBatch {
 
     if (blocks.length > 0 && this.length > 0) {
       const core = this.key
-        ? await this.tree.context.getCoreOffsetByKey(this.key, this.tree.activeRequests)
+        ? await context.getCoreOffsetByKey(this.key, this.tree.activeRequests)
         : 0
       blocks[blocks.length - 1].previous = { core, seq: this.length - 1 }
     }
 
     // TODO: make this transaction safe
-    if (this.tree.context.changed) {
-      this.tree.context.changed = false
-      this.tree.context.checkpoint = this.tree.core.length + blocks.length
-      blocks[blocks.length - 1].cores = this.tree.context.cores
+    if (context.changed) {
+      context.changed = false
+      context.checkpoint = context.core.length + blocks.length
+      blocks[blocks.length - 1].cores = context.cores
     }
 
     for (let i = 0; i < blocks.length; i++) {
-      blocks[i].checkpoint = this.tree.context.checkpoint
+      blocks[i].checkpoint = context.checkpoint
       buffers[i] = c.encode(Block, blocks[i])
     }
 
@@ -396,7 +398,7 @@ module.exports = class WriteBatch {
       throw new Error('Write batch is closed')
     }
 
-    await this.tree.core.append(buffers)
+    await context.core.append(buffers)
 
     for (let i = 0; i < batch.length; i++) {
       const update = batch[i]

package/package.json

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