@nxtedition/rocksdb 7.0.64 → 7.0.65

package/binding.cc

@@ -519,7 +519,7 @@ template <typename T, typename U>
 napi_status InitOptions(napi_env env, T& columnOptions, const U& options) {
   rocksdb::ConfigOptions configOptions;
 
-  size_t memtable_memory_budget = 256 * 1024 * 1024;
+  uint64_t memtable_memory_budget = 256 * 1024 * 1024;
   NAPI_STATUS_RETURN(GetProperty(env, options, "memtableMemoryBudget", memtable_memory_budget));
 
   std::optional<std::string> compactionOpt;
@@ -555,7 +555,7 @@ napi_status InitOptions(napi_env env, T& columnOptions, const U& options) {
 
       // only compress levels >= 2
       columnOptions.compression_per_level.resize(columnOptions.num_levels);
-      for (int i = 0; i < columnOptions.compression_per_level.size(); ++i) {
+      for (int i = 0; i < columnOptions.num_levels; ++i) {
         if (i < 2) {
           columnOptions.compression_per_level[i] = rocksdb::kNoCompression;
         } else {
@@ -1107,7 +1107,7 @@ NAPI_METHOD(db_get_property) {
   Database* database;
   NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], reinterpret_cast<void**>(&database)));
 
-  rocksdb::PinnableSlice property;
+  NapiSlice property;
   NAPI_STATUS_THROWS(GetValue(env, argv[1], property));
 
   std::string value;
@@ -1203,7 +1203,7 @@ NAPI_METHOD(iterator_seek) {
   Iterator* iterator;
   NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], reinterpret_cast<void**>(&iterator)));
 
-  rocksdb::PinnableSlice target;
+  NapiSlice target;
   NAPI_STATUS_THROWS(GetValue(env, argv[1], target));
 
   iterator->first_ = true;
@@ -1338,14 +1338,10 @@ NAPI_METHOD(batch_do) {
   uint32_t length;
   NAPI_STATUS_THROWS(napi_get_array_length(env, elements, &length));
 
-  rocksdb::PinnableSlice type;
-  rocksdb::PinnableSlice key;
-  rocksdb::PinnableSlice value;
-
   for (uint32_t i = 0; i < length; i++) {
-    type.Reset();
-    key.Reset();
-    value.Reset();
+    NapiSlice type;
+    NapiSlice key;
+    NapiSlice value;
 
     napi_value element;
     NAPI_STATUS_THROWS(napi_get_element(env, elements, i, &element));
@@ -1395,10 +1391,10 @@ NAPI_METHOD(batch_put) {
   rocksdb::WriteBatch* batch;
   NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], reinterpret_cast<void**>(&batch)));
 
-  rocksdb::PinnableSlice key;
+  NapiSlice key;
   NAPI_STATUS_THROWS(GetValue(env, argv[1], key));
 
-  rocksdb::PinnableSlice val;
+  NapiSlice val;
   NAPI_STATUS_THROWS(GetValue(env, argv[2], val));
 
   const auto options = argv[3];
@@ -1421,7 +1417,7 @@ NAPI_METHOD(batch_del) {
   rocksdb::WriteBatch* batch;
   NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], reinterpret_cast<void**>(&batch)));
 
-  rocksdb::PinnableSlice key;
+  NapiSlice key;
   NAPI_STATUS_THROWS(GetValue(env, argv[1], key));
 
   const auto options = argv[2];
@@ -1444,10 +1440,10 @@ NAPI_METHOD(batch_merge) {
   rocksdb::WriteBatch* batch;
   NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], (void**)(&batch)));
 
-  rocksdb::PinnableSlice key;
+  NapiSlice key;
   NAPI_STATUS_THROWS(GetValue(env, argv[1], key));
 
-  rocksdb::PinnableSlice val;
+  NapiSlice val;
   NAPI_STATUS_THROWS(GetValue(env, argv[2], val));
 
   const auto options = argv[3];
@@ -1496,7 +1492,7 @@ NAPI_METHOD(batch_put_log_data) {
   rocksdb::WriteBatch* batch;
   NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], reinterpret_cast<void**>(&batch)));
 
-  rocksdb::PinnableSlice logData;
+  NapiSlice logData;
   NAPI_STATUS_THROWS(GetValue(env, argv[1], logData));
 
   ROCKS_STATUS_THROWS_NAPI(batch->PutLogData(logData));

package/binding.gyp

@@ -1,83 +1,54 @@
 {
-  "variables": { "openssl_fips": "0" },
-  "targets": [
-    {
-      "target_name": "leveldown",
-      "conditions": [
-        [
-          "OS == 'win'",
-          {
-            "defines": ["_HAS_EXCEPTIONS=1", "OS_WIN=1"],
-            "msvs_settings": {
-              "VCCLCompilerTool": {
-                "RuntimeTypeInfo": "false",
-                "EnableFunctionLevelLinking": "true",
-                "ExceptionHandling": "2",
-                "DisableSpecificWarnings": [
-                  "4355",
-                  "4530",
-                  "4267",
-                  "4244",
-                  "4506"
+    "variables": {"openssl_fips": "0"},
+    "targets": [
+        {
+            "target_name": "leveldown",
+            "conditions": [
+                [
+                    "OS == 'linux'",
+                    {
+                        "cflags": [
+                            "-msse4.2",
+                            "-mpclmul",
+                            "-mavx",
+                            "-mavx2",
+                            "-mbmi",
+                            "-mlzcnt"
+                        ],
+                        "ccflags": ["-flto"],
+                        "cflags!": ["-fno-exceptions"],
+                        "cflags_cc!": ["-fno-exceptions"],
+                        "ldflags": ["-flto", "-fuse-linker-plugin"]
+                    }
+                ],
+                [
+                    "OS == 'mac'",
+                    {
+                        "xcode_settings": {
+                            "WARNING_CFLAGS": [
+                                "-Wno-sign-compare",
+                                "-Wno-unused-variable",
+                                "-Wno-unused-function",
+                                "-Wno-ignored-qualifiers"
+                            ],
+                            "OTHER_CPLUSPLUSFLAGS": [
+                                "-mmacosx-version-min=12.2.1",
+                                "-std=c++20",
+                                "-fno-omit-frame-pointer",
+                                "-momit-leaf-frame-pointer",
+                                "-arch x86_64",
+                                "-arch arm64"
+                            ],
+                            "GCC_ENABLE_CPP_RTTI": "YES",
+                            "GCC_ENABLE_CPP_EXCEPTIONS": "YES",
+                            "MACOSX_DEPLOYMENT_TARGET": "12.2.1"
+                        }
+                    }
                 ]
-              },
-              "VCLinkerTool": {
-                "AdditionalDependencies": ["Shlwapi.lib", "rpcrt4.lib"]
-              }
-            }
-          },
-          {
-            "cflags": ["-std=c++20"],
-            "cflags!": ["-fno-rtti"],
-            "cflags_cc!": ["-fno-rtti"],
-            "cflags_cc+": ["-frtti"]
-          }
-        ],
-        [
-          "OS == 'linux'",
-          {
-            "cflags": [
-              "-msse4.2",
-              "-mpclmul",
-              "-mavx",
-              "-mavx2",
-              "-mbmi",
-              "-mlzcnt"
             ],
-            "ccflags": ["-flto"],
-            "cflags!": ["-fno-exceptions"],
-            "cflags_cc!": ["-fno-exceptions"],
-            "ldflags": ["-flto", "-fuse-linker-plugin"]
-          }
-        ],
-        [
-          "OS == 'mac'",
-          {
-            "xcode_settings": {
-              "WARNING_CFLAGS": [
-                "-Wno-sign-compare",
-                "-Wno-unused-variable",
-                "-Wno-unused-function",
-                "-Wno-ignored-qualifiers"
-              ],
-              "OTHER_CPLUSPLUSFLAGS": [
-                "-mmacosx-version-min=12.2.1",
-                "-std=c++20",
-                "-fno-omit-frame-pointer",
-                "-momit-leaf-frame-pointer",
-                "-arch x86_64",
-                "-arch arm64"
-              ],
-              "GCC_ENABLE_CPP_RTTI": "YES",
-              "GCC_ENABLE_CPP_EXCEPTIONS": "YES",
-              "MACOSX_DEPLOYMENT_TARGET": "12.2.1"
-            }
-          }
-        ]
-      ],
-      "dependencies": ["<(module_root_dir)/deps/rocksdb/rocksdb.gyp:rocksdb"],
-      "include_dirs": ["<!(node -e \"require('napi-macros')\")"],
-      "sources": ["binding.cc"]
-    }
-  ]
+            "dependencies": ["<(module_root_dir)/deps/rocksdb/rocksdb.gyp:rocksdb"],
+            "include_dirs": ["<!(node -e \"require('napi-macros')\")"],
+            "sources": ["binding.cc"]
+        }
+    ]
 }

package/package.json

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

package/util.h

@@ -111,22 +111,31 @@ static napi_status GetString(napi_env env, napi_value from, std::string& to) {
   return napi_ok;
 }
 
-void DestroyReference(void* arg1, void* arg2) {
-  auto env = reinterpret_cast<napi_env>(arg1);
-  auto ref = reinterpret_cast<napi_ref>(arg2);
-  napi_delete_reference(env, ref);
-}
+class NapiSlice : public rocksdb::Slice {
+ public:
+  NapiSlice() {}
+
+  NapiSlice(NapiSlice&& other) = delete;
+  NapiSlice& operator=(NapiSlice&& other) = delete;
+
+  NapiSlice(NapiSlice&) = delete;
+  NapiSlice& operator=(NapiSlice&) = delete;
 
-static napi_status GetString(napi_env env, napi_value from, rocksdb::PinnableSlice& to) {
+  std::string self_space_;
+};
+
+static napi_status GetString(napi_env env, napi_value from, NapiSlice& to) {
   napi_valuetype type;
   NAPI_STATUS_RETURN(napi_typeof(env, from, &type));
 
   if (type == napi_string) {
     size_t length = 0;
     NAPI_STATUS_RETURN(napi_get_value_string_utf8(env, from, nullptr, 0, &length));
-    to.GetSelf()->resize(length, '\0');
-    NAPI_STATUS_RETURN(napi_get_value_string_utf8(env, from, &(*to.GetSelf())[0], length + 1, &length));
-    to.PinSelf();
+    to.self_space_.resize(length, '\0');
+    NAPI_STATUS_RETURN(napi_get_value_string_utf8(env, from, &to.self_space_[0], length + 1, &length));
+
+    to.data_ = to.self_space_.data();
+    to.size_ = length;
   } else {
     bool isBuffer;
     NAPI_STATUS_RETURN(napi_is_buffer(env, from, &isBuffer));
@@ -136,9 +145,8 @@ static napi_status GetString(napi_env env, napi_value from, rocksdb::PinnableSli
       size_t length = 0;
       NAPI_STATUS_RETURN(napi_get_buffer_info(env, from, reinterpret_cast<void**>(&buf), &length));
 
-      napi_ref ref;
-      NAPI_STATUS_RETURN(napi_create_reference(env, from, 1, &ref));
-      to.PinSlice(rocksdb::Slice(buf, length), DestroyReference, env, ref);
+      to.data_ = buf;
+      to.size_ = length;
     } else {
       return napi_invalid_arg;
     }
@@ -172,18 +180,11 @@ static napi_status GetValue(napi_env env, napi_value value, uint64_t& result) {
   return napi_ok;
 }
 
-static napi_status GetValue(napi_env env, napi_value value, unsigned long& result) {
-  int64_t result2;
-  NAPI_STATUS_RETURN(napi_get_value_int64(env, value, &result2));
-  result = static_cast<unsigned long>(result2);
-  return napi_ok;
-}
-
 static napi_status GetValue(napi_env env, napi_value value, std::string& result) {
   return GetString(env, value, result);
 }
 
-static napi_status GetValue(napi_env env, napi_value value, rocksdb::PinnableSlice& result) {
+static napi_status GetValue(napi_env env, napi_value value, NapiSlice& result) {
   return GetString(env, value, result);
 }