@nxtedition/rocksdb 8.2.0-alpha.2 → 8.2.0

package/binding.cc

@@ -18,9 +18,6 @@
 #include <rocksdb/table.h>
 #include <rocksdb/write_batch.h>
 
-#include <liburing.h>
-#include <sys/uio.h>
-
 #include <iostream>
 #include <memory>
 #include <optional>
@@ -386,7 +383,7 @@ struct BaseIterator : public Closable {
     }
     readOptions.fill_cache = fillCache_;
     readOptions.snapshot = snapshot_.get();
-    readOptions.async_io = true;
+    // readOptions.async_io = true;
     readOptions.adaptive_readahead = true;
     readOptions.tailing = tailing_;
 
@@ -471,33 +468,7 @@ static void FinalizeDatabase(napi_env env, void* data, void* hint) {
   }
 }
 
-inline void DeleteIOUring(void* p) {
-  struct io_uring* iu = static_cast<struct io_uring*>(p);
-  delete iu;
-}
-
-const unsigned int kIoUringDepth = 256;
-inline struct io_uring* CreateIOUring() {
-  struct io_uring* new_io_uring = new struct io_uring;
-  int ret = io_uring_queue_init(kIoUringDepth, new_io_uring, 0);
-  if (ret) {
-    delete new_io_uring;
-    new_io_uring = nullptr;
-  }
-  return new_io_uring;
-}
-
 NAPI_METHOD(db_init) {
-	// Ensure io_uring works.
-	{
-		io_uring new_io_uring = {};
-		auto ret = io_uring_queue_init(256, &new_io_uring, 0);
-		if (ret) {
-			ROCKS_STATUS_THROWS_NAPI(rocksdb::Status::NotSupported("ioring not supported"));
-		}
-		io_uring_queue_exit(&new_io_uring);
-	}
-
   auto database = new Database();
   napi_add_env_cleanup_hook(env, env_cleanup_hook, database);
 
@@ -671,8 +642,8 @@ NAPI_METHOD(db_get_merge_operands) {
   Database* database;
   NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], reinterpret_cast<void**>(&database)));
 
-	std::string key;
-	NAPI_STATUS_THROWS(GetValue(env, argv[1], key));
+  std::string key;
+  NAPI_STATUS_THROWS(GetValue(env, argv[1], key));
 
   const auto options = argv[2];
 
@@ -689,22 +660,16 @@ NAPI_METHOD(db_get_merge_operands) {
       [=, key = std::move(key)](auto& values) {
         rocksdb::ReadOptions readOptions;
 
-				values.resize(16); // TODO (fix): Make option
+        values.resize(16);  // TODO (fix): Make option
 
-				rocksdb::GetMergeOperandsOptions mergeOperandsOptions;
-				mergeOperandsOptions.expected_max_number_of_operands = values.size();
+        rocksdb::GetMergeOperandsOptions mergeOperandsOptions;
+        mergeOperandsOptions.expected_max_number_of_operands = values.size();
 
-  			int size = 0;
-				const auto status = database->db->GetMergeOperands(
-					readOptions,
-					column,
-					key,
-					values.data(),
-					&mergeOperandsOptions,
-					&size
-				);
+        int size = 0;
+        const auto status =
+            database->db->GetMergeOperands(readOptions, column, key, values.data(), &mergeOperandsOptions, &size);
 
-				values.resize(size);
+        values.resize(size);
 
         return status;
       },
@@ -944,7 +909,7 @@ NAPI_METHOD(db_get_many) {
         rocksdb::ReadOptions readOptions;
         readOptions.fill_cache = fillCache;
         readOptions.snapshot = snapshot.get();
-        readOptions.async_io = true;
+        // readOptions.async_io = true;
         readOptions.ignore_range_deletions = ignoreRangeDeletions;
         readOptions.optimize_multiget_for_io = true;
 
@@ -1594,55 +1559,6 @@ NAPI_METHOD(batch_iterate) {
   return result;
 }
 
-NAPI_METHOD(db_get_sorted_wal_files) {
-  NAPI_ARGV(3);
-
-  Database* database;
-  NAPI_STATUS_THROWS(napi_get_value_external(env, argv[0], reinterpret_cast<void**>(&database)));
-
-  auto callback = argv[1];
-
-  runAsync<rocksdb::VectorLogPtr>(
-      "leveldown.open", env, callback, [=](auto& files) { return database->db->GetSortedWalFiles(files); },
-      [=](auto& files, auto env, auto& argv) {
-        argv.resize(2);
-
-        const auto size = files.size();
-        NAPI_STATUS_RETURN(napi_create_array_with_length(env, size, &argv[1]));
-
-        for (size_t n = 0; n < size; ++n) {
-          napi_value element;
-          NAPI_STATUS_RETURN(napi_create_object(env, &element));
-
-          napi_value pathName;
-          NAPI_STATUS_RETURN(napi_create_string_utf8(env, files[n]->PathName().data(), NAPI_AUTO_LENGTH, &pathName))
-          NAPI_STATUS_RETURN(napi_set_named_property(env, element, "pathName", pathName));
-
-          napi_value logNumber;
-          NAPI_STATUS_RETURN(napi_create_int32(env, files[n]->LogNumber(), &logNumber))
-          NAPI_STATUS_RETURN(napi_set_named_property(env, element, "logNumber", logNumber));
-
-          napi_value type;
-          NAPI_STATUS_RETURN(napi_create_int32(env, files[n]->Type(), &type))
-          NAPI_STATUS_RETURN(napi_set_named_property(env, element, "type", type));
-
-          napi_value startSequence;
-          NAPI_STATUS_RETURN(napi_create_int64(env, files[n]->StartSequence(), &startSequence))
-          NAPI_STATUS_RETURN(napi_set_named_property(env, element, "startSequence", startSequence));
-
-          napi_value sizeFileBytes;
-          NAPI_STATUS_RETURN(napi_create_int64(env, files[n]->SizeFileBytes(), &sizeFileBytes))
-          NAPI_STATUS_RETURN(napi_set_named_property(env, element, "sizeFileBytes", sizeFileBytes));
-
-          NAPI_STATUS_RETURN(napi_set_element(env, argv[1], n, element));
-        }
-
-        return napi_ok;
-      });
-
-  return 0;
-}
-
 NAPI_METHOD(db_flush_wal) {
   NAPI_ARGV(3);
 
@@ -1672,7 +1588,6 @@ NAPI_INIT() {
   NAPI_EXPORT_FUNCTION(db_clear);
   NAPI_EXPORT_FUNCTION(db_get_property);
   NAPI_EXPORT_FUNCTION(db_get_latest_sequence);
-  NAPI_EXPORT_FUNCTION(db_get_sorted_wal_files);
   NAPI_EXPORT_FUNCTION(db_flush_wal);
   NAPI_EXPORT_FUNCTION(db_get_merge_operands);
 

package/binding.gyp

@@ -15,9 +15,6 @@
                             "-mbmi",
                             "-mlzcnt"
                         ],
-						"dependencies": [
-							"./deps/liburing/liburing.gyp:liburing"
-						],
 						"include_dirs": [
 							"/usr/lib/x86_64-linux-gnu/include",
 							"/usr/lib/include",

package/deps/rocksdb/rocksdb.gyp

@@ -87,7 +87,7 @@
               "ROCKSDB_PTHREAD_ADAPTIVE_MUTEX=1",
               "ROCKSDB_RANGESYNC_PRESENT=1",
               "ROCKSDB_SCHED_GETCPU_PRESENT=1",
-              "ROCKSDB_IOURING_PRESENT=1",
+              # "ROCKSDB_IOURING_PRESENT=1",
               "USE_FOLLY=1",
               "FOLLY_NO_CONFIG=1"
               "HAVE_SSE42=1",
@@ -115,9 +115,6 @@
               "/usr/lib/include",
               # "/usr/local/Cellar/jemalloc/5.3.0/include"
             ],
-            "dependencies": [
-              "../liburing/liburing.gyp:liburing"
-            ],
             "cflags": [
               "-msse4.2",
               "-mpclmul",
@@ -138,11 +135,11 @@
             "defines": ["OS_MACOSX=1"],
             "direct_dependent_settings": {
               "libraries": [
-                "/opt/homebrew/Cellar/zstd/1.5.2/lib/libzstd.a"
+                "/opt/homebrew/Cellar/zstd/1.5.5/lib/libzstd.a"
               ],
             },
             "include_dirs": [
-              "/opt/homebrew/Cellar/zstd/1.5.2/include"
+              "/opt/homebrew/Cellar/zstd/1.5.5/include"
             ],
             "xcode_settings": {
               "OTHER_CPLUSPLUSFLAGS": [
@@ -392,7 +389,6 @@
         "rocksdb/util/compression_context_cache.cc",
         "rocksdb/util/concurrent_task_limiter_impl.cc",
         "rocksdb/util/crc32c.cc",
-        "rocksdb/util/crc32c_arm64.cc",
         "rocksdb/util/data_structure.cc",
         "rocksdb/util/dynamic_bloom.cc",
         "rocksdb/util/hash.cc",

package/index.js

@@ -299,12 +299,6 @@ class RocksLevel extends AbstractLevel {
       binding.db_flush_wal(this[kContext], options ?? {}, (err, val) => err ? reject(err) : resolve(val))
     })
   }
-
-  async getSortedWalFiles () {
-    return new Promise((resolve, reject) => {
-      binding.db_get_sorted_wal_files(this[kContext], (err, val) => err ? reject(err) : resolve(val))
-    })
-  }
 }
 
 exports.RocksLevel = RocksLevel

package/package.json

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

package/deps/liburing/liburing.gyp

@@ -1,20 +0,0 @@
-{
-  "variables": { "openssl_fips": "0" },
-  "targets":
-    [
-      {
-        "target_name": "liburing",
-        "type": "static_library",
-        "include_dirs": ["linux", "liburing/src/include"],
-        "direct_dependent_settings":
-          { "include_dirs": ["linux", "liburing/src/include"] },
-        "sources":
-          [
-            "liburing/src/queue.c",
-            "liburing/src/register.c",
-            "liburing/src/setup.c",
-            "liburing/src/syscall.c",
-          ],
-      },
-    ],
-}