@nxtedition/rocksdb 12.0.3 → 12.0.5

package/chained-batch.js

@@ -83,14 +83,18 @@ class ChainedBatch extends AbstractChainedBatch {
   }
 
   _close (callback) {
-    assert(this[kBatchContext])
-
-    binding.batch_clear(this[kBatchContext])
-    this[kBatchContext] = null
+    this._closeSync()
 
     process.nextTick(callback)
   }
 
+  _closeSync () {
+    if (this[kBatchContext]) {
+      binding.batch_clear(this[kBatchContext])
+      this[kBatchContext] = null
+    }
+  }
+
   get length () {
     assert(this[kBatchContext])
 

package/index.js

@@ -152,10 +152,6 @@ class RocksLevel extends AbstractLevel {
   }
 
   _getMany (keys, options, callback) {
-    if (keys.some(key => typeof key === 'string')) {
-      keys = keys.map(key => typeof key === 'string' ? Buffer.from(key) : key)
-    }
-
     callback = fromCallback(callback, kPromise)
 
     try {

package/iterator.js

@@ -114,8 +114,6 @@ class Iterator extends AbstractIterator {
   }
 
   _close (callback) {
-    assert(this[kContext])
-
     try {
       this._closeSync()
       process.nextTick(callback)
@@ -125,11 +123,12 @@ class Iterator extends AbstractIterator {
   }
 
   _closeSync () {
-    assert(this[kContext])
-
     this[kCache] = kEmpty
-    binding.iterator_close(this[kContext])
-    this[kContext] = null
+
+    if (this[kContext]) {
+      binding.iterator_close(this[kContext])
+      this[kContext] = null
+    }
   }
 
   _end (callback) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nxtedition/rocksdb",
-  "version": "12.0.3",
+  "version": "12.0.5",
   "description": "A low-level Node.js RocksDB binding",
   "license": "MIT",
   "main": "index.js",

package/util.h

@@ -133,10 +133,6 @@ static napi_status GetString(napi_env env, napi_value from, std::string& to) {
   return napi_ok;
 }
 
-void CleanupString(void* env, void* ref) {
-  napi_delete_reference(static_cast<napi_env>(env), static_cast<napi_ref>(ref));
-}
-
 static napi_status GetString(napi_env env, napi_value from, rocksdb::PinnableSlice& to) {
   napi_valuetype type;
   NAPI_STATUS_RETURN(napi_typeof(env, from, &type));
@@ -156,8 +152,7 @@ static napi_status GetString(napi_env env, napi_value from, rocksdb::PinnableSli
       size_t length = 0;
       napi_ref ref;
       NAPI_STATUS_RETURN(napi_get_buffer_info(env, from, reinterpret_cast<void**>(&buf), &length));
-      NAPI_STATUS_RETURN(napi_create_reference(env, from, 1, &ref));
-      to.PinSlice(rocksdb::Slice{buf,length}, CleanupString, env, ref);
+      to.PinSelf(rocksdb::Slice{buf,length});
     } else {
       return napi_invalid_arg;
     }