rocksdb-native 3.1.0 → 3.1.2

package/index.js

@@ -18,7 +18,9 @@ class RocksDB {
     this._columnFamily = state.getColumnFamily(columnFamily)
     this._keyEncoding = keyEncoding
     this._valueEncoding = valueEncoding
-    this._index = this._state.addSession(this)
+    this._index = -1
+
+    this._state.addSession(this)
   }
 
   get opened() {
@@ -33,6 +35,10 @@ class RocksDB {
     return this._state.path
   }
 
+  get snapshotted() {
+    return this._snapshot !== null
+  }
+
   get defaultColumnFamily() {
     return this._columnFamily
   }
@@ -43,18 +49,12 @@ class RocksDB {
     keyEncoding = this._keyEncoding,
     valueEncoding = this._valueEncoding
   } = {}) {
-    let snap = null
-
-    if (snapshot) {
-      snap = this._snapshot
-      if (snap === null) snap = new Snapshot(this._state)
-      else snap.ref()
-    }
+    maybeClosed(this)
 
     return new RocksDB(null, {
       state: this._state,
       columnFamily,
-      snapshot: snap,
+      snapshot: snapshot ? this._snapshot || new Snapshot(this._state) : null,
       keyEncoding,
       valueEncoding
     })
@@ -77,11 +77,7 @@ class RocksDB {
   }
 
   async close({ force } = {}) {
-    if (this._index !== -1) {
-      this._state.removeSession(this)
-      this._index = -1
-      if (this._snapshot) this._snapshot.unref()
-    }
+    if (this._index !== -1) this._state.removeSession(this)
 
     if (force) {
       for (let i = this._state.sessions.length - 1; i >= 0; i--) {
@@ -93,22 +89,28 @@ class RocksDB {
   }
 
   suspend() {
+    maybeClosed(this)
+
     return this._state.suspend()
   }
 
   resume() {
+    maybeClosed(this)
+
     return this._state.resume()
   }
 
   isIdle() {
-    return this._state.refs.isIdle()
+    return this._state.activity.isIdle()
   }
 
   idle() {
-    return this._state.refs.idle()
+    return this._state.activity.idle()
   }
 
   iterator(range, opts) {
+    maybeClosed(this)
+
     return new Iterator(this, { ...range, ...opts })
   }
 
@@ -121,10 +123,14 @@ class RocksDB {
   }
 
   read(opts) {
+    maybeClosed(this)
+
     return this._state.createReadBatch(this, opts)
   }
 
   write(opts) {
+    maybeClosed(this)
+
     return this._state.createWriteBatch(this, opts)
   }
 
@@ -152,7 +158,24 @@ class RocksDB {
     batch.tryDeleteRange(start, end)
     await batch.flush()
   }
+
+  // used by iterators/batches to ensure no gc/close when active
+
+  _ref() {
+    if (this._snapshot) this._snapshot.ref()
+    this._state.activity.inc()
+  }
+
+  _unref() {
+    if (this._snapshot) this._snapshot.unref()
+    this._state.activity.dec()
+  }
 }
 
 module.exports = exports = RocksDB
 exports.ColumnFamily = ColumnFamily
+
+function maybeClosed(db) {
+  if (db._state.closing || db._destroyed)
+    throw new Error('RocksDB session is closed')
+}

package/lib/batch.js

@@ -8,7 +8,7 @@ class RocksDBBatch {
   constructor(db, opts = {}) {
     const { capacity = 8, autoDestroy = false } = opts
 
-    db._state.ref()
+    db._ref()
 
     this._db = db
     this._destroyed = false
@@ -31,7 +31,7 @@ class RocksDBBatch {
   _reuse(db, opts = {}) {
     const { autoDestroy = false } = opts
 
-    db._state.ref()
+    db._ref()
 
     this._db = db
     this._destroyed = false
@@ -76,7 +76,7 @@ class RocksDBBatch {
 
     if (this._promises.length) this._abort()
 
-    this._db._state.unref()
+    this._db._unref()
     this._onfree()
   }
 

package/lib/iterator.js

@@ -18,7 +18,7 @@ module.exports = class RocksDBIterator extends Readable {
 
     super()
 
-    db._state.ref()
+    db._ref()
 
     this._db = db
 
@@ -71,7 +71,7 @@ module.exports = class RocksDBIterator extends Readable {
   _onclose(err) {
     const cb = this._pendingDestroy
     this._pendingDestroy = null
-    this._db._state.unref()
+    this._db._unref()
     cb(err)
   }
 

package/lib/snapshot.js

@@ -3,12 +3,11 @@ const binding = require('../binding')
 module.exports = class RocksDBSnapshot {
   constructor(state) {
     this._state = state
-    this._state.snapshots.add(this)
 
     this._handle = null
-    this._refs = 1
+    this._refs = 0 // starts unreffed, easier, must be reffed in first tick
 
-    if (state.opened === true) this._init()
+    if (state.deferSnapshotInit === false) this._init()
   }
 
   _init() {
@@ -22,8 +21,6 @@ module.exports = class RocksDBSnapshot {
   unref() {
     if (--this._refs > 0) return
 
-    this._state.snapshots.delete(this)
-
     if (this._handle === null) return
 
     binding.snapshotDestroy(this._handle)

package/lib/state.js

@@ -22,11 +22,10 @@ module.exports = class DBState extends ReadyResource {
 
     this.path = path
     this.db = db
-    this.refs = new RefCounter()
-    this.sessionRefs = new RefCounter()
+    this.activity = new RefCounter()
     this.sessions = []
     this.columnFamilies = [columnFamily]
-    this.snapshots = new Set()
+    this.deferSnapshotInit = true
 
     this._suspending = null
     this._resuming = null
@@ -73,23 +72,15 @@ module.exports = class DBState extends ReadyResource {
   }
 
   addSession(db) {
-    this.sessionRefs.inc()
-    return this.sessions.push(db) - 1
+    db._index = this.sessions.push(db) - 1
+    if (db._snapshot) db._snapshot.ref()
   }
 
   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()
+    db._index = -1
+    if (db._snapshot) db._snapshot.unref()
   }
 
   upsertColumnFamily(c) {
@@ -146,7 +137,10 @@ module.exports = class DBState extends ReadyResource {
 
     await promise
 
-    for (const snapshot of this.snapshots) snapshot._init()
+    this.deferSnapshotInit = false
+    for (const session of this.sessions) {
+      if (session._snapshot) session._snapshot._init()
+    }
 
     function onopen(err) {
       if (err) req.reject(new Error(err))
@@ -155,13 +149,11 @@ module.exports = class DBState extends ReadyResource {
   }
 
   async _close() {
-    while (!this.refs.isIdle() || !this.sessionRefs.isIdle()) {
-      await this.refs.idle()
-      await this.sessionRefs.idle()
-    }
+    while (!this.activity.isIdle()) await this.activity.idle()
+    for (let i = this.sessions.length - 1; i >= 0; i--)
+      await this.sessions[i].close()
 
     for (const columnFamily of this.columnFamilies) columnFamily.destroy()
-    for (const snapshot of this.snapshots) snapshot.destroy()
 
     const req = { resolve: null, reject: null, handle: null }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rocksdb-native",
-  "version": "3.1.0",
+  "version": "3.1.2",
   "description": "librocksdb bindings for JavaScript",
   "exports": {
     ".": "./index.js",