@nxtedition/rocksdb 10.2.2 → 10.3.0

package/binding.cc

@@ -985,7 +985,7 @@ NAPI_METHOD(db_get_many) {
 
   struct State {
     std::vector<uint8_t> data;
-    std::vector<std::optional<size_t>> sizes;
+    std::vector<int32_t> sizes;
   };
 
   runAsync<State>(
@@ -1018,14 +1018,14 @@ NAPI_METHOD(db_get_many) {
 
         auto push = [&](rocksdb::Slice* slice){
           if (slice) {
-            state.sizes.push_back(slice->size());
+            state.sizes.push_back(static_cast<int32_t>(slice->size()));
             std::copy_n(slice->data(), slice->size(), std::back_inserter(state.data));
 
             if (state.data.size() & 0x7) {
               state.data.resize((state.data.size() | 0x7) + 1);
             }
           } else {
-            state.sizes.push_back(std::nullopt);
+            state.sizes.push_back(-1);
           }
         };
 
@@ -1038,20 +1038,12 @@ NAPI_METHOD(db_get_many) {
       [=](auto& state, auto env, auto& argv) {
         argv.resize(3);
 
-        const auto count = state.sizes.size();
-
-        NAPI_STATUS_RETURN(napi_create_array_with_length(env, count, &argv[1]));
-
-        for (uint32_t idx = 0; idx < count; idx++) {
-          const auto& maybeSize = state.sizes[idx];
-
-          napi_value element;
-          if (maybeSize) {
-            NAPI_STATUS_RETURN(napi_create_uint32(env, *maybeSize, &element));
-          } else {
-            NAPI_STATUS_RETURN(napi_get_undefined(env, &element));
-          }
-          NAPI_STATUS_RETURN(napi_set_element(env, argv[1], idx, element));
+        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]));
         }
 
         if (state.data.size() > 0) {
@@ -1304,7 +1296,7 @@ NAPI_METHOD(iterator_nextv) {
 
   struct State {
     std::vector<uint8_t> data;
-    std::vector<std::optional<size_t>> sizes;
+    std::vector<int32_t> sizes;
     bool finished = false;
   };
 
@@ -1322,7 +1314,7 @@ NAPI_METHOD(iterator_nextv) {
 
         auto push = [&](const std::optional<rocksdb::Slice>& slice){
           if (slice) {
-            state.sizes.push_back(slice->size());
+            state.sizes.push_back(static_cast<int32_t>(slice->size()));
             std::copy_n(slice->data(), slice->size(), std::back_inserter(state.data));
 
             if (state.data.size() & 0x7) {
@@ -1331,11 +1323,10 @@ NAPI_METHOD(iterator_nextv) {
 
             bytesRead += slice->size();
           } else {
-            state.sizes.push_back(std::nullopt);
+            state.sizes.push_back(-1);
           }
         };
 
-        auto status = rocksdb::Status::OK();
         while (true) {
           if (!iterator->first_) {
             iterator->Next();
@@ -1344,9 +1335,8 @@ NAPI_METHOD(iterator_nextv) {
           }
 
           if (!iterator->Valid() || !iterator->Increment()) {
-            status = iterator->Status();
             state.finished = true;
-            break;
+            return iterator->Status();
           }
 
           if (iterator->keys_ && iterator->values_) {
@@ -1361,31 +1351,20 @@ NAPI_METHOD(iterator_nextv) {
           }
 
           if (bytesRead > iterator->highWaterMarkBytes_ || state.sizes.size() / 2 >= count) {
-            status = rocksdb::Status::OK();
             state.finished = false;
-            break;
+            return rocksdb::Status::OK();
           }
         }
-
-        return status;
       },
       [=](auto& state, auto env, auto& argv) {
         argv.resize(4);
 
-        const auto count = state.sizes.size();
-
-        NAPI_STATUS_RETURN(napi_create_array_with_length(env, count, &argv[1]));
-
-        for (uint32_t idx = 0; idx < count; idx++) {
-          const auto& maybeSize = state.sizes[idx];
-
-          napi_value element;
-          if (maybeSize) {
-            NAPI_STATUS_RETURN(napi_create_uint32(env, *maybeSize, &element));
-          } else {
-            NAPI_STATUS_RETURN(napi_get_undefined(env, &element));
-          }
-          NAPI_STATUS_RETURN(napi_set_element(env, argv[1], idx, element));
+        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]));
         }
 
         if (state.data.size() > 0) {

package/index.js

@@ -41,6 +41,12 @@ class RocksLevel extends AbstractLevel {
     this[kPendingClose] = null
   }
 
+  static async create(...args) {
+    const db = new this(...args)
+    await db.open()
+    return db
+  }
+
   get sequence () {
     return binding.db_get_latest_sequence(this[kContext])
   }
@@ -152,23 +158,28 @@ class RocksLevel extends AbstractLevel {
     const { valueEncoding } = options ?? EMPTY
     try {
       this[kRef]()
-      binding.db_get_many(this[kContext], keys, options ?? EMPTY, (err, sizes, buffer) => {
+      binding.db_get_many(this[kContext], keys, options ?? EMPTY, (err, sizes, data) => {
         if (err) {
           callback(err)
         } else {
-          buffer ??= Buffer.alloc(0)
-          const val = []
+          data ??= Buffer.alloc(0)
+          sizes ??= Buffer.alloc(0)
+
+          const rows = []
           let offset = 0
-          for (const size of sizes) {
-            if (size == null) {
-              val.push(undefined)
+          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 (!valueEncoding || valueEncoding === 'buffer') {
-                val.push(buffer.subarray(offset, offset + size))
-              } else if (valueEncoding === 'slice') {
-                val.push({ buffer, byteOffset: offset, byteLength: size })
+              if (!encoding || encoding === 'buffer') {
+                rows.push(data.subarray(offset, offset + size))
+              } else if (encoding === 'slice') {
+                rows.push({ buffer: data, byteOffset: offset, byteLength: size })
               } else {
-                val.push(buffer.toString(valueEncoding, offset, offset + size))
+                rows.push(data.toString(encoding, offset, offset + size))
               }
               offset += size
               if (offset & 0x7) {
@@ -176,7 +187,7 @@ class RocksLevel extends AbstractLevel {
               }
             }
           }
-          callback(null, val)
+          callback(null, rows)
         }
         this[kUnref]()
       })

package/package.json

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

package/util.js

@@ -1,19 +1,21 @@
 'use strict'
 
 function handleNextv (err, sizes, buffer, finished, options, callback) {
+  const { keyEncoding, valueEncoding } = options ?? {}
+
   if (err) {
     callback(err)
   } else {
     buffer ??= Buffer.alloc(0)
-
-    const { keyEncoding, valueEncoding } = options ?? {}
+    sizes ??= Buffer.alloc(0)
 
     const rows = []
     let offset = 0
-    for (let n = 0; n < sizes.length; n++) {
-      const size = sizes[n]
+    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 = n & 1 ? valueEncoding : keyEncoding
-      if (size == null) {
+      if (size < 0) {
         rows.push(undefined)
       } else {
         if (!encoding || encoding === 'buffer') {