rocksdb-native 3.5.1 → 3.5.2

package/lib/batch.js

@@ -101,12 +101,6 @@ class RocksDBBatch {
     if (this._request) throw new Error('Request in progress')
     if (this._destroyed) throw new Error('Batch is destroyed')
 
-    const state = this._db._state
-
-    if (state._suspending || state._suspended) {
-      throw new Error('Database is suspended')
-    }
-
     this._request = new Promise((resolve, reject) => {
       this._resolve = resolve
       this._reject = reject
@@ -121,19 +115,22 @@ class RocksDBBatch {
     if (this._request) throw new Error('Request in progress')
     if (this._destroyed) throw new Error('Batch is destroyed')
 
-    const state = this._db._state
-
-    if (state._suspending || state._suspended) {
-      throw new Error('Database is suspended')
-    }
-
     this._request = resolved
 
     this._flush()
   }
 
   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()
+    }
   }
 
   _enqueuePromise(resolve, reject) {
@@ -173,6 +170,7 @@ exports.ReadBatch = class RocksDBReadBatch extends RocksDBBatch {
 
   async _flush() {
     await super._flush()
+    if (this._destroyed) return
 
     binding.read(
       this._db._state._handle,
@@ -240,6 +238,7 @@ exports.WriteBatch = class RocksDBWriteBatch extends RocksDBBatch {
 
   async _flush() {
     await super._flush()
+    if (this._destroyed) return
 
     binding.write(
       this._db._state._handle,

package/lib/state.js

@@ -1,5 +1,6 @@
 const ReadyResource = require('ready-resource')
 const RefCounter = require('refcounter')
+const rrp = require('resolve-reject-promise')
 const { ReadBatch, WriteBatch } = require('./batch')
 const ColumnFamily = require('./column-family')
 const binding = require('../binding')
@@ -29,6 +30,7 @@ module.exports = class RocksDBState extends ReadyResource {
     this.sessions = []
     this.columnFamilies = [columnFamily]
     this.deferSnapshotInit = true
+    this.resumed = null
 
     this._suspended = false
     this._suspending = null
@@ -155,6 +157,7 @@ module.exports = class RocksDBState extends ReadyResource {
   }
 
   async _close() {
+    if (this.resumed) this.resumed.resolve(false)
     while (!this.activity.isIdle()) await this.activity.idle()
 
     while (this.sessions.length > 0)
@@ -215,6 +218,7 @@ module.exports = class RocksDBState extends ReadyResource {
     if (this.opened === false) await this.ready()
 
     while (!this.activeBatches.isIdle()) await this.activeBatches.idle()
+    this.resumed = rrp()
 
     const req = { resolve: null, reject: null, handle: null }
 
@@ -266,6 +270,10 @@ module.exports = class RocksDBState extends ReadyResource {
       this._resuming = null
     }
 
+    const resumed = this.resumed
+    this.resumed = null
+    resumed.resolve(true)
+
     function onresume(err) {
       if (err) req.reject(new Error(err))
       else req.resolve()

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rocksdb-native",
-  "version": "3.5.1",
+  "version": "3.5.2",
   "description": "librocksdb bindings for JavaScript",
   "exports": {
     ".": "./index.js",
@@ -40,6 +40,7 @@
     "ready-resource": "^1.0.0",
     "refcounter": "^1.0.0",
     "require-addon": "^1.0.2",
+    "resolve-reject-promise": "^1.1.0",
     "streamx": "^2.16.1"
   },
   "devDependencies": {