rocksdb-native 3.5.2 → 3.5.3

package/index.js

@@ -101,11 +101,11 @@ class RocksDB {
   }
 
   isIdle() {
-    return this._state.activity.isIdle()
+    return this._state.handles.isIdle()
   }
 
   idle() {
-    return this._state.activity.idle()
+    return this._state.handles.idle()
   }
 
   iterator(range, opts) {
@@ -165,26 +165,14 @@ class RocksDB {
     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()
-  }
-
-  _refBatch() {
-    this._ref()
-    this._state.activeBatches.inc()
+    this._state.handles.inc()
   }
 
   _unref() {
     if (this._snapshot) this._snapshot.unref()
-    this._state.activity.dec()
-  }
-
-  _unrefBatch() {
-    this._unref()
-    this._state.activeBatches.dec()
+    this._state.handles.dec()
   }
 }
 

package/lib/batch.js

@@ -8,7 +8,7 @@ class RocksDBBatch {
   constructor(db, opts = {}) {
     const { capacity = 8, autoDestroy = false } = opts
 
-    db._refBatch()
+    db._ref()
 
     this._db = db
     this._destroyed = false
@@ -32,7 +32,7 @@ class RocksDBBatch {
   _reuse(db, opts = {}) {
     const { autoDestroy = false } = opts
 
-    db._refBatch()
+    db._ref()
 
     this._db = db
     this._destroyed = false
@@ -48,6 +48,7 @@ class RocksDBBatch {
     this._request = null
     this._resolve = null
     this._reject = null
+    this._db._state.io.dec()
 
     if (this._autoDestroy === true) this.destroy()
 
@@ -81,7 +82,7 @@ class RocksDBBatch {
 
     if (this._promises.length) this._abort()
 
-    this._db._unrefBatch()
+    this._db._unref()
     this._onfree()
   }
 
@@ -121,15 +122,19 @@ class RocksDBBatch {
   }
 
   async _flush() {
-    const state = this._db._state
-
     if (this._handle === null) await this.ready()
-    if (state.resumed !== null) await state.resumed.promise
 
-    if ((state._suspending || state._suspended) && !this._destroyed) {
-      this._destroyed = true
-      this._abort()
-      this._db._unrefBatch()
+    this._db._state.io.inc()
+
+    if (this._db._state.resumed !== null) {
+      const resumed = await this._db._state.resumed.promise
+
+      if (!resumed && !this._destroyed) {
+        this._destroyed = true
+        this._abort()
+        this._db._state.io.dec()
+        this._db._unref()
+      }
     }
   }
 
@@ -170,16 +175,22 @@ exports.ReadBatch = class RocksDBReadBatch extends RocksDBBatch {
 
   async _flush() {
     await super._flush()
+
     if (this._destroyed) return
 
-    binding.read(
-      this._db._state._handle,
-      this._handle,
-      this._operations,
-      this._db._snapshot ? this._db._snapshot._handle : null,
-      this,
-      this._onread
-    )
+    try {
+      binding.read(
+        this._db._state._handle,
+        this._handle,
+        this._operations,
+        this._db._snapshot ? this._db._snapshot._handle : null,
+        this,
+        this._onread
+      )
+    } catch (err) {
+      this._db._state.io.dec()
+      throw err
+    }
   }
 
   _onread(errs, values) {
@@ -238,15 +249,21 @@ exports.WriteBatch = class RocksDBWriteBatch extends RocksDBBatch {
 
   async _flush() {
     await super._flush()
+
     if (this._destroyed) return
 
-    binding.write(
-      this._db._state._handle,
-      this._handle,
-      this._operations,
-      this,
-      this._onwrite
-    )
+    try {
+      binding.write(
+        this._db._state._handle,
+        this._handle,
+        this._operations,
+        this,
+        this._onwrite
+      )
+    } catch (err) {
+      this._db._state.io.dec()
+      throw err
+    }
   }
 
   _onwrite(err) {

package/lib/iterator.js

@@ -30,6 +30,7 @@ module.exports = class RocksDBIterator extends Readable {
     this._reverse = reverse
     this._limit = limit < 0 ? Infinity : limit
     this._capacity = capacity
+    this._opened = false
 
     this._pendingOpen = null
     this._pendingRead = null
@@ -44,12 +45,15 @@ module.exports = class RocksDBIterator extends Readable {
   _onopen(err) {
     const cb = this._pendingOpen
     this._pendingOpen = null
+    this._opened = true
+    this._db._state.io.dec()
     cb(err)
   }
 
   _onread(err, keys, values) {
     const cb = this._pendingRead
     this._pendingRead = null
+    this._db._state.io.dec()
     if (err) return cb(err)
 
     const n = keys.length
@@ -97,10 +101,8 @@ module.exports = class RocksDBIterator extends Readable {
   async _open(cb) {
     await this.ready()
 
-    const state = this._db._state
-
-    if (state._suspending || state._suspended) {
-      return cb(new Error('Database is suspended'))
+    if (this._db._state.resumed !== null) {
+      await this._db._state.resumed.promise
     }
 
     this._pendingOpen = cb
@@ -120,18 +122,20 @@ module.exports = class RocksDBIterator extends Readable {
       this._onclose,
       this._onread
     )
-  }
 
-  _read(cb) {
-    const state = this._db._state
+    this._db._state.io.inc()
+  }
 
-    if (state._suspending || state._suspended) {
-      return cb(new Error('Database is suspended'))
+  async _read(cb) {
+    if (this._db._state.resumed !== null) {
+      await this._db._state.resumed.promise
     }
 
     this._pendingRead = cb
 
     binding.iteratorRead(this._handle, Math.min(this._capacity, this._limit))
+
+    this._db._state.io.inc()
   }
 
   async _destroy(cb) {
@@ -139,6 +143,8 @@ module.exports = class RocksDBIterator extends Readable {
 
     this._pendingDestroy = cb
 
+    if (this._opened === false) return this._onclose(null)
+
     binding.iteratorClose(this._handle)
   }
 

package/lib/snapshot.js

@@ -5,7 +5,7 @@ module.exports = class RocksDBSnapshot {
     this._state = state
 
     this._handle = null
-    this._refs = 0 // starts unreffed, easier, must be reffed in first tick
+    this._refs = 0
 
     if (state.deferSnapshotInit === false) this._init()
   }

package/lib/state.js

@@ -25,8 +25,8 @@ module.exports = class RocksDBState extends ReadyResource {
 
     this.path = path
     this.db = db
-    this.activity = new RefCounter()
-    this.activeBatches = new RefCounter()
+    this.handles = new RefCounter()
+    this.io = new RefCounter()
     this.sessions = []
     this.columnFamilies = [columnFamily]
     this.deferSnapshotInit = true
@@ -146,6 +146,7 @@ module.exports = class RocksDBState extends ReadyResource {
     await promise
 
     this.deferSnapshotInit = false
+
     for (const session of this.sessions) {
       if (session._snapshot) session._snapshot._init()
     }
@@ -157,11 +158,17 @@ module.exports = class RocksDBState extends ReadyResource {
   }
 
   async _close() {
-    if (this.resumed) this.resumed.resolve(false)
-    while (!this.activity.isIdle()) await this.activity.idle()
+    if (this.resumed) {
+      const resumed = this.resumed
+      this.resumed = null
+      resumed.resolve(false)
+    }
 
-    while (this.sessions.length > 0)
+    while (!this.handles.isIdle()) await this.handles.idle()
+
+    while (this.sessions.length > 0) {
       await this.sessions[this.sessions.length - 1].close()
+    }
 
     for (const columnFamily of this.columnFamilies) columnFamily.destroy()
 
@@ -185,6 +192,20 @@ module.exports = class RocksDBState extends ReadyResource {
   async flush(db, opts) {
     if (this.opened === false) await this.ready()
 
+    this.handles.inc()
+    this.io.inc()
+
+    if (this.resumed !== null) {
+      const resumed = await this.resumed.promise
+
+      if (!resumed) {
+        this.handles.dec()
+        this.io.dec()
+
+        throw new Error('RocksDB session is closed')
+      }
+    }
+
     const req = { resolve: null, reject: null, handle: null }
 
     const promise = new Promise((resolve, reject) => {
@@ -192,14 +213,19 @@ module.exports = class RocksDBState extends ReadyResource {
       req.reject = reject
     })
 
-    req.handle = binding.flush(
-      this._handle,
-      db._columnFamily._handle,
-      req,
-      onflush
-    )
+    try {
+      req.handle = binding.flush(
+        this._handle,
+        db._columnFamily._handle,
+        req,
+        onflush
+      )
 
-    await promise
+      await promise
+    } finally {
+      this.handles.dec()
+      this.io.dec()
+    }
 
     function onflush(err) {
       if (err) req.reject(new Error(err))
@@ -208,16 +234,17 @@ module.exports = class RocksDBState extends ReadyResource {
   }
 
   async suspend() {
-    if (this._suspended === true) return
     if (this._suspending === null) this._suspending = this._suspend()
     return this._suspending
   }
 
   async _suspend() {
-    if (this._resuming !== null) await this._resuming
     if (this.opened === false) await this.ready()
+    if (this._resuming !== null) await this._resuming
+    if (this._suspended === true) return
+
+    while (!this.io.isIdle()) await this.io.idle()
 
-    while (!this.activeBatches.isIdle()) await this.activeBatches.idle()
     this.resumed = rrp()
 
     const req = { resolve: null, reject: null, handle: null }
@@ -227,9 +254,9 @@ module.exports = class RocksDBState extends ReadyResource {
       req.reject = reject
     })
 
-    req.handle = binding.suspend(this._handle, req, onsuspend)
-
     try {
+      req.handle = binding.suspend(this._handle, req, onsuspend)
+
       await promise
 
       this._suspended = true
@@ -244,14 +271,14 @@ module.exports = class RocksDBState extends ReadyResource {
   }
 
   resume() {
-    if (this._suspended === false) return
     if (this._resuming === null) this._resuming = this._resume()
     return this._resuming
   }
 
   async _resume() {
-    if (this._suspending !== null) await this._suspending
     if (this.opened === false) await this.ready()
+    if (this._suspending !== null) await this._suspending
+    if (this._suspended === false) return
 
     const req = { resolve: null, reject: null, handle: null }
 
@@ -260,9 +287,9 @@ module.exports = class RocksDBState extends ReadyResource {
       req.reject = reject
     })
 
-    req.handle = binding.resume(this._handle, req, onresume)
-
     try {
+      req.handle = binding.resume(this._handle, req, onresume)
+
       await promise
 
       this._suspended = false

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rocksdb-native",
-  "version": "3.5.2",
+  "version": "3.5.3",
   "description": "librocksdb bindings for JavaScript",
   "exports": {
     ".": "./index.js",
@@ -50,7 +50,6 @@
     "cmake-fetch": "^1.0.1",
     "cmake-napi": "^1.0.6",
     "prettier": "^3.4.1",
-    "prettier-config-standard": "^7.0.0",
-    "test-tmp": "^1.2.0"
+    "prettier-config-standard": "^7.0.0"
   }
 }