@nxtedition/rocksdb 5.2.26 → 5.2.27

package/binding.gyp

@@ -27,7 +27,7 @@
             }
           },
           {
-            "cflags": ["-std=c++17"],
+            "cflags": ["-std=c++20"],
             "cflags!": ["-fno-rtti"],
             "cflags_cc!": ["-fno-rtti"],
             "cflags_cc+": ["-frtti"]

package/chained-batch.js

@@ -27,11 +27,10 @@ class ChainedBatch extends AbstractChainedBatch {
   }
 
   _write (options, callback) {
-    binding.batch_write(this[kDbContext], this[kBatchContext], options, callback)
+    process.nextTick(callback, binding.batch_write(this[kDbContext], this[kBatchContext], options))
   }
 
   _close (callback) {
-    // TODO: close native batch (currently done on GC)
     process.nextTick(callback)
   }
 }

package/deps/rocksdb/rocksdb/cmake/modules/CxxFlags.cmake

@@ -0,0 +1,7 @@
+macro(get_cxx_std_flags FLAGS_VARIABLE)
+  if( CMAKE_CXX_STANDARD_REQUIRED )
+    set(${FLAGS_VARIABLE} ${CMAKE_CXX${CMAKE_CXX_STANDARD}_STANDARD_COMPILE_OPTION})
+  else()
+    set(${FLAGS_VARIABLE} ${CMAKE_CXX${CMAKE_CXX_STANDARD}_EXTENSION_COMPILE_OPTION})
+  endif()
+endmacro()

package/deps/rocksdb/rocksdb/cmake/modules/FindJeMalloc.cmake

@@ -0,0 +1,29 @@
+# - Find JeMalloc library
+# Find the native JeMalloc includes and library
+#
+# JeMalloc_INCLUDE_DIRS - where to find jemalloc.h, etc.
+# JeMalloc_LIBRARIES - List of libraries when using jemalloc.
+# JeMalloc_FOUND - True if jemalloc found.
+
+find_path(JeMalloc_INCLUDE_DIRS
+  NAMES jemalloc/jemalloc.h
+  HINTS ${JEMALLOC_ROOT_DIR}/include)
+
+find_library(JeMalloc_LIBRARIES
+  NAMES jemalloc
+  HINTS ${JEMALLOC_ROOT_DIR}/lib)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(JeMalloc DEFAULT_MSG JeMalloc_LIBRARIES JeMalloc_INCLUDE_DIRS)
+
+mark_as_advanced(
+  JeMalloc_LIBRARIES
+  JeMalloc_INCLUDE_DIRS)
+
+if(JeMalloc_FOUND AND NOT (TARGET JeMalloc::JeMalloc))
+  add_library (JeMalloc::JeMalloc UNKNOWN IMPORTED)
+  set_target_properties(JeMalloc::JeMalloc
+    PROPERTIES
+      IMPORTED_LOCATION ${JeMalloc_LIBRARIES}
+      INTERFACE_INCLUDE_DIRECTORIES ${JeMalloc_INCLUDE_DIRS})
+endif()

package/deps/rocksdb/rocksdb/cmake/modules/FindNUMA.cmake

@@ -0,0 +1,29 @@
+# - Find NUMA
+# Find the NUMA library and includes
+#
+# NUMA_INCLUDE_DIRS - where to find numa.h, etc.
+# NUMA_LIBRARIES - List of libraries when using NUMA.
+# NUMA_FOUND - True if NUMA found.
+
+find_path(NUMA_INCLUDE_DIRS
+  NAMES numa.h numaif.h
+  HINTS ${NUMA_ROOT_DIR}/include)
+
+find_library(NUMA_LIBRARIES
+  NAMES numa
+  HINTS ${NUMA_ROOT_DIR}/lib)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(NUMA DEFAULT_MSG NUMA_LIBRARIES NUMA_INCLUDE_DIRS)
+
+mark_as_advanced(
+  NUMA_LIBRARIES
+  NUMA_INCLUDE_DIRS)
+
+if(NUMA_FOUND AND NOT (TARGET NUMA::NUMA))
+  add_library (NUMA::NUMA UNKNOWN IMPORTED)
+  set_target_properties(NUMA::NUMA
+    PROPERTIES
+      IMPORTED_LOCATION ${NUMA_LIBRARIES}
+      INTERFACE_INCLUDE_DIRECTORIES ${NUMA_INCLUDE_DIRS})
+endif()

package/deps/rocksdb/rocksdb/cmake/modules/FindSnappy.cmake

@@ -0,0 +1,29 @@
+# - Find Snappy
+# Find the snappy compression library and includes
+#
+# Snappy_INCLUDE_DIRS - where to find snappy.h, etc.
+# Snappy_LIBRARIES - List of libraries when using snappy.
+# Snappy_FOUND - True if snappy found.
+
+find_path(Snappy_INCLUDE_DIRS
+  NAMES snappy.h
+  HINTS ${snappy_ROOT_DIR}/include)
+
+find_library(Snappy_LIBRARIES
+  NAMES snappy
+  HINTS ${snappy_ROOT_DIR}/lib)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Snappy DEFAULT_MSG Snappy_LIBRARIES Snappy_INCLUDE_DIRS)
+
+mark_as_advanced(
+  Snappy_LIBRARIES
+  Snappy_INCLUDE_DIRS)
+
+if(Snappy_FOUND AND NOT (TARGET Snappy::snappy))
+  add_library (Snappy::snappy UNKNOWN IMPORTED)
+  set_target_properties(Snappy::snappy
+    PROPERTIES
+      IMPORTED_LOCATION ${Snappy_LIBRARIES}
+      INTERFACE_INCLUDE_DIRECTORIES ${Snappy_INCLUDE_DIRS})
+endif()

package/deps/rocksdb/rocksdb/cmake/modules/FindTBB.cmake

@@ -0,0 +1,33 @@
+# - Find TBB
+# Find the Thread Building Blocks library and includes
+#
+# TBB_INCLUDE_DIRS - where to find tbb.h, etc.
+# TBB_LIBRARIES - List of libraries when using TBB.
+# TBB_FOUND - True if TBB found.
+
+if(NOT DEFINED TBB_ROOT_DIR)
+  set(TBB_ROOT_DIR "$ENV{TBBROOT}")
+endif()
+
+find_path(TBB_INCLUDE_DIRS
+  NAMES tbb/tbb.h
+  HINTS ${TBB_ROOT_DIR}/include)
+
+find_library(TBB_LIBRARIES
+  NAMES tbb
+  HINTS ${TBB_ROOT_DIR}/lib ENV LIBRARY_PATH)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(TBB DEFAULT_MSG TBB_LIBRARIES TBB_INCLUDE_DIRS)
+
+mark_as_advanced(
+  TBB_LIBRARIES
+  TBB_INCLUDE_DIRS)
+
+if(TBB_FOUND AND NOT (TARGET TBB::TBB))
+  add_library (TBB::TBB UNKNOWN IMPORTED)
+  set_target_properties(TBB::TBB
+    PROPERTIES
+      IMPORTED_LOCATION ${TBB_LIBRARIES}
+      INTERFACE_INCLUDE_DIRECTORIES ${TBB_INCLUDE_DIRS})
+endif()

package/deps/rocksdb/rocksdb/cmake/modules/Findgflags.cmake

@@ -0,0 +1,29 @@
+# - Find gflags library
+# Find the gflags includes and library
+#
+# GFLAGS_INCLUDE_DIR - where to find gflags.h.
+# GFLAGS_LIBRARIES - List of libraries when using gflags.
+# gflags_FOUND - True if gflags found.
+
+find_path(GFLAGS_INCLUDE_DIR
+  NAMES gflags/gflags.h)
+
+find_library(GFLAGS_LIBRARIES
+  NAMES gflags)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(gflags
+  DEFAULT_MSG GFLAGS_LIBRARIES GFLAGS_INCLUDE_DIR)
+
+mark_as_advanced(
+  GFLAGS_LIBRARIES
+  GFLAGS_INCLUDE_DIR)
+
+if(gflags_FOUND AND NOT (TARGET gflags::gflags))
+  add_library(gflags::gflags UNKNOWN IMPORTED)
+  set_target_properties(gflags::gflags
+    PROPERTIES
+      IMPORTED_LOCATION ${GFLAGS_LIBRARIES}
+      INTERFACE_INCLUDE_DIRECTORIES ${GFLAGS_INCLUDE_DIR}
+      IMPORTED_LINK_INTERFACE_LANGUAGES "CXX")
+endif()

package/deps/rocksdb/rocksdb/cmake/modules/Findlz4.cmake

@@ -0,0 +1,29 @@
+# - Find Lz4
+# Find the lz4 compression library and includes
+#
+# lz4_INCLUDE_DIRS - where to find lz4.h, etc.
+# lz4_LIBRARIES - List of libraries when using lz4.
+# lz4_FOUND - True if lz4 found.
+
+find_path(lz4_INCLUDE_DIRS
+  NAMES lz4.h
+  HINTS ${lz4_ROOT_DIR}/include)
+
+find_library(lz4_LIBRARIES
+  NAMES lz4
+  HINTS ${lz4_ROOT_DIR}/lib)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(lz4 DEFAULT_MSG lz4_LIBRARIES lz4_INCLUDE_DIRS)
+
+mark_as_advanced(
+  lz4_LIBRARIES
+  lz4_INCLUDE_DIRS)
+
+if(lz4_FOUND AND NOT (TARGET lz4::lz4))
+  add_library(lz4::lz4 UNKNOWN IMPORTED)
+  set_target_properties(lz4::lz4
+    PROPERTIES
+      IMPORTED_LOCATION ${lz4_LIBRARIES}
+      INTERFACE_INCLUDE_DIRECTORIES ${lz4_INCLUDE_DIRS})
+endif()

package/deps/rocksdb/rocksdb/cmake/modules/Finduring.cmake

@@ -0,0 +1,26 @@
+# - Find liburing
+#
+# uring_INCLUDE_DIR - Where to find liburing.h
+# uring_LIBRARIES - List of libraries when using uring.
+# uring_FOUND - True if uring found.
+
+find_path(uring_INCLUDE_DIR
+  NAMES liburing.h)
+find_library(uring_LIBRARIES
+  NAMES liburing.a liburing)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(uring
+  DEFAULT_MSG uring_LIBRARIES uring_INCLUDE_DIR)
+
+mark_as_advanced(
+  uring_INCLUDE_DIR
+  uring_LIBRARIES)
+
+if(uring_FOUND AND NOT TARGET uring::uring)
+  add_library(uring::uring UNKNOWN IMPORTED)
+  set_target_properties(uring::uring PROPERTIES
+    INTERFACE_INCLUDE_DIRECTORIES "${uring_INCLUDE_DIR}"
+    IMPORTED_LINK_INTERFACE_LANGUAGES "C"
+    IMPORTED_LOCATION "${uring_LIBRARIES}")
+endif()

package/deps/rocksdb/rocksdb/cmake/modules/Findzstd.cmake

@@ -0,0 +1,29 @@
+# - Find zstd
+# Find the zstd compression library and includes
+#
+# zstd_INCLUDE_DIRS - where to find zstd.h, etc.
+# zstd_LIBRARIES - List of libraries when using zstd.
+# zstd_FOUND - True if zstd found.
+
+find_path(zstd_INCLUDE_DIRS
+  NAMES zstd.h
+  HINTS ${zstd_ROOT_DIR}/include)
+
+find_library(zstd_LIBRARIES
+  NAMES zstd
+  HINTS ${zstd_ROOT_DIR}/lib)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(zstd DEFAULT_MSG zstd_LIBRARIES zstd_INCLUDE_DIRS)
+
+mark_as_advanced(
+  zstd_LIBRARIES
+  zstd_INCLUDE_DIRS)
+
+if(zstd_FOUND AND NOT (TARGET zstd::zstd))
+  add_library (zstd::zstd UNKNOWN IMPORTED)
+  set_target_properties(zstd::zstd
+    PROPERTIES
+      IMPORTED_LOCATION ${zstd_LIBRARIES}
+      INTERFACE_INCLUDE_DIRECTORIES ${zstd_INCLUDE_DIRS})
+endif()

package/deps/rocksdb/rocksdb/cmake/modules/ReadVersion.cmake

@@ -0,0 +1,10 @@
+# Read rocksdb version from version.h header file.
+
+function(get_rocksdb_version version_var)
+  file(READ "${CMAKE_CURRENT_SOURCE_DIR}/include/rocksdb/version.h" version_header_file)
+  foreach(component MAJOR MINOR PATCH)
+    string(REGEX MATCH "#define ROCKSDB_${component} ([0-9]+)" _ ${version_header_file})
+    set(ROCKSDB_VERSION_${component} ${CMAKE_MATCH_1})
+  endforeach()
+  set(${version_var} "${ROCKSDB_VERSION_MAJOR}.${ROCKSDB_VERSION_MINOR}.${ROCKSDB_VERSION_PATCH}" PARENT_SCOPE)
+endfunction()

package/deps/rocksdb/rocksdb.gyp

@@ -67,7 +67,7 @@
               "-momit-leaf-frame-pointer",
               "-fno-builtin-memcmp"
             ],
-            "cflags": ["-std=c++17"],
+            "cflags": ["-std=c++20"],
             "cflags!": ["-fno-rtti"],
             "cflags_cc!": ["-fno-rtti"],
             "cflags_cc+": ["-frtti"]
@@ -325,13 +325,13 @@
         "rocksdb/test_util/sync_point_impl.cc",
         "rocksdb/test_util/testutil.cc",
         "rocksdb/test_util/transaction_test_util.cc",
-        "rocksdb/tools/block_cache_analyzer/block_cache_trace_analyzer.cc",
-        "rocksdb/tools/dump/db_dump_tool.cc",
-        "rocksdb/tools/io_tracer_parser_tool.cc",
-        "rocksdb/tools/ldb_cmd.cc",
-        "rocksdb/tools/ldb_tool.cc",
-        "rocksdb/tools/sst_dump_tool.cc",
-        "rocksdb/tools/trace_analyzer_tool.cc",
+        # "rocksdb/tools/block_cache_analyzer/block_cache_trace_analyzer.cc",
+        # "rocksdb/tools/dump/db_dump_tool.cc",
+        # "rocksdb/tools/io_tracer_parser_tool.cc",
+        # "rocksdb/tools/ldb_cmd.cc",
+        # "rocksdb/tools/ldb_tool.cc",
+        # "rocksdb/tools/sst_dump_tool.cc",
+        # "rocksdb/tools/trace_analyzer_tool.cc",
         "rocksdb/trace_replay/block_cache_tracer.cc",
         "rocksdb/trace_replay/io_tracer.cc",
         "rocksdb/trace_replay/trace_record_handler.cc",
@@ -361,12 +361,12 @@
         "rocksdb/util/xxhash.cc",
         "rocksdb/utilities/agg_merge/agg_merge.cc",
         "rocksdb/utilities/backup/backup_engine.cc",
-        "rocksdb/utilities/blob_db/blob_compaction_filter.cc",
-        "rocksdb/utilities/blob_db/blob_db.cc",
-        "rocksdb/utilities/blob_db/blob_db_impl.cc",
-        "rocksdb/utilities/blob_db/blob_db_impl_filesnapshot.cc",
-        "rocksdb/utilities/blob_db/blob_dump_tool.cc",
-        "rocksdb/utilities/blob_db/blob_file.cc",
+        # "rocksdb/utilities/blob_db/blob_compaction_filter.cc",
+        # "rocksdb/utilities/blob_db/blob_db.cc",
+        # "rocksdb/utilities/blob_db/blob_db_impl.cc",
+        # "rocksdb/utilities/blob_db/blob_db_impl_filesnapshot.cc",
+        # "rocksdb/utilities/blob_db/blob_dump_tool.cc",
+        # "rocksdb/utilities/blob_db/blob_file.cc",
         "rocksdb/utilities/cache_dump_load.cc",
         "rocksdb/utilities/cache_dump_load_impl.cc",
         "rocksdb/utilities/checkpoint/checkpoint_impl.cc",
@@ -374,11 +374,11 @@
         "rocksdb/utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc",
         "rocksdb/utilities/counted_fs.cc",
         "rocksdb/utilities/debug.cc",
-        "rocksdb/utilities/env_mirror.cc",
-        "rocksdb/utilities/env_timed.cc",
-        "rocksdb/utilities/fault_injection_env.cc",
-        "rocksdb/utilities/fault_injection_fs.cc",
-        "rocksdb/utilities/fault_injection_secondary_cache.cc",
+        # "rocksdb/utilities/env_mirror.cc",
+        # "rocksdb/utilities/env_timed.cc",
+        # "rocksdb/utilities/fault_injection_env.cc",
+        # "rocksdb/utilities/fault_injection_fs.cc",
+        # "rocksdb/utilities/fault_injection_secondary_cache.cc",
         "rocksdb/utilities/leveldb_options/leveldb_options.cc",
         "rocksdb/utilities/memory/memory_util.cc",
         "rocksdb/utilities/merge_operators.cc",
@@ -392,13 +392,13 @@
         "rocksdb/utilities/object_registry.cc",
         "rocksdb/utilities/option_change_migration/option_change_migration.cc",
         "rocksdb/utilities/options/options_util.cc",
-        "rocksdb/utilities/persistent_cache/block_cache_tier.cc",
-        "rocksdb/utilities/persistent_cache/block_cache_tier_file.cc",
-        "rocksdb/utilities/persistent_cache/block_cache_tier_metadata.cc",
-        "rocksdb/utilities/persistent_cache/persistent_cache_tier.cc",
-        "rocksdb/utilities/persistent_cache/volatile_tier_impl.cc",
-        "rocksdb/utilities/simulator_cache/cache_simulator.cc",
-        "rocksdb/utilities/simulator_cache/sim_cache.cc",
+        # "rocksdb/utilities/persistent_cache/block_cache_tier.cc",
+        # "rocksdb/utilities/persistent_cache/block_cache_tier_file.cc",
+        # "rocksdb/utilities/persistent_cache/block_cache_tier_metadata.cc",
+        # "rocksdb/utilities/persistent_cache/persistent_cache_tier.cc",
+        # "rocksdb/utilities/persistent_cache/volatile_tier_impl.cc",
+        # "rocksdb/utilities/simulator_cache/cache_simulator.cc",
+        # "rocksdb/utilities/simulator_cache/sim_cache.cc",
         "rocksdb/utilities/table_properties_collectors/compact_on_deletion_collector.cc",
         "rocksdb/utilities/trace/file_trace_reader_writer.cc",
         "rocksdb/utilities/trace/replayer_impl.cc",

package/index.js

@@ -2,13 +2,11 @@
 
 const { AbstractLevel } = require('abstract-level')
 const ModuleError = require('module-error')
-const { fromCallback } = require('catering')
 const fs = require('fs')
 const binding = require('./binding')
 const { ChainedBatch } = require('./chained-batch')
 const { Iterator } = require('./iterator')
 
-const kPromise = Symbol('promise')
 const kContext = Symbol('context')
 const kLocation = Symbol('location')
 
@@ -32,11 +30,7 @@ class RocksLevel extends AbstractLevel {
       },
       seek: true,
       createIfMissing: true,
-      errorIfExists: true,
-      additionalMethods: {
-        approximateSize: true,
-        compactRange: true
-      }
+      errorIfExists: true
     }, options)
 
     this[kLocation] = location
@@ -63,7 +57,7 @@ class RocksLevel extends AbstractLevel {
   }
 
   _put (key, value, options, callback) {
-    binding.db_put(this[kContext], key, value, options, callback)
+    process.nextTick(callback, binding.db_put(this[kContext], key, value, options))
   }
 
   _get (key, options, callback) {
@@ -75,11 +69,11 @@ class RocksLevel extends AbstractLevel {
   }
 
   _del (key, options, callback) {
-    binding.db_del(this[kContext], key, options, callback)
+    process.nextTick(callback, binding.db_del(this[kContext], key, options))
   }
 
   _clear (options, callback) {
-    binding.db_clear(this[kContext], options, callback)
+    process.nextTick(callback, binding.db_clear(this[kContext], options))
   }
 
   _chainedBatch () {
@@ -87,63 +81,7 @@ class RocksLevel extends AbstractLevel {
   }
 
   _batch (operations, options, callback) {
-    binding.batch_do(this[kContext], operations, options, callback)
-  }
-
-  approximateSize (start, end, options, callback) {
-    if (arguments.length < 2 || typeof start === 'function' || typeof end === 'function') {
-      throw new TypeError("The arguments 'start' and 'end' are required")
-    } else if (typeof options === 'function') {
-      callback = options
-      options = null
-    } else if (typeof options !== 'object') {
-      options = null
-    }
-
-    callback = fromCallback(callback, kPromise)
-
-    if (this.status === 'opening') {
-      this.defer(() => this.approximateSize(start, end, options, callback))
-    } else if (this.status !== 'open') {
-      this.nextTick(callback, new ModuleError('Database is not open: cannot call approximateSize()', {
-        code: 'LEVEL_DATABASE_NOT_OPEN'
-      }))
-    } else {
-      const keyEncoding = this.keyEncoding(options && options.keyEncoding)
-      start = keyEncoding.encode(start)
-      end = keyEncoding.encode(end)
-      binding.db_approximate_size(this[kContext], start, end, callback)
-    }
-
-    return callback[kPromise]
-  }
-
-  compactRange (start, end, options, callback) {
-    if (arguments.length < 2 || typeof start === 'function' || typeof end === 'function') {
-      throw new TypeError("The arguments 'start' and 'end' are required")
-    } else if (typeof options === 'function') {
-      callback = options
-      options = null
-    } else if (typeof options !== 'object') {
-      options = null
-    }
-
-    callback = fromCallback(callback, kPromise)
-
-    if (this.status === 'opening') {
-      this.defer(() => this.compactRange(start, end, options, callback))
-    } else if (this.status !== 'open') {
-      this.nextTick(callback, new ModuleError('Database is not open: cannot call compactRange()', {
-        code: 'LEVEL_DATABASE_NOT_OPEN'
-      }))
-    } else {
-      const keyEncoding = this.keyEncoding(options && options.keyEncoding)
-      start = keyEncoding.encode(start)
-      end = keyEncoding.encode(end)
-      binding.db_compact_range(this[kContext], start, end, callback)
-    }
-
-    return callback[kPromise]
+    process.nextTick(callback, binding.batch_do(this[kContext], operations, options))
   }
 
   getProperty (property) {
@@ -164,26 +102,6 @@ class RocksLevel extends AbstractLevel {
   _iterator (options) {
     return new Iterator(this, this[kContext], options)
   }
-
-  static destroy (location, callback) {
-    if (typeof location !== 'string' || location === '') {
-      throw new TypeError("The first argument 'location' must be a non-empty string")
-    }
-
-    callback = fromCallback(callback, kPromise)
-    binding.destroy_db(location, callback)
-    return callback[kPromise]
-  }
-
-  static repair (location, callback) {
-    if (typeof location !== 'string' || location === '') {
-      throw new TypeError("The first argument 'location' must be a non-empty string")
-    }
-
-    callback = fromCallback(callback, kPromise)
-    binding.repair_db(location, callback)
-    return callback[kPromise]
-  }
 }
 
 exports.RocksLevel = RocksLevel