@nxtedition/rocksdb 7.0.35 → 7.0.38

package/binding.cc

@@ -976,7 +976,7 @@ struct UpdatesNextWorker final : public rocksdb::WriteBatch::Handler, public Wor
 
     NAPI_STATUS_RETURN(napi_get_null(env, &argv[0]));
 
-    if (cache_.empty()) {
+    if (count_ == -1) {
       return CallFunction(env, callback, 1, argv);
     }
 
@@ -1068,7 +1068,7 @@ struct UpdatesNextWorker final : public rocksdb::WriteBatch::Handler, public Wor
       return rocksdb::Status::OK();
     }
 
-    cache_.emplace_back("put");
+    cache_.emplace_back("merge");
 
     if (updates_->keys_) {
       cache_.emplace_back(key.ToStringView());
@@ -1103,7 +1103,7 @@ struct UpdatesNextWorker final : public rocksdb::WriteBatch::Handler, public Wor
   bool Continue() override { return true; }
 
  private:
-  size_t count_;
+  int64_t count_ = -1;
   std::vector<std::optional<std::string>> cache_;
   Updates* updates_;
 };
@@ -1900,6 +1900,18 @@ NAPI_METHOD(batch_merge) {
   return 0;
 }
 
+NAPI_METHOD(batch_count) {
+  NAPI_ARGV(2);
+
+  rocksdb::WriteBatch* batch;
+  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[1], reinterpret_cast<void**>(&batch)));
+
+  napi_value result;
+  NAPI_STATUS_THROWS(napi_create_bigint_int64(env, batch->Count(), &result));
+
+  return result;
+}
+
 NAPI_METHOD(db_flush_wal) {
   NAPI_ARGV(2);
 
@@ -2009,4 +2021,5 @@ NAPI_INIT() {
   NAPI_EXPORT_FUNCTION(batch_write);
   NAPI_EXPORT_FUNCTION(batch_put_log_data);
   NAPI_EXPORT_FUNCTION(batch_merge);
+  NAPI_EXPORT_FUNCTION(batch_count);
 }

package/chained-batch.js

@@ -48,6 +48,10 @@ class ChainedBatch extends AbstractChainedBatch {
     // TODO (fix): Check if open...
     binding.batch_merge(this[kDbContext], this[kBatchContext], key, value, options)
   }
+
+  get count () {
+    return binding.batch_count(this[kDbContext], this[kBatchContext])
+  }
 }
 
 exports.ChainedBatch = ChainedBatch

package/package.json

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