@nxtedition/rocksdb 7.0.41 → 7.0.44

package/binding.cc

@@ -180,6 +180,7 @@ static napi_status ToString(napi_env env, napi_value from, rocksdb::PinnableSlic
       size_t length = 0;
       NAPI_STATUS_RETURN(napi_get_buffer_info(env, from, reinterpret_cast<void**>(&buf), &length));
 
+      // TODO (fix): Should extend life of "from". Or "to" should be a non-pinnable slice.
       to.PinSlice(rocksdb::Slice(buf, length), noop, nullptr, nullptr);
     } else {
       return napi_invalid_arg;
@@ -1387,6 +1388,50 @@ struct GetManyWorker final : public Worker {
   const rocksdb::Snapshot* snapshot_;
 };
 
+typedef std::vector<std::string> Vector;
+
+NAPI_METHOD(vector_init) {
+  auto vector = new Vector();
+
+  napi_value result;
+  NAPI_STATUS_THROWS(napi_create_external(env, vector, Finalize<Vector>, vector, &result));
+}
+
+NAPI_METHOD(vector_push) {
+  NAPI_ARGV(2);
+
+  Vector* vector;
+  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], reinterpret_cast<void**>(&vector)));
+
+  std::string value;
+  NAPI_STATUS_THROWS(ToString(env, argv[1], value));
+
+  vector->push_back(std::move(value));
+}
+
+NAPI_METHOD(db_get_many2) {
+  NAPI_ARGV(4);
+
+  Database* database;
+  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], reinterpret_cast<void**>(&database)));
+
+  Vector* vector;
+  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[1], reinterpret_cast<void**>(&vector)));
+
+  const bool asBuffer = EncodingIsBuffer(env, argv[2], "valueEncoding");
+  const bool fillCache = BooleanProperty(env, argv[2], "fillCache").value_or(true);
+  const bool ignoreRangeDeletions = BooleanProperty(env, argv[2], "ignoreRangeDeletions").value_or(false);
+
+  rocksdb::ColumnFamilyHandle* column;
+  NAPI_STATUS_THROWS(GetColumnFamily(database, env, argv[2], &column));
+
+  auto worker =
+      new GetManyWorker(env, database, column, std::move(*vector), argv[3], asBuffer, fillCache, ignoreRangeDeletions);
+  worker->Queue(env);
+
+  return 0;
+}
+
 NAPI_METHOD(db_get_many) {
   NAPI_ARGV(4);
 
@@ -2051,4 +2096,8 @@ NAPI_INIT() {
   NAPI_EXPORT_FUNCTION(batch_put_log_data);
   NAPI_EXPORT_FUNCTION(batch_merge);
   NAPI_EXPORT_FUNCTION(batch_count);
+
+  NAPI_EXPORT_FUNCTION(vector_init);
+  NAPI_EXPORT_FUNCTION(vector_push);
+  NAPI_EXPORT_FUNCTION(db_get_many2);
 }

package/max_rev_operator.h

@@ -1,30 +1,15 @@
 #pragma once
 
-#include <memory.h>
-
 int compareRev(const rocksdb::Slice& a, const rocksdb::Slice& b) {
-  auto indexA = 0;
+  auto indexA = 0UL;
+  auto indexB = 0UL;
   const auto endA = a.size();
-  auto lenA = endA;
-
-  auto indexB = 0;
   const auto endB = b.size();
-  auto lenB = endB;
-
-  // Skip leading zeroes
-  while (a[indexA] == '0') {
-    ++indexA;
-    --lenA;
-  }
-  while (b[indexB] == '0') {
-    ++indexB;
-    --lenB;
-  }
 
   // Compare the revision number
   auto result = 0;
   const auto end = std::min(endA, endB);
-  while (indexA < end) {
+  while (indexA < end && indexB < end) {
     const auto ac = a[indexA++];
     const auto bc = b[indexB++];
 
@@ -47,7 +32,7 @@ int compareRev(const rocksdb::Slice& a, const rocksdb::Slice& b) {
   }
 
   // Compare the rest
-  while (indexA < end) {
+  while (indexA < end && indexB < end) {
     const auto ac = a[indexA++];
     const auto bc = b[indexB++];
     if (ac != bc) {
@@ -55,11 +40,9 @@ int compareRev(const rocksdb::Slice& a, const rocksdb::Slice& b) {
     }
   }
 
-  return lenA - lenB;
+  return endA - endB;
 }
 
-// Merge operator that picks the maximum operand, Comparison is based on
-// Slice::compare
 class MaxRevOperator : public rocksdb::MergeOperator {
  public:
   bool FullMergeV2(const MergeOperationInput& merge_in,

package/package.json

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