rocksdb-native 3.1.3 → 3.1.5

package/CMakeLists.txt

@@ -7,7 +7,7 @@ find_package(cmake-npm REQUIRED PATHS node_modules/cmake-npm)
 
 project(rocksdb_native C CXX)
 
-fetch_package("github:holepunchto/librocksdb#caeaa2b")
+fetch_package("github:holepunchto/librocksdb#fb2c47a")
 
 add_bare_module(rocksdb_native_bare)
 

package/binding.c

@@ -3,8 +3,8 @@
 #include <js.h>
 #include <rocksdb.h>
 #include <stdlib.h>
-#include <utf.h>
 #include <string.h>
+#include <utf.h>
 
 typedef struct {
   uint32_t low;
@@ -1050,7 +1050,7 @@ rocksdb_native_try_create_external_arraybuffer(js_env_t *env, void *data, size_t
   int err = js_create_external_arraybuffer(env, data, len, rocksdb_native__on_free, NULL, result);
   if (err == 0) return 0;
 
-  void* cpy;
+  void *cpy;
   err = js_create_arraybuffer(env, len, &cpy, result);
   if (err != 0) return err;
 
@@ -1282,8 +1282,13 @@ rocksdb_native__on_read(rocksdb_read_batch_t *handle, int status) {
       } else {
         rocksdb_slice_t *slice = &req->reads[i].value;
 
-        err = rocksdb_native_try_create_external_arraybuffer(env, (void *) slice->data, slice->len, &result);
-        assert(err == 0);
+        if (slice->data == NULL && slice->len == (size_t) -1) {
+          err = js_get_null(env, &result);
+          assert(err == 0);
+        } else {
+          err = rocksdb_native_try_create_external_arraybuffer(env, (void *) slice->data, slice->len, &result);
+          assert(err == 0);
+        }
 
         err = js_set_element(env, values, i, result);
         assert(err == 0);

package/index.js

@@ -80,9 +80,8 @@ class RocksDB {
     if (this._index !== -1) this._state.removeSession(this)
 
     if (force) {
-      for (let i = this._state.sessions.length - 1; i >= 0; i--) {
-        await this._state.sessions[i].close()
-      }
+      while (this._state.sessions.length > 0)
+        await this._state.sessions[this._state.sessions.length - 1].close()
     }
 
     return this.isRoot() ? this._state.close() : Promise.resolve()

package/lib/batch.js

@@ -173,12 +173,11 @@ exports.ReadBatch = class RocksDBReadBatch extends RocksDBBatch {
       const err = errs[i]
 
       if (err) promise.reject(new Error(err))
-      else
+      else {
         promise.resolve(
-          values[i].byteLength === 0
-            ? null
-            : this._decodeValue(Buffer.from(values[i]))
+          values[i] ? this._decodeValue(Buffer.from(values[i])) : null
         )
+      }
     }
 
     this._onfinished()

package/lib/state.js

@@ -150,8 +150,9 @@ module.exports = class DBState extends ReadyResource {
 
   async _close() {
     while (!this.activity.isIdle()) await this.activity.idle()
-    for (let i = this.sessions.length - 1; i >= 0; i--)
-      await this.sessions[i].close()
+
+    while (this.sessions.length > 0)
+      await this.sessions[this.sessions.length - 1].close()
 
     for (const columnFamily of this.columnFamilies) columnFamily.destroy()
 

package/package.json

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