@nxtedition/rocksdb 8.0.5 → 8.1.1

package/binding.cc

@@ -636,6 +636,70 @@ napi_status InitOptions(napi_env env, T& columnOptions, const U& options) {
   return napi_ok;
 }
 
+NAPI_METHOD(db_get_merge_operands) {
+  NAPI_ARGV(4);
+
+  Database* database;
+  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], reinterpret_cast<void**>(&database)));
+
+	std::string key;
+	NAPI_STATUS_THROWS(GetValue(env, argv[1], key));
+
+  const auto options = argv[2];
+
+  Encoding valueEncoding = Encoding::String;
+  NAPI_STATUS_THROWS(GetProperty(env, options, "valueEncoding", valueEncoding));
+
+  rocksdb::ColumnFamilyHandle* column = database->db->DefaultColumnFamily();
+  NAPI_STATUS_THROWS(GetProperty(env, options, "column", column));
+
+  auto callback = argv[3];
+
+  runAsync<std::vector<rocksdb::PinnableSlice>>(
+      "leveldown.get.mergeOperands", env, callback,
+      [=, key = std::move(key)](auto& values) {
+        rocksdb::ReadOptions readOptions;
+
+				values.resize(16); // TODO (fix): Make option
+
+				rocksdb::GetMergeOperandsOptions mergeOperandsOptions;
+				mergeOperandsOptions.expected_max_number_of_operands = values.size();
+
+  			int size = 0;
+				const auto status = database->db->GetMergeOperands(
+					readOptions,
+					column,
+					key,
+					values.data(),
+					&mergeOperandsOptions,
+					&size
+				);
+
+				values.resize(size);
+
+        return status;
+      },
+      [=](auto& values, auto env, auto& argv) {
+        argv.resize(2);
+
+        NAPI_STATUS_RETURN(napi_create_array_with_length(env, values.size(), &argv[1]));
+
+        for (size_t idx = 0; idx < values.size(); idx++) {
+          napi_value element;
+          if (values[idx].GetSelf()) {
+            NAPI_STATUS_RETURN(Convert(env, &values[idx], valueEncoding, element));
+          } else {
+            NAPI_STATUS_RETURN(napi_get_undefined(env, &element));
+          }
+          NAPI_STATUS_RETURN(napi_set_element(env, argv[1], static_cast<uint32_t>(idx), element));
+        }
+
+        return napi_ok;
+      });
+
+  return 0;
+}
+
 NAPI_METHOD(db_get_identity) {
   NAPI_ARGV(1);
 
@@ -1581,6 +1645,7 @@ NAPI_INIT() {
   NAPI_EXPORT_FUNCTION(db_get_latest_sequence);
   NAPI_EXPORT_FUNCTION(db_get_sorted_wal_files);
   NAPI_EXPORT_FUNCTION(db_flush_wal);
+  NAPI_EXPORT_FUNCTION(db_get_merge_operands);
 
   NAPI_EXPORT_FUNCTION(iterator_init);
   NAPI_EXPORT_FUNCTION(iterator_seek);

package/index.js

@@ -168,6 +168,23 @@ class RocksLevel extends AbstractLevel {
     return callback[kPromise]
   }
 
+	_getMergeOperands(key, options, callback) {
+    callback = fromCallback(callback, kPromise)
+
+    try {
+      this[kRef]()
+      binding.db_get_merge_operands(this[kContext], key, options ?? EMPTY, (err, val) => {
+        callback(err, val)
+        this[kUnref]()
+      })
+    } catch (err) {
+      process.nextTick(callback, err)
+      this[kUnref]()
+    }
+
+    return callback[kPromise]
+	}
+
   _del (key, options, callback) {
     callback = fromCallback(callback, kPromise)
 

package/max_rev_operator.h

@@ -1,13 +1,14 @@
 #pragma once
 
+#include <cstddef>
 #include <rocksdb/slice.h>
 #include <rocksdb/merge_operator.h>
 
 int compareRev(const rocksdb::Slice& a, const rocksdb::Slice& b) {
-  auto indexA = 0UL;
-  auto indexB = 0UL;
-  const auto endA = a.size();
-  const auto endB = b.size();
+  std::size_t indexA = 0;
+  std::size_t indexB = 0;
+  const std::size_t endA = a[indexA++];
+  const std::size_t endB = b[indexB++];
 
   // Compare the revision number
   auto result = 0;
@@ -97,4 +98,4 @@ class MaxRevOperator : public rocksdb::MergeOperator {
   static const char* kNickName() { return "maxRev"; }
   const char* Name() const override { return kClassName(); }
   const char* NickName() const override { return kNickName(); }
-};
+};

package/package.json

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