@nxtedition/rocksdb 7.0.18 → 7.0.21

package/binding.cc

@@ -14,7 +14,6 @@
 #include <rocksdb/slice_transform.h>
 #include <rocksdb/table.h>
 #include <rocksdb/write_batch.h>
-#include <rocksdb/filter_policy.h>
 
 #include <array>
 #include <memory>
@@ -539,12 +538,7 @@ struct Iterator final : public BaseIterator {
 };
 
 struct Updates {
-  Updates(Database* database, bool values, bool keyAsBuffer, bool valueAsBuffer, int64_t seqNumber)
-      : database_(database),
-        values_(values),
-        keyAsBuffer_(keyAsBuffer),
-        valueAsBuffer_(valueAsBuffer),
-        seqNumber_(seqNumber) {}
+  Updates(Database* database, int64_t seqNumber) : database_(database), seqNumber_(seqNumber) {}
 
   void Close() { iterator_.reset(); }
 
@@ -561,9 +555,6 @@ struct Updates {
   }
 
   Database* database_;
-  const bool values_;
-  const bool keyAsBuffer_;
-  const bool valueAsBuffer_;
   int64_t seqNumber_;
   std::unique_ptr<rocksdb::TransactionLogIterator> iterator_;
 
@@ -950,40 +941,49 @@ struct UpdatesNextWorker final : public rocksdb::WriteBatch::Handler, public Wor
 
     updates_->seqNumber_ = batch.sequence;
 
-    cache_.reserve(batch.writeBatchPtr->Count() * 2);
+    cache_.reserve(batch.writeBatchPtr->Count() * 4);
 
     return batch.writeBatchPtr->Iterate(this);
   }
 
   napi_status OnOk(napi_env env, napi_value callback) override {
-    napi_value argv[4];
+    napi_value argv[3];
     NAPI_STATUS_RETURN(napi_get_null(env, &argv[0]));
 
     if (cache_.empty()) {
       return CallFunction(env, callback, 1, argv);
     }
 
-    NAPI_STATUS_RETURN(napi_create_array_with_length(env, cache_.size(), &argv[1]));
-    for (size_t idx = 0; idx < cache_.size(); idx += 2) {
+    NAPI_STATUS_RETURN(napi_create_array_with_length(env, cache_.size() * 4, &argv[1]));
+    for (size_t idx = 0; idx < cache_.size(); idx++) {
+      napi_value op;
+      NAPI_STATUS_RETURN(Convert(env, std::get<0>(cache_[idx]), false, op));
+      NAPI_STATUS_RETURN(napi_set_element(env, argv[1], static_cast<int>(idx * 4 + 0), op));
+
       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, std::get<1>(cache_[idx]), false, key));
+      NAPI_STATUS_RETURN(napi_set_element(env, argv[1], static_cast<int>(idx * 4 + 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, std::get<2>(cache_[idx]), false, val));
+      NAPI_STATUS_RETURN(napi_set_element(env, argv[1], static_cast<int>(idx * 4 + 2), val));
+
+      auto column_family_id = std::get<3>(cache_[idx]);
+      auto columns = database_->columns_;
+      auto columnIt = std::find_if(columns.begin(), columns.end(),
+                                   [&](const auto& handle) { return handle->GetID() == column_family_id; });
+      napi_value column;
+      if (columnIt != columns.end()) {
+        NAPI_STATUS_RETURN(napi_create_external(env, *columnIt, nullptr, nullptr, &column));
+      } else {
+        NAPI_STATUS_RETURN(napi_get_null(env, &column));
+      }
+      NAPI_STATUS_RETURN(napi_set_element(env, argv[1], static_cast<int>(idx * 4 + 3), column));
     }
 
     NAPI_STATUS_RETURN(napi_create_bigint_int64(env, updates_->seqNumber_, &argv[2]));
 
-    NAPI_STATUS_RETURN(napi_create_array_with_length(env, logData_.size(), &argv[3]));
-    for (size_t idx = 0; idx < logData_.size(); idx += 1) {
-      napi_value logData;
-      NAPI_STATUS_RETURN(Convert(env, logData_[idx], false, logData));
-      NAPI_STATUS_RETURN(napi_set_element(env, argv[3], static_cast<int>(idx), logData));
-    }
-
-    return CallFunction(env, callback, 4, argv);
+    return CallFunction(env, callback, 3, argv);
   }
 
   void Destroy(napi_env env) override {
@@ -991,29 +991,28 @@ struct UpdatesNextWorker final : public rocksdb::WriteBatch::Handler, public Wor
     Worker::Destroy(env);
   }
 
-  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);
-    }
+  rocksdb::Status PutCF(uint32_t column_family_id, const rocksdb::Slice& key, const rocksdb::Slice& value) override {
+    cache_.emplace_back("put", key.ToStringView(), value.ToStringView(), column_family_id);
+    return rocksdb::Status::OK();
   }
 
-  void Delete(const rocksdb::Slice& key) override {
-    cache_.emplace_back(key.ToString());
-    cache_.emplace_back(std::nullopt);
+  rocksdb::Status DeleteCF(uint32_t column_family_id, const rocksdb::Slice& key) override {
+    cache_.emplace_back("del", key.ToStringView(), std::nullopt, column_family_id);
+    return rocksdb::Status::OK();
   }
 
-  void LogData(const rocksdb::Slice& logData) override {
-    logData_.emplace_back(logData.ToString());
+  rocksdb::Status MergeCF(uint32_t column_family_id, const rocksdb::Slice& key, const rocksdb::Slice& value) override {
+    cache_.emplace_back("merge", key.ToStringView(), value.ToStringView(), column_family_id);
+    return rocksdb::Status::OK();
   }
 
+  void LogData(const rocksdb::Slice& data) override { cache_.emplace_back("data", std::nullopt, data.ToStringView()); }
+
   bool Continue() override { return true; }
 
  private:
-  std::vector<std::optional<std::string>> cache_;
-  std::vector<std::optional<std::string>> logData_;
+  std::vector<std::tuple<std::optional<std::string>, std::optional<std::string>, std::optional<std::string>, uint32_t>>
+      cache_;
   Updates* updates_;
 };
 
@@ -1023,12 +1022,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));
@@ -1637,6 +1633,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());
     }
@@ -1748,6 +1760,29 @@ NAPI_METHOD(batch_put_log_data) {
   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);
@@ -1777,4 +1812,5 @@ NAPI_INIT() {
   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

@@ -43,6 +43,11 @@ class ChainedBatch extends AbstractChainedBatch {
     // 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, data) => {
+        this.promise = new Promise(resolve => binding.updates_next(this.context, (err, rows, sequence) => {
           this.promise = null
           if (err) {
             resolve(Promise.reject(err))
           } else {
-            resolve({ rows, data, sequence: Number(sequence) })
+            resolve({ rows, sequence: Number(sequence) })
           }
         }))
 

package/package.json

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