@nxtedition/rocksdb 12.0.10 → 12.0.12

package/binding.cc

@@ -1021,6 +1021,9 @@ NAPI_METHOD(db_get_many_sync) {
   int32_t highWaterMarkBytes = std::numeric_limits<int32_t>::max();
   NAPI_STATUS_THROWS(GetProperty(env, argv[2], "highWaterMarkBytes", highWaterMarkBytes));
 
+  bool unsafe = false;
+  NAPI_STATUS_THROWS(GetProperty(env, argv[2], "unsafe", unsafe));
+
   std::vector<rocksdb::Slice> keys;
   keys.resize(count);
   std::vector<rocksdb::Status> statuses;
@@ -1053,7 +1056,11 @@ NAPI_METHOD(db_get_many_sync) {
       NAPI_STATUS_THROWS(napi_get_null(env, &row));
     } else {
       ROCKS_STATUS_THROWS_NAPI(statuses[n]);
-      NAPI_STATUS_THROWS(Convert(env, &values[n], valueEncoding, row));
+      if (unsafe) {
+        NAPI_STATUS_THROWS(ConvertUnsafe(env, std::move(values[n]), valueEncoding, row));
+      } else {
+        NAPI_STATUS_THROWS(Convert(env, std::move(values[n]), valueEncoding, row));
+      }
     }
     NAPI_STATUS_THROWS(napi_set_element(env, rows, n, row));
   }
@@ -1082,6 +1089,9 @@ NAPI_METHOD(db_get_many) {
   int32_t highWaterMarkBytes = std::numeric_limits<int32_t>::max();
   NAPI_STATUS_THROWS(GetProperty(env, argv[2], "highWaterMarkBytes", highWaterMarkBytes));
 
+  bool unsafe = false;
+  NAPI_STATUS_THROWS(GetProperty(env, argv[2], "unsafe", unsafe));
+
   auto callback = argv[3];
 
   struct State {
@@ -1133,7 +1143,11 @@ NAPI_METHOD(db_get_many) {
             NAPI_STATUS_RETURN(napi_get_null(env, &row));
           } else {
             ROCKS_STATUS_RETURN_NAPI(state.statuses[n]);
-            NAPI_STATUS_RETURN(Convert(env, &state.values[n], valueEncoding, row));
+            if (unsafe) {
+              NAPI_STATUS_RETURN(ConvertUnsafe(env, std::move(state.values[n]), valueEncoding, row));
+            } else {
+              NAPI_STATUS_RETURN(Convert(env, std::move(state.values[n]), valueEncoding, row));
+            }
           }
           NAPI_STATUS_RETURN(napi_set_element(env, argv[1], n, row));
         }

package/binding.gyp

@@ -8,11 +8,11 @@
                 [
                     "OS == 'linux'",
                     {
-                        "cflags": ["-march=znver1"],
                         "include_dirs": [
                             "/usr/lib/x86_64-linux-gnu/include",
                             "/usr/lib/include",
                         ],
+                        "cflags": ["-march=znver1"],
                         "ccflags": ["-flto", '-march=znver1'],
                         "cflags!": ["-fno-exceptions"],
                         "cflags_cc!": ["-fno-exceptions"],

package/deps/rocksdb/rocksdb.gyp

@@ -111,15 +111,8 @@
               "/usr/lib/include",
               # "/usr/local/Cellar/jemalloc/5.3.0/include"
             ],
-            "cflags": [
-              "-msse4.2",
-              "-mpclmul",
-              "-mavx",
-              "-mavx2",
-              "-mbmi",
-              "-mlzcnt"
-            ],
-            "ccflags": ["-flto"],
+            "cflags": ["-march=znver1"],
+            "ccflags": ["-flto", "-march=znver1"],
             "cflags!": ["-fno-exceptions"],
             "cflags_cc!": ["-fno-exceptions"],
             "ldflags": ["-flto", "-fuse-linker-plugin"],

package/package.json

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

package/util.h

@@ -271,16 +271,26 @@ napi_status Convert(napi_env env, T&& s, Encoding encoding, napi_value& result)
   }
 }
 
-// napi_status Convert(napi_env env, rocksdb::PinnableSlice&& s, Encoding encoding, napi_value& result) {
-//   if (encoding == Encoding::Buffer) {
-//     auto s2 = new rocksdb::PinnableSlice(std::move(s));
-//     return napi_create_external_buffer(env, s2->size(), const_cast<char*>(s2->data()), Finalize<rocksdb::PinnableSlice>, s2, &result);
-//   } else if (encoding == Encoding::String) {
-//     return napi_create_string_utf8(env, s.data(), s.size(), &result);
-//   } else {
-//     return napi_invalid_arg;
-//   }
-// }
+napi_status ConvertUnsafe(napi_env env, rocksdb::PinnableSlice&& s, Encoding encoding, napi_value& result) {
+  if (encoding == Encoding::Buffer) {
+    auto s2 = new rocksdb::PinnableSlice(std::move(s));
+    return napi_create_external_buffer(env, s2->size(), const_cast<char*>(s2->data()), Finalize<rocksdb::PinnableSlice>, s2, &result);
+  } else if (encoding == Encoding::String) {
+    return napi_create_string_utf8(env, s.data(), s.size(), &result);
+  } else {
+    return napi_invalid_arg;
+  }
+}
+
+napi_status Convert(napi_env env, rocksdb::PinnableSlice&& s, Encoding encoding, napi_value& result) {
+  if (encoding == Encoding::Buffer) {
+    return napi_create_buffer_copy(env, s.size(), s.data(), nullptr, &result);
+  } else if (encoding == Encoding::String) {
+    return napi_create_string_utf8(env, s.data(), s.size(), &result);
+  } else {
+    return napi_invalid_arg;
+  }
+}
 
 template <typename State, typename T1, typename T2>
 napi_status runAsync(State&& state,