@nxtedition/rocksdb 10.3.7 → 10.3.8

package/binding.cc

@@ -1579,6 +1579,8 @@ NAPI_METHOD(batch_write_sync) {
   writeOptions.sync = sync;
   writeOptions.low_pri = lowPriority;
   ROCKS_STATUS_THROWS_NAPI(database->db->Write(writeOptions, batch));
+
+  return 0;
 }
 
 NAPI_METHOD(batch_count) {

package/chained-batch.js

@@ -59,18 +59,16 @@ class ChainedBatch extends AbstractChainedBatch {
   _write (options, callback) {
     callback = fromCallback(callback, kPromise)
 
-    try {
-      binding.batch_write_sync(this[kDbContext], this[kBatchContext], options)
-      process.nextTick(callback)
-    } catch (err) {
-      process.nextTick(callback, err)
-    }
+    // NOTE: `this` needs to be referenced until callback is called
+    this[kWrite](this, this[kBatchContext], options ?? EMPTY, (err) => {
+      callback(err, null, this)
+    })
 
     return callback[kPromise]
   }
 
   _writeSync (options) {
-    binding.batch_write_sync(this[kDbContext], this[kBatchContext], options)
+    binding.batch_write_sync(this[kDbContext], this[kBatchContext], options ?? EMPTY)
   }
 
   _close (callback) {

package/package.json

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

package/util.h

@@ -263,22 +263,22 @@ static napi_status GetProperty(napi_env env,
   return GetValue(env, value, result);
 }
 
-template <typename T>
-napi_status Convert(napi_env env, rocksdb::PinnableSlice* s, Encoding encoding, napi_value& result) {
-  if (!s || !s->IsPinned()) {
-    return napi_get_null(env, &result);
-  } else if (encoding == Encoding::Buffer) {
-    // NOTE: napi_create_external_buffer is slow with finalizer...
-    // auto ptr = new rocksdb::PinnableSlice(std::move(*s));
-    // return napi_create_external_buffer(env, ptr->size(), const_cast<char*>(ptr->data()),
-    //                                    Finalize<rocksdb::PinnableSlice>, ptr, &result);
-    return napi_create_buffer_copy(env, s->size(), s->data(), nullptr, &result);
-  } else if (encoding == Encoding::String) {
-    return napi_create_string_utf8(env, s->data(), s->size(), &result);
-  } else {
-    return napi_invalid_arg;
-  }
-}
+// NOTE: napi_create_external_buffer is slow with finalizer...
+// template <typename T>
+// napi_status Convert(napi_env env, rocksdb::PinnableSlice* s, Encoding encoding, napi_value& result) {
+//   if (!s || !s->IsPinned()) {
+//     return napi_get_null(env, &result);
+//   } else if (encoding == Encoding::Buffer) {
+//     auto ptr = new rocksdb::PinnableSlice(std::move(*s));
+//     return napi_create_external_buffer(env, ptr->size(), const_cast<char*>(ptr->data()),
+//                                        Finalize<rocksdb::PinnableSlice>, ptr, &result);
+//     return napi_create_buffer_copy(env, s->size(), s->data(), nullptr, &result);
+//   } else if (encoding == Encoding::String) {
+//     return napi_create_string_utf8(env, s->data(), s->size(), &result);
+//   } else {
+//     return napi_invalid_arg;
+//   }
+// }
 
 template <typename T>
 napi_status Convert(napi_env env, T&& s, Encoding encoding, napi_value& result) {