@nxtedition/rocksdb 10.3.3 → 10.3.4

package/binding.cc

@@ -965,9 +965,6 @@ NAPI_METHOD(db_get_many) {
   rocksdb::ColumnFamilyHandle* column = database->db->DefaultColumnFamily();
   NAPI_STATUS_THROWS(GetProperty(env, options, "column", column));
 
-  Encoding valueEncoding = Encoding::Buffer;
-  NAPI_STATUS_THROWS(GetProperty(env, options, "valueEncoding", valueEncoding));
-
   bool takeSnapshot = true;
   NAPI_STATUS_THROWS(GetProperty(env, options, "snapshot", takeSnapshot));
 
@@ -1041,43 +1038,20 @@ NAPI_METHOD(db_get_many) {
       [=](auto& state, auto env, auto& argv) {
         argv.resize(3);
 
-        if (valueEncoding == Encoding::String) {
-          napi_value arr;
-          NAPI_STATUS_RETURN(napi_create_array_with_length(env, state.sizes.size(), &argv[1]));
-
-          const auto ptr = reinterpret_cast<char*>(state.data.data());
-          auto offset = 0;
-          for (auto n = 0; n < state.sizes.size(); n++) {
-            napi_value str;
-            const auto size = state.sizes[n];
-            if (size >= 0) {
-              NAPI_STATUS_RETURN(napi_create_string_utf8(env, ptr + offset, static_cast<size_t>(size), &str));
-              offset += size;
-              if (offset & 0x7) {
-                offset = (offset | 0x7) + 1;
-              }
-            } else {
-              NAPI_STATUS_RETURN(napi_get_undefined(env, &str));
-            }
-            NAPI_STATUS_RETURN(napi_set_element(env, argv[1], n, str));
-          }
-          NAPI_STATUS_RETURN(napi_get_undefined(env, &argv[2]));
+        if (state.sizes.size() > 0) {
+          auto sizes = std::make_unique<std::vector<int32_t>>(std::move(state.sizes));
+          NAPI_STATUS_RETURN(napi_create_external_buffer(env, sizes->size() * 4, sizes->data(), Finalize<std::vector<int32_t>>, sizes.get(), &argv[1]));
+          sizes.release();
         } else {
-          if (state.sizes.size() > 0) {
-            auto sizes = std::make_unique<std::vector<int32_t>>(std::move(state.sizes));
-            NAPI_STATUS_RETURN(napi_create_external_buffer(env, sizes->size() * 4, sizes->data(), Finalize<std::vector<int32_t>>, sizes.get(), &argv[1]));
-            sizes.release();
-          } else {
-            NAPI_STATUS_RETURN(napi_get_undefined(env, &argv[1]));
-          }
+          NAPI_STATUS_RETURN(napi_get_undefined(env, &argv[1]));
+        }
 
-          if (state.data.size() > 0) {
-            auto data = std::make_unique<std::vector<uint8_t>>(std::move(state.data));
-            NAPI_STATUS_RETURN(napi_create_external_buffer(env, data->size(), data->data(), Finalize<std::vector<uint8_t>>, data.get(), &argv[2]));
-            data.release();
-          } else {
-            NAPI_STATUS_RETURN(napi_get_undefined(env, &argv[2]));
-          };
+        if (state.data.size() > 0) {
+          auto data = std::make_unique<std::vector<uint8_t>>(std::move(state.data));
+          NAPI_STATUS_RETURN(napi_create_external_buffer(env, data->size(), data->data(), Finalize<std::vector<uint8_t>>, data.get(), &argv[2]));
+          data.release();
+        } else {
+          NAPI_STATUS_RETURN(napi_get_undefined(env, &argv[2]));
         }
 
         return napi_ok;

package/index.js

@@ -9,7 +9,7 @@ const { Iterator } = require('./iterator')
 const fs = require('node:fs')
 const assert = require('node:assert')
 const { handleNextv } = require('./util')
-const FastBuffer = Buffer[Symbol.species]
+
 const kContext = Symbol('context')
 const kColumns = Symbol('columns')
 const kPromise = Symbol('promise')
@@ -158,41 +158,36 @@ class RocksLevel extends AbstractLevel {
     const { valueEncoding } = options ?? EMPTY
     try {
       this[kRef]()
-
-      function bufferHandler (sizes, buffer) {
-        buffer ??= Buffer.alloc(0)
-        sizes ??= Buffer.alloc(0)
-
-        let offset = 0
-        const rows = []
-        const sizes32 = new Int32Array(sizes.buffer, sizes.byteOffset, sizes.byteLength / 4)
-        for (let n = 0; n < sizes32.length; n++) {
-          const size = sizes32[n]
-          const encoding = valueEncoding
-          if (size < 0) {
-            rows.push(undefined)
-          } else {
-            if (encoding === 'slice') {
-              rows.push({ buffer, byteOffset: offset, byteLength: size })
-            } else {
-              rows.push(new FastBuffer(buffer.buffer, offset, size))
-            }
-            offset += size
-            if (offset & 0x7) {
-              offset = (offset | 0x7) + 1
-            }
-          }
-        }
-        callback(null, rows)
-      }
-
-      binding.db_get_many(this[kContext], keys, options ?? EMPTY, (err, arg1, arg2) => {
+      binding.db_get_many(this[kContext], keys, options ?? EMPTY, (err, sizes, data) => {
         if (err) {
           callback(err)
-        } else if (valueEncoding === 'utf8') {
-          callback(null, arg1)
         } else {
-          bufferHandler(arg1, arg2)
+          data ??= Buffer.alloc(0)
+          sizes ??= Buffer.alloc(0)
+
+          const rows = []
+          let offset = 0
+          const sizes32 = new Int32Array(sizes.buffer, sizes.byteOffset, sizes.byteLength / 4)
+          for (let n = 0; n < sizes32.length; n++) {
+            const size = sizes32[n]
+            const encoding = valueEncoding
+            if (size < 0) {
+              rows.push(undefined)
+            } else {
+              if (!encoding || encoding === 'buffer') {
+                rows.push(data.subarray(offset, offset + size))
+              } else if (encoding === 'slice') {
+                rows.push({ buffer: data, byteOffset: offset, byteLength: size })
+              } else {
+                rows.push(data.toString(encoding, offset, offset + size))
+              }
+              offset += size
+              if (offset & 0x7) {
+                offset = (offset | 0x7) + 1
+              }
+            }
+          }
+          callback(null, rows)
         }
         this[kUnref]()
       })

package/package.json

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