@nxtedition/rocksdb 7.0.17 → 7.0.20

package/binding.cc

@@ -539,11 +539,8 @@ struct Iterator final : public BaseIterator {
 };
 
 struct Updates {
-  Updates(Database* database, bool values, bool keyAsBuffer, bool valueAsBuffer, int64_t seqNumber)
+  Updates(Database* database, int64_t seqNumber)
       : database_(database),
-        values_(values),
-        keyAsBuffer_(keyAsBuffer),
-        valueAsBuffer_(valueAsBuffer),
         seqNumber_(seqNumber) {}
 
   void Close() { iterator_.reset(); }
@@ -561,9 +558,6 @@ struct Updates {
   }
 
   Database* database_;
-  const bool values_;
-  const bool keyAsBuffer_;
-  const bool valueAsBuffer_;
   int64_t seqNumber_;
   std::unique_ptr<rocksdb::TransactionLogIterator> iterator_;
 
@@ -964,15 +958,18 @@ struct UpdatesNextWorker final : public rocksdb::WriteBatch::Handler, public Wor
     }
 
     NAPI_STATUS_RETURN(napi_create_array_with_length(env, cache_.size(), &argv[1]));
+    for (size_t idx = 0; idx < cache_.size(); idx += 3) {
+      napi_value op;
+      NAPI_STATUS_RETURN(Convert(env, cache_[idx + 0], false, op));
+      NAPI_STATUS_RETURN(napi_set_element(env, argv[1], static_cast<int>(idx + 0), op));
 
-    for (size_t idx = 0; idx < cache_.size(); idx += 2) {
       napi_value key;
-      NAPI_STATUS_RETURN(Convert(env, cache_[idx + 0], updates_->keyAsBuffer_, key));
-      NAPI_STATUS_RETURN(napi_set_element(env, argv[1], static_cast<int>(idx + 0), key));
+      NAPI_STATUS_RETURN(Convert(env, cache_[idx + 1], false, key));
+      NAPI_STATUS_RETURN(napi_set_element(env, argv[1], static_cast<int>(idx + 1), key));
 
       napi_value val;
-      NAPI_STATUS_RETURN(Convert(env, cache_[idx + 1], updates_->valueAsBuffer_, val));
-      NAPI_STATUS_RETURN(napi_set_element(env, argv[1], static_cast<int>(idx + 1), val));
+      NAPI_STATUS_RETURN(Convert(env, cache_[idx + 2], false, val));
+      NAPI_STATUS_RETURN(napi_set_element(env, argv[1], static_cast<int>(idx + 2), val));
     }
 
     NAPI_STATUS_RETURN(napi_create_bigint_int64(env, updates_->seqNumber_, &argv[2]));
@@ -986,19 +983,29 @@ struct UpdatesNextWorker final : public rocksdb::WriteBatch::Handler, public Wor
   }
 
   void Put(const rocksdb::Slice& key, const rocksdb::Slice& value) override {
-    cache_.emplace_back(key.ToString());
-    if (updates_->values_) {
-      cache_.emplace_back(value.ToString());
-    } else {
-      cache_.emplace_back(std::nullopt);
-    }
+    cache_.emplace_back("put");
+    cache_.emplace_back(key.ToStringView());
+    cache_.emplace_back(value.ToStringView());
   }
 
   void Delete(const rocksdb::Slice& key) override {
-    cache_.emplace_back(key.ToString());
+    cache_.emplace_back("del");
+    cache_.emplace_back(key.ToStringView());
     cache_.emplace_back(std::nullopt);
   }
 
+  void Merge(const rocksdb::Slice& key, const rocksdb::Slice& value) override {
+    cache_.emplace_back("merge");
+    cache_.emplace_back(key.ToStringView());
+    cache_.emplace_back(value.ToStringView());
+  }
+
+  void LogData(const rocksdb::Slice& data) override {
+    cache_.emplace_back("data");
+    cache_.emplace_back(std::nullopt);
+    cache_.emplace_back(data.ToStringView());
+  }
+
   bool Continue() override { return true; }
 
  private:
@@ -1012,12 +1019,9 @@ NAPI_METHOD(updates_init) {
   Database* database;
   NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], reinterpret_cast<void**>(&database)));
 
-  const auto values = BooleanProperty(env, argv[1], "values").value_or(true);
-  const bool keyAsBuffer = EncodingIsBuffer(env, argv[1], "keyEncoding");
-  const bool valueAsBuffer = EncodingIsBuffer(env, argv[1], "valueEncoding");
   const auto seqNumber = Int64Property(env, argv[1], "since").value_or(database->db_->GetLatestSequenceNumber());
 
-  auto updates = std::make_unique<Updates>(database, values, keyAsBuffer, valueAsBuffer, seqNumber);
+  auto updates = std::make_unique<Updates>(database, seqNumber);
 
   napi_value result;
   NAPI_STATUS_THROWS(napi_create_external(env, updates.get(), Finalize<Updates>, updates.get(), &result));
@@ -1626,6 +1630,22 @@ NAPI_METHOD(batch_do) {
       NAPI_STATUS_THROWS(ToString(env, valueProperty, value));
 
       ROCKS_STATUS_THROWS(batch.Put(column, key, value));
+    } else if (type == "data") {
+      napi_value valueProperty;
+      NAPI_STATUS_THROWS(napi_get_named_property(env, element, "value", &valueProperty));
+      NAPI_STATUS_THROWS(ToString(env, valueProperty, value));
+
+      ROCKS_STATUS_THROWS(batch.PutLogData(value));
+    } else if (type == "merge") {
+      napi_value keyProperty;
+      NAPI_STATUS_THROWS(napi_get_named_property(env, element, "key", &keyProperty));
+      NAPI_STATUS_THROWS(ToString(env, keyProperty, key));
+
+      napi_value valueProperty;
+      NAPI_STATUS_THROWS(napi_get_named_property(env, element, "value", &valueProperty));
+      NAPI_STATUS_THROWS(ToString(env, valueProperty, value));
+
+      ROCKS_STATUS_THROWS(batch.Merge(column, key, value));
     } else {
       ROCKS_STATUS_THROWS(rocksdb::Status::InvalidArgument());
     }
@@ -1720,6 +1740,46 @@ NAPI_METHOD(batch_write) {
   return 0;
 }
 
+NAPI_METHOD(batch_put_log_data) {
+  NAPI_ARGV(4);
+
+  Database* database;
+  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], reinterpret_cast<void**>(&database)));
+
+  rocksdb::WriteBatch* batch;
+  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[1], reinterpret_cast<void**>(&batch)));
+
+  std::string logData;
+  NAPI_STATUS_THROWS(ToString(env, argv[2], logData));
+
+  ROCKS_STATUS_THROWS(batch->PutLogData(logData));
+
+  return 0;
+}
+
+NAPI_METHOD(batch_merge) {
+  NAPI_ARGV(5);
+
+  Database* database;
+  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], reinterpret_cast<void**>(&database)));
+
+  rocksdb::WriteBatch* batch;
+  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[1], (void**)(&batch)));
+
+  std::string key;
+  NAPI_STATUS_THROWS(ToString(env, argv[2], key));
+
+  std::string val;
+  NAPI_STATUS_THROWS(ToString(env, argv[3], val));
+
+  rocksdb::ColumnFamilyHandle* column;
+  NAPI_STATUS_THROWS(GetColumnFamily(database, env, argv[4], &column));
+
+  ROCKS_STATUS_THROWS(batch->Merge(column, key, val));
+
+  return 0;
+}
+
 NAPI_INIT() {
   NAPI_EXPORT_FUNCTION(db_init);
   NAPI_EXPORT_FUNCTION(db_open);
@@ -1748,4 +1808,6 @@ NAPI_INIT() {
   NAPI_EXPORT_FUNCTION(batch_del);
   NAPI_EXPORT_FUNCTION(batch_clear);
   NAPI_EXPORT_FUNCTION(batch_write);
+  NAPI_EXPORT_FUNCTION(batch_put_log_data);
+  NAPI_EXPORT_FUNCTION(batch_merge);
 }

package/chained-batch.js

@@ -38,6 +38,16 @@ class ChainedBatch extends AbstractChainedBatch {
   _close (callback) {
     process.nextTick(callback)
   }
+
+  putLogData (data, options) {
+    // TODO (fix): Check if open...
+    binding.batch_put_log_data(this[kDbContext], this[kBatchContext], data, options)
+  }
+
+  merge (key, value, options) {
+    // TODO (fix): Check if open...
+    binding.batch_merge(this[kDbContext], this[kBatchContext], key, value, options)
+  }
 }
 
 exports.ChainedBatch = ChainedBatch

package/index.js

@@ -208,12 +208,12 @@ class RocksLevel extends AbstractLevel {
           return {}
         }
 
-        this.promise = new Promise(resolve => binding.updates_next(this.context, (err, rows, sequence) => {
+        this.promise = new Promise(resolve => binding.updates_next(this.context, (err, rows, sequence, data) => {
           this.promise = null
           if (err) {
             resolve(Promise.reject(err))
           } else {
-            resolve({ rows, sequence })
+            resolve({ rows, data, sequence: Number(sequence) })
           }
         }))
 
@@ -251,11 +251,11 @@ class RocksLevel extends AbstractLevel {
     const updates = new Updates(this, options)
     try {
       while (true) {
-        const { sequence, rows } = await updates.next()
-        if (!rows) {
+        const entry = await updates.next()
+        if (!entry.rows) {
           return
         }
-        yield { sequence: Number(sequence), rows }
+        yield entry
       }
     } finally {
       await updates.close()

package/package.json

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