@nxtedition/rocksdb 11.1.7 → 12.0.1

package/binding.cc

@@ -18,8 +18,6 @@
 #include <rocksdb/table.h>
 #include <rocksdb/write_batch.h>
 
-#include <boost/regex.hpp>
-
 #include <iostream>
 #include <memory>
 #include <optional>
@@ -1481,99 +1479,6 @@ NAPI_METHOD(batch_iterate) {
   return result;
 }
 
-NAPI_METHOD(regex_init) {
-  NAPI_ARGV(1);
-
-  std::string pattern;
-  NAPI_STATUS_THROWS(GetString(env, argv[0], pattern));
-
-  try {
-    auto regex = std::make_unique<boost::regex>(pattern, boost::regex::optimize | boost::regex::ECMAScript);
-
-    napi_value result;
-    NAPI_STATUS_THROWS(napi_create_external(env, regex.get(), Finalize<boost::regex>, regex.get(), &result));
-    regex.release();
-
-    return result;
-  } catch (const std::exception& e) {
-    napi_throw_error(env, nullptr, e.what());
-    return 0;
-  }
-}
-
-NAPI_METHOD(regex_test) {
-  NAPI_ARGV(4);
-
-  boost::regex* regex;
-  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], reinterpret_cast<void**>(&regex)));
-
-  rocksdb::Slice value;
-  NAPI_STATUS_THROWS(GetValue(env, argv[1], value));
-
-  int offset = 0;
-  NAPI_STATUS_THROWS(GetValue(env, argv[2], offset));
-  offset = std::max(0, std::min<int>(offset, value.size()));
-
-  int length = 0;
-  NAPI_STATUS_THROWS(GetValue(env, argv[3], length));
-  length = std::max(0, std::min<int>(length, value.size() - offset));
-
-  try {
-    const bool match = boost::regex_search(value.data() + offset, value.data() + offset + length, *regex);
-
-    napi_value result;
-    NAPI_STATUS_THROWS(napi_get_boolean(env, match, &result));
-
-    return result;
-  } catch (const std::exception& e) {
-    napi_throw_error(env, nullptr, e.what());
-    return 0;
-  }
-}
-
-NAPI_METHOD(regex_test_many) {
-  NAPI_ARGV(2);
-
-  boost::regex* regex;
-  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], reinterpret_cast<void**>(&regex)));
-
-  uint32_t count;
-  NAPI_STATUS_THROWS(napi_get_array_length(env, argv[1], &count));
-
-  napi_value result;
-  NAPI_STATUS_THROWS(napi_create_array_with_length(env, count, &result));
-
-  try {
-    std::vector<rocksdb::Slice> keys;
-    keys.resize(count);
-
-    std::vector<bool> matches;
-    matches.resize(count);
-
-    for (uint32_t n = 0; n < count; n++) {
-      napi_value valueElement;
-      NAPI_STATUS_THROWS(napi_get_element(env, argv[1], n, &valueElement));
-      NAPI_STATUS_THROWS(GetValue(env, valueElement, keys[n]))
-    }
-
-    for (uint32_t n = 0; n < count; n++) {
-      matches[n] = boost::regex_search(keys[n].data(), keys[n].data() + keys[n].size(), *regex);
-    }
-
-    for (uint32_t n = 0; n < count; n++) {
-      napi_value element;
-      NAPI_STATUS_THROWS(napi_get_boolean(env, matches[n], &element));
-      NAPI_STATUS_THROWS(napi_set_element(env, result, n, element));
-    }
-
-    return result;
-  } catch (const std::exception& e) {
-    napi_throw_error(env, nullptr, e.what());
-    return 0;
-  }
-}
-
-
 NAPI_INIT() {
   NAPI_EXPORT_FUNCTION(db_init);
   NAPI_EXPORT_FUNCTION(db_open);
@@ -1601,8 +1506,4 @@ NAPI_INIT() {
   NAPI_EXPORT_FUNCTION(batch_merge);
   NAPI_EXPORT_FUNCTION(batch_count);
   NAPI_EXPORT_FUNCTION(batch_iterate);
-
-  NAPI_EXPORT_FUNCTION(regex_init);
-  NAPI_EXPORT_FUNCTION(regex_test_many);
-  NAPI_EXPORT_FUNCTION(regex_test);
 }

package/binding.gyp

@@ -3,31 +3,21 @@
     "targets": [
         {
             "target_name": "leveldown",
-            "defines": [
-              "BOOST_REGEX_STANDALONE=yes"
-            ],
+            "defines": ["BOOST_REGEX_STANDALONE=yes"],
             "conditions": [
                 [
                     "OS == 'linux'",
                     {
-                        "cflags": [
-                            "-msse4.2",
-                            "-mpclmul",
-                            "-mavx",
-                            "-mavx2",
-                            "-mbmi",
-                            "-mlzcnt"
+                        "cflags": ["-march=znver1"],
+                        "include_dirs": [
+                            "/usr/lib/x86_64-linux-gnu/include",
+                            "/usr/lib/include",
                         ],
-						"include_dirs": [
-							"/usr/lib/x86_64-linux-gnu/include",
-							"/usr/lib/include",
-							# "/usr/local/Cellar/jemalloc/5.3.0/include"
-						],
-                        "ccflags": ["-flto"],
+                        "ccflags": ["-flto", '-march=znver1'],
                         "cflags!": ["-fno-exceptions"],
                         "cflags_cc!": ["-fno-exceptions"],
-                        "ldflags": ["-flto", "-fuse-linker-plugin"]
-                    }
+                        "ldflags": ["-flto", "-fuse-linker-plugin"],
+                    },
                 ],
                 [
                     "OS == 'mac'",
@@ -37,7 +27,7 @@
                                 "-Wno-sign-compare",
                                 "-Wno-unused-variable",
                                 "-Wno-unused-function",
-                                "-Wno-ignored-qualifiers"
+                                "-Wno-ignored-qualifiers",
                             ],
                             "OTHER_CPLUSPLUSFLAGS": [
                                 "-mmacosx-version-min=13.4.0",
@@ -45,18 +35,18 @@
                                 "-fno-omit-frame-pointer",
                                 "-momit-leaf-frame-pointer",
                                 "-arch x86_64",
-                                "-arch arm64"
+                                "-arch arm64",
                             ],
                             "GCC_ENABLE_CPP_RTTI": "YES",
                             "GCC_ENABLE_CPP_EXCEPTIONS": "YES",
-                            "MACOSX_DEPLOYMENT_TARGET": "13.4.0"
+                            "MACOSX_DEPLOYMENT_TARGET": "13.4.0",
                         }
-                    }
-                ]
+                    },
+                ],
             ],
             "dependencies": ["<(module_root_dir)/deps/rocksdb/rocksdb.gyp:rocksdb"],
-            "include_dirs": ["<!(node -e \"require('napi-macros')\")", "/opt/homebrew/Cellar/boost/1.86.0/include"],
-            "sources": ["binding.cc"]
+            "include_dirs": ["<!(node -e \"require('napi-macros')\")"],
+            "sources": ["binding.cc"],
         }
-    ]
+    ],
 }

package/index.js

@@ -5,7 +5,6 @@ const { AbstractLevel } = require('abstract-level')
 const ModuleError = require('module-error')
 const binding = require('./binding')
 const { ChainedBatch } = require('./chained-batch')
-const { Regex } = require('./regex')
 const { Iterator } = require('./iterator')
 const fs = require('node:fs')
 const assert = require('node:assert')
@@ -265,4 +264,3 @@ class RocksLevel extends AbstractLevel {
 }
 
 exports.RocksLevel = RocksLevel
-exports.Regex = Regex

package/iterator.js

@@ -98,24 +98,24 @@ class Iterator extends AbstractIterator {
       return []
     }
 
-    const { rows, finished } = binding.iterator_nextv(this[kContext], size)
+    const result = binding.iterator_nextv(this[kContext], size)
 
     this[kFirst] = false
-    this[kFinished] = finished
+    this[kFinished] = result.finished
 
-    return rows
+    return result
   }
 
   _close (callback) {
     try {
-      this._syncClose()
+      this._closeSync()
       process.nextTick(callback)
     } catch (err) {
       process.nextTick(callback, err)
     }
   }
 
-  _syncClose () {
+  _closeSync () {
     this[kCache] = kEmpty
     binding.iterator_close(this[kContext])
   }

package/package.json

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

package/regex.js

@@ -1,29 +0,0 @@
-'use strict'
-
-const binding = require('./binding')
-
-class Regex {
-  #context
-
-  constructor (pattern) {
-    this.#context = binding.regex_init(pattern)
-  }
-
-  test (buffer, byteOffset, byteLength) {
-    if (byteOffset === undefined) {
-      byteOffset = 0
-    }
-
-    if (byteLength === undefined) {
-      byteLength = buffer.byteLength - byteOffset
-    }
-
-    return binding.regex_test(this.#context, buffer, byteOffset, byteLength)
-  }
-
-  testMany (values) {
-    return binding.regex_test_many(this.#context, values)
-  }
-}
-
-exports.Regex = Regex