rocksdb-native 3.5.4 → 3.5.6

package/CMakeLists.txt

@@ -13,7 +13,7 @@ if(target MATCHES "win32")
   add_compile_options(/MT$<$<CONFIG:Debug>:d>)
 endif()
 
-fetch_package("github:holepunchto/librocksdb#d2b6760")
+fetch_package("github:holepunchto/librocksdb#4a8e385")
 
 add_bare_module(rocksdb_native_bare)
 

package/binding.c

@@ -85,7 +85,6 @@ typedef struct {
   rocksdb_read_batch_t handle;
 
   rocksdb_read_t *reads;
-  char **errors;
 
   size_t capacity;
 
@@ -98,7 +97,6 @@ typedef struct {
   rocksdb_write_batch_t handle;
 
   rocksdb_write_t *writes;
-  char **errors;
 
   size_t capacity;
 
@@ -141,6 +139,10 @@ rocksdb_native__on_open(rocksdb_open_t *handle, int status) {
 
   js_env_t *env = req->env;
 
+  const rocksdb_column_family_descriptor_t *descriptors = handle->column_families;
+
+  rocksdb_column_family_t **handles = handle->handles;
+
   if (db->exiting) {
     err = js_delete_reference(env, req->on_open);
     assert(err == 0);
@@ -192,10 +194,8 @@ rocksdb_native__on_open(rocksdb_open_t *handle, int status) {
 
       js_value_t **elements = malloc(len * sizeof(js_value_t *));
 
-      uint32_t fetched;
-      err = js_get_array_elements(env, column_families, elements, len, 0, &fetched);
+      err = js_get_array_elements(env, column_families, elements, len, 0, NULL);
       assert(err == 0);
-      assert(fetched == len);
 
       for (uint32_t i = 0; i < len; i++) {
         js_value_t *handle = elements[i];
@@ -222,9 +222,9 @@ rocksdb_native__on_open(rocksdb_open_t *handle, int status) {
     assert(err == 0);
   }
 
-  free((void *) handle->column_families);
+  free((void *) descriptors);
 
-  free(handle->handles);
+  free(handles);
 }
 
 static void
@@ -397,10 +397,8 @@ rocksdb_native_open(js_env_t *env, js_callback_info_t *info) {
 
   js_value_t **elements = malloc(len * sizeof(js_value_t *));
 
-  uint32_t fetched;
-  err = js_get_array_elements(env, argv[3], elements, len, 0, &fetched);
+  err = js_get_array_elements(env, argv[3], elements, len, 0, NULL);
   assert(err == 0);
-  assert(fetched == len);
 
   for (uint32_t i = 0; i < len; i++) {
     js_value_t *handle = elements[i];
@@ -1268,19 +1266,12 @@ rocksdb_native_read_buffer(js_env_t *env, js_callback_info_t *info) {
 
   js_value_t *handle;
 
-  uint8_t *data;
-  err = js_create_arraybuffer(env, capacity * sizeof(rocksdb_read_t) + capacity * sizeof(char *), (void **) &data, &handle);
+  rocksdb_read_t *reads;
+  err = js_create_arraybuffer(env, capacity * sizeof(rocksdb_read_t), (void **) &reads, &handle);
   assert(err == 0);
 
   req->capacity = capacity;
-
-  size_t offset = 0;
-
-  req->reads = (rocksdb_read_t *) &data[offset];
-
-  offset += capacity * sizeof(rocksdb_read_t);
-
-  req->errors = (char **) &data[offset];
+  req->reads = reads;
 
   return handle;
 }
@@ -1304,7 +1295,7 @@ rocksdb_native__on_read(rocksdb_read_batch_t *handle, int status) {
       for (size_t i = 0; i < len; i++) {
         js_value_t *result;
 
-        char *error = req->errors[i];
+        char *error = req->handle.errors[i];
 
         if (error) continue;
 
@@ -1333,7 +1324,7 @@ rocksdb_native__on_read(rocksdb_read_batch_t *handle, int status) {
     for (size_t i = 0; i < len; i++) {
       js_value_t *result;
 
-      char *error = req->errors[i];
+      char *error = req->handle.errors[i];
 
       if (error) {
         err = js_create_string_utf8(env, (utf8_t *) error, -1, &result);
@@ -1410,10 +1401,8 @@ rocksdb_native_read(js_env_t *env, js_callback_info_t *info) {
 
   js_value_t **elements = malloc(len * sizeof(js_value_t *));
 
-  uint32_t fetched;
-  err = js_get_array_elements(env, argv[2], elements, len, 0, &fetched);
+  err = js_get_array_elements(env, argv[2], elements, len, 0, NULL);
   assert(err == 0);
-  assert(fetched == len);
 
   for (uint32_t i = 0; i < len; i++) {
     js_value_t *read = elements[i];
@@ -1467,7 +1456,7 @@ rocksdb_native_read(js_env_t *env, js_callback_info_t *info) {
     assert(err == 0);
   }
 
-  err = rocksdb_read(&db->handle, &req->handle, req->reads, req->errors, len, &options, rocksdb_native__on_read);
+  err = rocksdb_read(&db->handle, &req->handle, req->reads, len, &options, rocksdb_native__on_read);
   assert(err == 0);
 
   return NULL;
@@ -1511,19 +1500,12 @@ rocksdb_native_write_buffer(js_env_t *env, js_callback_info_t *info) {
 
   js_value_t *handle;
 
-  uint8_t *data;
-  err = js_create_arraybuffer(env, capacity * sizeof(rocksdb_write_t) + capacity * sizeof(char *), (void **) &data, &handle);
+  rocksdb_write_t *writes;
+  err = js_create_arraybuffer(env, capacity * sizeof(rocksdb_write_t), (void **) &writes, &handle);
   assert(err == 0);
 
   req->capacity = capacity;
-
-  size_t offset = 0;
-
-  req->writes = (rocksdb_write_t *) &data[offset];
-
-  offset += capacity * sizeof(rocksdb_write_t);
-
-  req->errors = (char **) &data[offset];
+  req->writes = writes;
 
   return handle;
 }
@@ -1614,10 +1596,8 @@ rocksdb_native_write(js_env_t *env, js_callback_info_t *info) {
 
   js_value_t **elements = malloc(len * sizeof(js_value_t *));
 
-  uint32_t fetched;
-  err = js_get_array_elements(env, argv[2], elements, len, 0, &fetched);
+  err = js_get_array_elements(env, argv[2], elements, len, 0, NULL);
   assert(err == 0);
-  assert(fetched == len);
 
   for (uint32_t i = 0; i < len; i++) {
     js_value_t *write = elements[i];
@@ -1794,7 +1774,7 @@ rocksdb_native_flush(js_env_t *env, js_callback_info_t *info) {
   err = rocksdb_flush(&db->handle, &req->handle, column_family->handle, NULL, rocksdb_native__on_flush);
   assert(err == 0);
 
-  return NULL;
+  return handle;
 }
 
 static js_value_t *

package/lib/batch.js

@@ -96,6 +96,8 @@ class RocksDBBatch {
       const promise = this._promises[i]
       if (promise !== null) promise.reject(new Error('Batch is destroyed'))
     }
+
+    this._onfinished(new Error('Batch is destroyed'))
   }
 
   async flush() {
@@ -129,11 +131,14 @@ class RocksDBBatch {
     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()
+      if (!resumed) {
+        if (this._destroyed) {
+          this._db._state.io.dec()
+        } else {
+          this._destroyed = true
+          this._abort()
+          this._db._unref()
+        }
       }
     }
   }

package/lib/iterator.js

@@ -75,6 +75,7 @@ module.exports = class RocksDBIterator extends Readable {
   _onclose(err) {
     const cb = this._pendingDestroy
     this._pendingDestroy = null
+    this._db._state.io.dec()
     this._db._unref()
     cb(err)
   }
@@ -115,43 +116,70 @@ module.exports = class RocksDBIterator extends Readable {
 
     this._pendingOpen = cb
 
-    binding.iteratorOpen(
-      this._db._state._handle,
-      this._handle,
-      this._db._columnFamily._handle,
-      this._gt,
-      this._gte,
-      this._lt,
-      this._lte,
-      this._reverse,
-      this._db._snapshot ? this._db._snapshot._handle : null,
-      this,
-      this._onopen,
-      this._onclose,
-      this._onread
-    )
+    try {
+      binding.iteratorOpen(
+        this._db._state._handle,
+        this._handle,
+        this._db._columnFamily._handle,
+        this._gt,
+        this._gte,
+        this._lt,
+        this._lte,
+        this._reverse,
+        this._db._snapshot ? this._db._snapshot._handle : null,
+        this,
+        this._onopen,
+        this._onclose,
+        this._onread
+      )
+    } catch (err) {
+      this._db._state.io.dec()
+      throw err
+    }
   }
 
   async _read(cb) {
+    this._db._state.io.inc()
+
     if (this._db._state.resumed !== null) {
-      await this._db._state.resumed.promise
+      const resumed = await this._db._state.resumed.promise
+
+      if (!resumed) {
+        this._db._state.io.dec()
+
+        return cb(new Error('RocksDB session is closed'))
+      }
     }
 
     this._pendingRead = cb
 
-    binding.iteratorRead(this._handle, Math.min(this._capacity, this._limit))
-
-    this._db._state.io.inc()
+    try {
+      binding.iteratorRead(this._handle, Math.min(this._capacity, this._limit))
+    } catch (err) {
+      this._db._state.io.dec()
+      throw err
+    }
   }
 
   async _destroy(cb) {
     await this.ready()
 
+    this._db._state.io.inc()
+
     this._pendingDestroy = cb
 
-    if (this._opened === false) return this._onclose(null)
+    if (this._opened === false) {
+      this._db._state.io.dec()
+
+      return this._onclose(null)
+    }
 
-    binding.iteratorClose(this._handle)
+    try {
+      binding.iteratorClose(this._handle)
+    } catch (err) {
+      this._db._state.io.dec()
+      throw err
+    }
   }
 
   _encodeKey(k) {

package/lib/state.js

@@ -160,6 +160,7 @@ module.exports = class RocksDBState extends ReadyResource {
   async _close() {
     if (this.resumed) this.resumed.resolve(false)
 
+    while (!this.io.isIdle()) await this.io.idle()
     while (!this.handles.isIdle()) await this.handles.idle()
 
     while (this.sessions.length > 0) {
@@ -188,14 +189,12 @@ 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')
@@ -219,7 +218,6 @@ module.exports = class RocksDBState extends ReadyResource {
 
       await promise
     } finally {
-      this.handles.dec()
       this.io.dec()
     }
 
@@ -241,6 +239,7 @@ module.exports = class RocksDBState extends ReadyResource {
 
     while (!this.io.isIdle()) await this.io.idle()
 
+    this.io.inc()
     this.resumed = rrp()
 
     const req = { resolve: null, reject: null, handle: null }
@@ -257,6 +256,8 @@ module.exports = class RocksDBState extends ReadyResource {
 
       this._suspended = true
     } finally {
+      this.io.dec()
+
       this._suspending = null
     }
 
@@ -276,6 +277,8 @@ module.exports = class RocksDBState extends ReadyResource {
     if (this._suspending !== null) await this._suspending
     if (this._suspended === false) return
 
+    this.io.inc()
+
     const req = { resolve: null, reject: null, handle: null }
 
     const promise = new Promise((resolve, reject) => {
@@ -290,6 +293,8 @@ module.exports = class RocksDBState extends ReadyResource {
 
       this._suspended = false
     } finally {
+      this.io.dec()
+
       this._resuming = null
     }
 

package/package.json

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