rocksdb-native 2.6.8 → 3.0.0

package/lib/iterator.js

@@ -1,13 +1,13 @@
 const { Readable } = require('streamx')
 const c = require('compact-encoding')
-const b4a = require('b4a')
 const binding = require('../binding')
 
-const empty = b4a.alloc(0)
+const empty = Buffer.alloc(0)
 
 module.exports = class RocksDBIterator extends Readable {
   constructor(db, opts = {}) {
     const {
+      columnFamily = db.defaultColumnFamily,
       gt = null,
       gte = null,
       lt = null,
@@ -15,7 +15,6 @@ module.exports = class RocksDBIterator extends Readable {
       reverse = false,
       limit = Infinity,
       capacity = 8,
-      snapshot = null,
       encoding = null,
       keyEncoding = encoding,
       valueEncoding = encoding
@@ -23,9 +22,10 @@ module.exports = class RocksDBIterator extends Readable {
 
     super()
 
-    db._incRef()
+    db._state.ref()
 
-    this._db = db
+    this._state = db._state
+    this._columnFamily = columnFamily
 
     this._keyEncoding = keyEncoding
     this._valueEncoding = valueEncoding
@@ -38,7 +38,7 @@ module.exports = class RocksDBIterator extends Readable {
     this._reverse = reverse
     this._limit = limit < 0 ? Infinity : limit
     this._capacity = capacity
-    this._snapshot = snapshot
+    this._snapshot = db._snapshot
 
     this._pendingOpen = null
     this._pendingRead = null
@@ -47,7 +47,7 @@ module.exports = class RocksDBIterator extends Readable {
     this._buffer = null
     this._handle = null
 
-    if (db.opened === true) this.ready()
+    if (this._state.opened === true) this.ready()
   }
 
   _onopen(err) {
@@ -67,8 +67,8 @@ module.exports = class RocksDBIterator extends Readable {
 
     for (let i = 0; i < n; i++) {
       this.push({
-        key: this._decodeKey(b4a.from(keys[i])),
-        value: this._decodeValue(b4a.from(values[i]))
+        key: this._decodeKey(Buffer.from(keys[i])),
+        value: this._decodeValue(Buffer.from(values[i]))
       })
     }
 
@@ -80,7 +80,7 @@ module.exports = class RocksDBIterator extends Readable {
   _onclose(err) {
     const cb = this._pendingDestroy
     this._pendingDestroy = null
-    this._db._decRef()
+    this._state.unref()
     cb(err)
   }
 
@@ -93,7 +93,7 @@ module.exports = class RocksDBIterator extends Readable {
   async ready() {
     if (this._handle !== null) return
 
-    if (this._db.opened === false) await this._db.ready()
+    if (this._state.opened === false) await this._state.ready()
 
     this._init()
   }
@@ -109,8 +109,9 @@ module.exports = class RocksDBIterator extends Readable {
     this._pendingOpen = cb
 
     binding.iteratorOpen(
-      this._db._handle,
+      this._state.handle,
       this._handle,
+      this._columnFamily._handle,
       this._gt,
       this._gte,
       this._lt,
@@ -140,7 +141,7 @@ module.exports = class RocksDBIterator extends Readable {
 
   _encodeKey(k) {
     if (this._keyEncoding) return c.encode(this._keyEncoding, k)
-    if (typeof k === 'string') return b4a.from(k)
+    if (typeof k === 'string') return Buffer.from(k)
     return k
   }
 

package/lib/snapshot.js

@@ -1,21 +1,28 @@
 const binding = require('../binding')
 
 module.exports = class RocksDBSnapshot {
-  constructor(db) {
-    this._db = db
-    this._db._snapshots.add(this)
+  constructor(state) {
+    this._state = state
+    this._state.snapshots.add(this)
 
     this._handle = null
+    this._refs = 1
 
-    if (db.opened === true) this._init()
+    if (state.opened === true) this._init()
   }
 
   _init() {
-    this._handle = binding.snapshotCreate(this._db._handle)
+    this._handle = binding.snapshotCreate(this._state.handle)
   }
 
-  destroy() {
-    this._db._snapshots.delete(this)
+  ref() {
+    this._refs++
+  }
+
+  unref() {
+    if (--this._refs > 0) return
+
+    this._state.snapshots.delete(this)
 
     if (this._handle === null) return
 

package/lib/state.js

@@ -0,0 +1,213 @@
+const ReadyResource = require('ready-resource')
+const RefCounter = require('refcounter')
+const ColumnFamily = require('./column-family')
+const binding = require('../binding')
+
+module.exports = class DBState extends ReadyResource {
+  constructor(db, path, opts) {
+    super()
+
+    const {
+      columnFamily = new ColumnFamily('default', opts),
+      columnFamilies = [],
+      readOnly = false,
+      createIfMissing = true,
+      createMissingColumnFamilies = true,
+      maxBackgroundJobs = 6,
+      bytesPerSync = 1048576
+    } = opts
+
+    this.path = path
+    this.db = db
+    this.refs = new RefCounter()
+    this.sessionRefs = new RefCounter()
+    this.sessions = []
+    this.columnFamilies = [columnFamily]
+    this.snapshots = new Set()
+
+    this._suspending = null
+    this._resuming = null
+    this._columnsFlushed = false
+
+    for (const col of columnFamilies) {
+      this.columnFamilies.push(
+        typeof col === 'string' ? new ColumnFamily(col, opts) : col
+      )
+    }
+
+    this.handle = binding.init(
+      Uint32Array.from([
+        readOnly ? 1 : 0,
+        createIfMissing ? 1 : 0,
+        createMissingColumnFamilies ? 1 : 0,
+        maxBackgroundJobs,
+        bytesPerSync & 0xffffffff,
+        Math.floor(bytesPerSync / 0x100000000)
+      ])
+    )
+  }
+
+  addSession(db) {
+    this.sessionRefs.inc()
+    db._index = this.sessions.push(db) - 1
+  }
+
+  removeSession(db) {
+    this.sessionRefs.dec()
+    const head = this.sessions.pop()
+    if (head !== db) this.sessions[(head._index = db._index)] = head
+  }
+
+  ref() {
+    if (this.closing) throw new Error('Database closed')
+    this.refs.inc()
+  }
+
+  unref() {
+    this.refs.dec()
+  }
+
+  upsertColumnFamily(c) {
+    if (typeof c === 'string') {
+      let col = this.getColumnFamilyByName(c)
+      if (col) return col
+      col = this.columnFamilies[0].cloneSettings(c)
+      this.columnFamilies.push(col)
+      return col
+    }
+
+    if (this.columnFamilies.includes(c)) return c
+    this.columnFamilies.push(c)
+    return c
+  }
+
+  getColumnFamily(c) {
+    if (!c) return this.columnFamilies[0]
+    if (!this._columnsFlushed) return this.upsertColumnFamily(c)
+
+    if (typeof c !== 'string') return c
+
+    const col = this.getColumnFamilyByName(c)
+    if (col === null) throw new Error('Unknown column family')
+    return col
+  }
+
+  getColumnFamilyByName(name) {
+    for (const col of this.columnFamilies) {
+      if (col.name === name) return col
+    }
+    return null
+  }
+
+  async _open() {
+    await Promise.resolve() // allow column families to populate if ondemand
+
+    const req = { resolve: null, reject: null, handle: null }
+
+    const promise = new Promise((resolve, reject) => {
+      req.resolve = resolve
+      req.reject = reject
+    })
+
+    this._columnsFlushed = true
+    req.handle = binding.open(
+      this.handle,
+      this,
+      this.path,
+      this.columnFamilies.map((c) => c._handle),
+      req,
+      onopen
+    )
+
+    await promise
+
+    for (const snapshot of this.snapshots) snapshot._init()
+
+    function onopen(err) {
+      if (err) req.reject(new Error(err))
+      else req.resolve()
+    }
+  }
+
+  async _close() {
+    while (!this.refs.isIdle() || !this.sessionRefs.isIdle()) {
+      await this.refs.idle()
+      await this.sessionRefs.idle()
+    }
+
+    for (const columnFamily of this.columnFamilies) columnFamily.destroy()
+    for (const snapshot of this.snapshots) snapshot.destroy()
+
+    const req = { resolve: null, reject: null, handle: null }
+
+    const promise = new Promise((resolve, reject) => {
+      req.resolve = resolve
+      req.reject = reject
+    })
+
+    req.handle = binding.close(this.handle, req, onclose)
+
+    await promise
+
+    function onclose(err) {
+      if (err) req.reject(new Error(err))
+      else req.resolve()
+    }
+  }
+
+  async suspend() {
+    if (this._suspending === null) this._suspending = this._suspend()
+    return this._suspending
+  }
+
+  async _suspend() {
+    if (this._resuming) await this._resuming
+    if (this.opened === false) await this.ready()
+
+    const req = { resolve: null, reject: null, handle: null }
+
+    const promise = new Promise((resolve, reject) => {
+      req.resolve = resolve
+      req.reject = reject
+    })
+
+    req.handle = binding.suspend(this.handle, req, onsuspend)
+
+    await promise
+
+    this._suspending = null
+
+    function onsuspend(err) {
+      if (err) req.reject(new Error(err))
+      else req.resolve()
+    }
+  }
+
+  resume() {
+    if (this._resuming === null) this._resuming = this._resume()
+    return this._resuming
+  }
+
+  async _resume() {
+    if (this._suspending) await this._suspending
+    if (this.opened === false) await this.ready()
+
+    const req = { resolve: null, reject: null, handle: null }
+
+    const promise = new Promise((resolve, reject) => {
+      req.resolve = resolve
+      req.reject = reject
+    })
+
+    req.handle = binding.resume(this.handle, req, onresume)
+
+    await promise
+
+    this._resuming = null
+
+    function onresume(err) {
+      if (err) req.reject(new Error(err))
+      else req.resolve()
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rocksdb-native",
-  "version": "2.6.8",
+  "version": "3.0.0",
   "description": "librocksdb bindings for JavaScript",
   "exports": {
     ".": "./index.js",
@@ -24,7 +24,7 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/holepunchto/rocksdb-native.git"
+    "url": "git+https://github.com/holepunchto/rocksdb-native.git"
   },
   "author": "Holepunch Inc",
   "license": "Apache-2.0",
@@ -36,9 +36,9 @@
     "bare": ">=1.7.0"
   },
   "dependencies": {
-    "b4a": "^1.6.6",
     "compact-encoding": "^2.15.0",
     "ready-resource": "^1.0.0",
+    "refcounter": "^1.0.0",
     "require-addon": "^1.0.2",
     "streamx": "^2.16.1"
   },