rocksdb-native 3.9.2 → 3.10.0

package/CMakeLists.txt

@@ -9,7 +9,7 @@ project(rocksdb_native C CXX)
 
 bare_target(target)
 
-fetch_package("github:holepunchto/librocksdb#3aaa9dc")
+fetch_package("github:holepunchto/librocksdb#1fa9c8c")
 fetch_package("github:holepunchto/libjstl#098664c")
 
 add_bare_module(rocksdb_native_bare)

package/binding.cc

@@ -155,6 +155,21 @@ rocksdb_native__on_free(js_env_t *env, char *data) {
   free(data);
 }
 
+static int
+rocksdb_native__try_create_external_arraybuffer(js_env_t *env, char *data, size_t len, js_arraybuffer_t &result) {
+  int err;
+
+  err = js_create_external_arraybuffer<rocksdb_native__on_free>(env, data, len, result);
+  if (err == 0) return 0;
+
+  err = js_create_arraybuffer(env, data, len, result);
+  assert(err == 0);
+
+  free(data);
+
+  return 0;
+}
+
 static void
 rocksdb_native__on_column_family_teardown(void *data);
 
@@ -207,7 +222,7 @@ rocksdb_native__on_open(rocksdb_open_t *handle, int status) {
 
     rocksdb_column_family_t **handles = handle->handles;
 
-    if (req->handle.error == NULL) {
+    if (req->handle.error == nullptr) {
       std::vector<js_arraybuffer_t> elements;
       err = js_get_array_elements(env, column_families, elements);
       assert(err == 0);
@@ -710,8 +725,8 @@ rocksdb_native_column_family_init(
   assert(err == 0);
 
   column_family->env = env;
-  column_family->db = NULL;
-  column_family->handle = NULL;
+  column_family->db = nullptr;
+  column_family->handle = nullptr;
 
   column_family->descriptor = (rocksdb_column_family_descriptor_t) {
     name,
@@ -747,7 +762,7 @@ rocksdb_native_column_family_destroy(
 ) {
   int err;
 
-  if (column_family->handle == NULL) return;
+  if (column_family->handle == nullptr) return;
 
   err = rocksdb_column_family_destroy(column_family->db, column_family->handle);
   assert(err == 0);
@@ -757,7 +772,7 @@ rocksdb_native_column_family_destroy(
 
   column_family->ctx.reset();
 
-  column_family->handle = NULL;
+  column_family->handle = nullptr;
 }
 
 static js_arraybuffer_t
@@ -1001,16 +1016,6 @@ rocksdb_native_iterator_close(js_env_t *env, js_arraybuffer_span_of_t<rocksdb_na
   req->active = true;
 }
 
-static int
-rocksdb_native_try_create_external_arraybuffer(js_env_t *env, char *data, size_t len, js_arraybuffer_t &result) {
-  int err;
-
-  err = js_create_external_arraybuffer<rocksdb_native__on_free>(env, data, len, result);
-  if (err == 0) return 0;
-
-  return js_create_arraybuffer(env, data, len, result);
-}
-
 static void
 rocksdb_native__on_iterator_read(rocksdb_iterator_t *handle, int status) {
   int err;
@@ -1026,7 +1031,7 @@ rocksdb_native__on_iterator_read(rocksdb_iterator_t *handle, int status) {
   size_t len = req->handle.len;
 
   if (db->exiting) {
-    if (status == 0 && req->handle.error == NULL) {
+    if (status == 0 && req->handle.error == nullptr) {
       for (size_t i = 0; i < len; i++) {
         js_value_t *result;
 
@@ -1070,14 +1075,14 @@ rocksdb_native__on_iterator_read(rocksdb_iterator_t *handle, int status) {
 
         rocksdb_slice_t *key = &req->keys[i];
 
-        err = rocksdb_native_try_create_external_arraybuffer(env, const_cast<char *>(key->data), key->len, result);
+        err = rocksdb_native__try_create_external_arraybuffer(env, const_cast<char *>(key->data), key->len, result);
         assert(err == 0);
 
         keys.push_back(result);
 
         rocksdb_slice_t *value = &req->values[i];
 
-        err = rocksdb_native_try_create_external_arraybuffer(env, const_cast<char *>(value->data), value->len, result);
+        err = rocksdb_native__try_create_external_arraybuffer(env, const_cast<char *>(value->data), value->len, result);
         assert(err == 0);
 
         values.push_back(result);
@@ -1203,11 +1208,11 @@ rocksdb_native__on_read(rocksdb_read_batch_t *handle, int status) {
 
         rocksdb_slice_t *slice = &req->reads[i].value;
 
-        if (slice->data == NULL && slice->len == (size_t) -1) {
-          err = js_get_null(env, (js_value_t **) result);
+        if (slice->data == nullptr && slice->len == size_t(-1)) {
+          err = js_get_null(env, static_cast<js_value_t **>(result));
           assert(err == 0);
         } else {
-          err = rocksdb_native_try_create_external_arraybuffer(env, const_cast<char *>(slice->data), slice->len, result);
+          err = rocksdb_native__try_create_external_arraybuffer(env, const_cast<char *>(slice->data), slice->len, result);
           assert(err == 0);
         }
 
@@ -1487,7 +1492,7 @@ rocksdb_native_write(
     }
   }
 
-  err = rocksdb_write(&db->handle, &req->handle, req->writes, len, NULL, rocksdb_native__on_write);
+  err = rocksdb_write(&db->handle, &req->handle, req->writes, len, nullptr, rocksdb_native__on_write);
 
   if (err < 0) {
     err = js_throw_error(env, uv_err_name(err), uv_strerror(err));
@@ -1567,7 +1572,7 @@ rocksdb_native_flush(
   req->env = env;
   req->handle.data = req;
 
-  err = rocksdb_flush(&db->handle, &req->handle, column_family->handle, NULL, rocksdb_native__on_flush);
+  err = rocksdb_flush(&db->handle, &req->handle, column_family->handle, nullptr, rocksdb_native__on_flush);
 
   if (err < 0) {
     err = js_throw_error(env, uv_err_name(err), uv_strerror(err));

package/lib/batch.js

@@ -214,18 +214,14 @@ exports.ReadBatch = class RocksDBReadBatch extends RocksDBBatch {
     let applied = true
 
     for (let i = 0, n = this._promises.length; i < n; i++) {
-      const promise = this._promises[i]
-      if (promise === null) continue
-
       const err = errs[i]
+      if (err) applied = false
 
-      if (err) {
-        applied = false
+      const promise = this._promises[i]
+      if (promise === null) continue
 
-        promise.reject(new Error(err))
-      } else {
-        promise.resolve(values[i] ? this._decodeValue(Buffer.from(values[i])) : null)
-      }
+      if (err) promise.reject(new Error(err))
+      else promise.resolve(values[i] ? this._decodeValue(Buffer.from(values[i])) : null)
     }
 
     this._onfinished(applied ? null : new Error('Batch was not applied'))
@@ -274,19 +270,14 @@ exports.WriteBatch = class RocksDBWriteBatch extends RocksDBBatch {
   }
 
   _onwrite(err) {
-    let applied = true
+    const applied = !err
 
     for (let i = 0, n = this._promises.length; i < n; i++) {
       const promise = this._promises[i]
       if (promise === null) continue
 
-      if (err) {
-        applied = false
-
-        promise.reject(new Error(err))
-      } else {
-        promise.resolve()
-      }
+      if (err) promise.reject(new Error(err))
+      else promise.resolve()
     }
 
     this._onfinished(applied ? null : new Error('Batch was not applied'))

package/lib/iterator.js

@@ -137,7 +137,8 @@ module.exports = class RocksDBIterator extends Readable {
       )
     } catch (err) {
       this._db._state.io.dec()
-      throw err
+
+      cb(err)
     }
   }
 
@@ -160,7 +161,8 @@ module.exports = class RocksDBIterator extends Readable {
       binding.iteratorRead(this._handle, Math.min(this._capacity, this._limit))
     } catch (err) {
       this._db._state.io.dec()
-      throw err
+
+      cb(err)
     }
   }
 
@@ -169,19 +171,22 @@ module.exports = class RocksDBIterator extends Readable {
 
     this._db._state.io.inc()
 
-    this._pendingDestroy = cb
-
     if (this._opened === false) {
       this._db._state.io.dec()
+      this._db._unref()
 
-      return this._onclose(null)
+      return cb(null)
     }
 
+    this._pendingDestroy = cb
+
     try {
       binding.iteratorClose(this._handle)
     } catch (err) {
       this._db._state.io.dec()
-      throw err
+      this._db._unref()
+
+      cb(err)
     }
   }
 

package/lib/state.js

@@ -27,7 +27,8 @@ module.exports = class RocksDBState extends ReadyResource {
       avoidUnnecessaryBlockingIO = false,
       skipStatsUpdateOnOpen = false,
       useDirectIOForFlushAndCompaction = false,
-      maxFileOpeningThreads = 16
+      maxFileOpeningThreads = 16,
+      preopen = null
     } = opts
 
     this.path = path
@@ -44,6 +45,7 @@ module.exports = class RocksDBState extends ReadyResource {
     this._updating = false
     this._updatingSignal = new SignalPromise()
     this._columnsFlushed = false
+    this._preopen = preopen
     this._readBatches = []
     this._writeBatches = []
 
@@ -83,6 +85,7 @@ module.exports = class RocksDBState extends ReadyResource {
   }
 
   freeBatch(batch, writable) {
+    if (batch._capacity > 16) return
     const queue = writable ? this._writeBatches : this._readBatches
     if (queue.length >= MAX_BATCH_REUSE) return
     queue.push(batch)
@@ -135,6 +138,8 @@ module.exports = class RocksDBState extends ReadyResource {
   async _open() {
     await Promise.resolve() // allow column families to populate if ondemand
 
+    if (this._preopen) await this._preopen
+
     const req = { resolve: null, reject: null, handle: null }
 
     const promise = new Promise((resolve, reject) => {

package/package.json

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