hyperbee2 0.0.1 → 1.0.0

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
@@ -48,14 +49,14 @@ class CoreContext {
 
     // TODO: prop use a map...
     for (let i = 0; i < this.cores.length; i++) {
-      const k = this.cores[i]
+      const k = this.cores[i].key
       if (b4a.equals(k, key)) {
         return i + 1
       }
     }
 
     this.changed = true
-    this.cores.push(key)
+    this.cores.push({ key, fork: 0, length: 0, treeHash: null })
     return this.cores.length
   }
 
@@ -65,7 +66,7 @@ class CoreContext {
     if (b4a.equals(key, this.core.key)) return 0
 
     for (let i = 0; i < this.cores.length; i++) {
-      const k = this.cores[i]
+      const k = this.cores[i].key
       if (b4a.equals(k, key)) {
         return i + 1
       }
@@ -74,22 +75,23 @@ class CoreContext {
     await this.update(activeRequests)
 
     for (let i = 0; i < this.cores.length; i++) {
-      const k = this.cores[i]
+      const k = this.cores[i].key
       if (b4a.equals(k, key)) {
         return i + 1
       }
     }
 
     this.changed = true
-    this.cores.push(key)
+    this.cores.push({ key, fork: 0, length: 0, treeHash: null })
     return this.cores.length
   }
 
   getCore(index) {
     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])
+    if (this.opened[index - 1] === null) {
+      this.opened[index - 1] = this.store.get(this.cores[index - 1].key)
+    }
     return this.opened[index - 1]
   }
 
@@ -101,13 +103,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
   }
@@ -117,11 +123,11 @@ class CoreContext {
     if (core > this.cores.length) await this.update(activeRequests)
     if (core > this.cores.length) throw new Error('Bad core index: ' + core)
 
-    const hex = b4a.toString(this.cores[core - 1], 'hex')
+    const hex = b4a.toString(this.cores[core - 1].key, 'hex')
     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

@@ -288,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()
@@ -301,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
         }
 
@@ -320,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
         }
 
@@ -340,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++) {
@@ -361,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)
@@ -371,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)
@@ -384,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])
     }
 
@@ -405,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.1",
+  "version": "1.0.0",
   "description": "btree",
   "main": "index.js",
   "files": [

package/spec/hyperschema/index.js

@@ -125,15 +125,48 @@ const encoding4 = {
   }
 }
 
+// @bee/core
+const encoding5 = {
+  preencode(state, m) {
+    c.fixed32.preencode(state, m.key)
+    state.end++ // max flag is 4 so always one byte
+
+    if (m.fork) c.uint.preencode(state, m.fork)
+    if (m.length) c.uint.preencode(state, m.length)
+    if (m.treeHash) c.fixed32.preencode(state, m.treeHash)
+  },
+  encode(state, m) {
+    const flags = (m.fork ? 1 : 0) | (m.length ? 2 : 0) | (m.treeHash ? 4 : 0)
+
+    c.fixed32.encode(state, m.key)
+    c.uint.encode(state, flags)
+
+    if (m.fork) c.uint.encode(state, m.fork)
+    if (m.length) c.uint.encode(state, m.length)
+    if (m.treeHash) c.fixed32.encode(state, m.treeHash)
+  },
+  decode(state) {
+    const r0 = c.fixed32.decode(state)
+    const flags = c.uint.decode(state)
+
+    return {
+      key: r0,
+      fork: (flags & 1) !== 0 ? c.uint.decode(state) : 0,
+      length: (flags & 2) !== 0 ? c.uint.decode(state) : 0,
+      treeHash: (flags & 4) !== 0 ? c.fixed32.decode(state) : null
+    }
+  }
+}
+
 // @bee/block.tree
-const encoding5_4 = c.array(encoding3)
+const encoding6_4 = c.array(encoding3)
 // @bee/block.data
-const encoding5_5 = c.array(encoding4)
+const encoding6_5 = c.array(encoding4)
 // @bee/block.cores
-const encoding5_6 = c.array(c.fixed32)
+const encoding6_6 = c.array(encoding5)
 
 // @bee/block
-const encoding5 = {
+const encoding6 = {
   preencode(state, m) {
     c.uint.preencode(state, m.type)
     c.uint.preencode(state, m.checkpoint)
@@ -141,9 +174,9 @@ const encoding5 = {
     state.end++ // max flag is 8 so always one byte
 
     if (m.previous) encoding1.preencode(state, m.previous)
-    if (m.tree) encoding5_4.preencode(state, m.tree)
-    if (m.data) encoding5_5.preencode(state, m.data)
-    if (m.cores) encoding5_6.preencode(state, m.cores)
+    if (m.tree) encoding6_4.preencode(state, m.tree)
+    if (m.data) encoding6_5.preencode(state, m.data)
+    if (m.cores) encoding6_6.preencode(state, m.cores)
   },
   encode(state, m) {
     const flags = (m.previous ? 1 : 0) | (m.tree ? 2 : 0) | (m.data ? 4 : 0) | (m.cores ? 8 : 0)
@@ -154,9 +187,9 @@ const encoding5 = {
     c.uint.encode(state, flags)
 
     if (m.previous) encoding1.encode(state, m.previous)
-    if (m.tree) encoding5_4.encode(state, m.tree)
-    if (m.data) encoding5_5.encode(state, m.data)
-    if (m.cores) encoding5_6.encode(state, m.cores)
+    if (m.tree) encoding6_4.encode(state, m.tree)
+    if (m.data) encoding6_5.encode(state, m.data)
+    if (m.cores) encoding6_6.encode(state, m.cores)
   },
   decode(state) {
     const r0 = c.uint.decode(state)
@@ -169,9 +202,9 @@ const encoding5 = {
       checkpoint: r1,
       batch: r2,
       previous: (flags & 1) !== 0 ? encoding1.decode(state) : null,
-      tree: (flags & 2) !== 0 ? encoding5_4.decode(state) : null,
-      data: (flags & 4) !== 0 ? encoding5_5.decode(state) : null,
-      cores: (flags & 8) !== 0 ? encoding5_6.decode(state) : null
+      tree: (flags & 2) !== 0 ? encoding6_4.decode(state) : null,
+      data: (flags & 4) !== 0 ? encoding6_5.decode(state) : null,
+      cores: (flags & 8) !== 0 ? encoding6_6.decode(state) : null
     }
   }
 }
@@ -209,8 +242,10 @@ function getEncoding(name) {
       return encoding3
     case '@bee/data':
       return encoding4
-    case '@bee/block':
+    case '@bee/core':
       return encoding5
+    case '@bee/block':
+      return encoding6
     default:
       throw new Error('Encoder not found ' + name)
   }

package/spec/hyperschema/schema.json

@@ -109,6 +109,35 @@
         }
       ]
     },
+    {
+      "name": "core",
+      "namespace": "bee",
+      "compact": true,
+      "flagsPosition": 1,
+      "fields": [
+        {
+          "name": "key",
+          "required": true,
+          "type": "fixed32",
+          "version": 1
+        },
+        {
+          "name": "fork",
+          "type": "uint",
+          "version": 1
+        },
+        {
+          "name": "length",
+          "type": "uint",
+          "version": 1
+        },
+        {
+          "name": "treeHash",
+          "type": "fixed32",
+          "version": 1
+        }
+      ]
+    },
     {
       "name": "block",
       "namespace": "bee",
@@ -153,7 +182,7 @@
         {
           "name": "cores",
           "array": true,
-          "type": "fixed32",
+          "type": "@bee/core",
           "version": 1
         }
       ]