@nxtedition/rocksdb 9.0.0 → 9.0.1

package/deps/rocksdb/rocksdb/utilities/write_batch_with_index/write_batch_with_index_test.cc

@@ -7,7 +7,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file. See the AUTHORS file for names of contributors.
 
-
 #include "rocksdb/utilities/write_batch_with_index.h"
 
 #include <map>
@@ -1641,6 +1640,104 @@ TEST_P(WriteBatchWithIndexTest, TestNewIteratorWithBaseFromWbwi) {
   ASSERT_OK(iter->status());
 }
 
+TEST_P(WriteBatchWithIndexTest, TestBoundsCheckingInDeltaIterator) {
+  Status s = OpenDB();
+  ASSERT_OK(s);
+
+  KVMap empty_map;
+
+  // writes that should be observed by BaseDeltaIterator::delta_iterator_
+  ASSERT_OK(batch_->Put("a", "aa"));
+  ASSERT_OK(batch_->Put("b", "bb"));
+  ASSERT_OK(batch_->Put("c", "cc"));
+
+  ReadOptions ro;
+
+  auto check_only_b_is_visible = [&]() {
+    std::unique_ptr<Iterator> iter(batch_->NewIteratorWithBase(
+        db_->DefaultColumnFamily(), new KVIter(&empty_map), &ro));
+
+    // move to the lower bound
+    iter->SeekToFirst();
+    ASSERT_EQ("b", iter->key());
+    iter->Prev();
+    ASSERT_FALSE(iter->Valid());
+
+    // move to the upper bound
+    iter->SeekToLast();
+    ASSERT_EQ("b", iter->key());
+    iter->Next();
+    ASSERT_FALSE(iter->Valid());
+
+    // test bounds checking in Seek and SeekForPrev
+    iter->Seek(Slice("a"));
+    ASSERT_EQ("b", iter->key());
+    iter->Seek(Slice("b"));
+    ASSERT_EQ("b", iter->key());
+    iter->Seek(Slice("c"));
+    ASSERT_FALSE(iter->Valid());
+
+    iter->SeekForPrev(Slice("c"));
+    ASSERT_EQ("b", iter->key());
+    iter->SeekForPrev(Slice("b"));
+    ASSERT_EQ("b", iter->key());
+    iter->SeekForPrev(Slice("a"));
+    ASSERT_FALSE(iter->Valid());
+
+    iter->SeekForPrev(
+        Slice("a.1"));  // a non-existent key that is smaller than "b"
+    ASSERT_FALSE(iter->Valid());
+
+    iter->Seek(Slice("b.1"));  // a non-existent key that is greater than "b"
+    ASSERT_FALSE(iter->Valid());
+
+    delete ro.iterate_lower_bound;
+    delete ro.iterate_upper_bound;
+  };
+
+  ro.iterate_lower_bound = new Slice("b");
+  ro.iterate_upper_bound = new Slice("c");
+  check_only_b_is_visible();
+
+  ro.iterate_lower_bound = new Slice("a.1");
+  ro.iterate_upper_bound = new Slice("c");
+  check_only_b_is_visible();
+
+  ro.iterate_lower_bound = new Slice("b");
+  ro.iterate_upper_bound = new Slice("b.2");
+  check_only_b_is_visible();
+}
+
+TEST_P(WriteBatchWithIndexTest,
+       TestBoundsCheckingInSeekToFirstAndLastOfDeltaIterator) {
+  Status s = OpenDB();
+  ASSERT_OK(s);
+  KVMap empty_map;
+  // writes that should be observed by BaseDeltaIterator::delta_iterator_
+  ASSERT_OK(batch_->Put("c", "cc"));
+
+  ReadOptions ro;
+  auto check_nothing_visible = [&]() {
+    std::unique_ptr<Iterator> iter(batch_->NewIteratorWithBase(
+        db_->DefaultColumnFamily(), new KVIter(&empty_map), &ro));
+    iter->SeekToFirst();
+    ASSERT_FALSE(iter->Valid());
+    iter->SeekToLast();
+    ASSERT_FALSE(iter->Valid());
+
+    delete ro.iterate_lower_bound;
+    delete ro.iterate_upper_bound;
+  };
+
+  ro.iterate_lower_bound = new Slice("b");
+  ro.iterate_upper_bound = new Slice("c");
+  check_nothing_visible();
+
+  ro.iterate_lower_bound = new Slice("d");
+  ro.iterate_upper_bound = new Slice("e");
+  check_nothing_visible();
+}
+
 TEST_P(WriteBatchWithIndexTest, SavePointTest) {
   ColumnFamilyHandleImplDummy cf1(1, BytewiseComparator());
   KVMap empty_map;
@@ -2248,6 +2345,8 @@ TEST_F(WBWIOverwriteTest, TestBadMergeOperator) {
 }
 
 TEST_P(WriteBatchWithIndexTest, ColumnFamilyWithTimestamp) {
+  ASSERT_OK(OpenDB());
+
   ColumnFamilyHandleImplDummy cf2(2,
                                   test::BytewiseComparatorWithU64TsWrapper());
 
@@ -2263,10 +2362,9 @@ TEST_P(WriteBatchWithIndexTest, ColumnFamilyWithTimestamp) {
                   .IsInvalidArgument());
   {
     std::string value;
-    ASSERT_TRUE(batch_
-                    ->GetFromBatchAndDB(
-                        /*db=*/nullptr, ReadOptions(), &cf2, "key", &value)
-                    .IsInvalidArgument());
+    ASSERT_TRUE(
+        batch_->GetFromBatchAndDB(db_, ReadOptions(), &cf2, "key", &value)
+            .IsInvalidArgument());
   }
   {
     constexpr size_t num_keys = 2;
@@ -2275,8 +2373,8 @@ TEST_P(WriteBatchWithIndexTest, ColumnFamilyWithTimestamp) {
         {PinnableSlice(), PinnableSlice()}};
     std::array<Status, num_keys> statuses{{Status(), Status()}};
     constexpr bool sorted_input = false;
-    batch_->MultiGetFromBatchAndDB(/*db=*/nullptr, ReadOptions(), &cf2,
-                                   num_keys, keys.data(), pinnable_vals.data(),
+    batch_->MultiGetFromBatchAndDB(db_, ReadOptions(), &cf2, num_keys,
+                                   keys.data(), pinnable_vals.data(),
                                    statuses.data(), sorted_input);
     for (const auto& s : statuses) {
       ASSERT_TRUE(s.IsInvalidArgument());
@@ -2406,4 +2504,3 @@ int main(int argc, char** argv) {
   ::testing::InitGoogleTest(&argc, argv);
   return RUN_ALL_TESTS();
 }
-

package/deps/rocksdb/rocksdb.gyp

@@ -36,7 +36,7 @@
               "rocksdb/port/win/env_default.cc",
               "rocksdb/port/win/port_win.cc",
               "rocksdb/port/win/win_logger.cc",
-              "rocksdb/port/win/win_thread.cc"
+              "rocksdb/port/win/win_thread.cc",
             ],
             "msvs_settings": {
               "VCCLCompilerTool": {
@@ -170,6 +170,7 @@
         "rocksdb/cache/secondary_cache.cc",
         "rocksdb/cache/secondary_cache_adapter.cc",
         "rocksdb/cache/sharded_cache.cc",
+        "rocksdb/cache/tiered_secondary_cache.cc",
         "rocksdb/db/arena_wrapped_db_iter.cc",
         "rocksdb/db/blob/blob_contents.cc",
         "rocksdb/db/blob/blob_fetcher.cc",
@@ -252,6 +253,7 @@
         "rocksdb/db/wal_manager.cc",
         "rocksdb/db/wide/wide_column_serialization.cc",
         "rocksdb/db/wide/wide_columns.cc",
+        "rocksdb/db/wide/wide_columns_helper.cc",
         "rocksdb/db/write_batch.cc",
         "rocksdb/db/write_batch_base.cc",
         "rocksdb/db/write_controller.cc",
@@ -389,7 +391,7 @@
         "rocksdb/util/compression_context_cache.cc",
         "rocksdb/util/concurrent_task_limiter_impl.cc",
         "rocksdb/util/crc32c.cc",
-        "rocksdb/util/crc32c_arm64.cc",
+				"rocksdb/util/crc32c_arm64.cc",
         "rocksdb/util/data_structure.cc",
         "rocksdb/util/dynamic_bloom.cc",
         "rocksdb/util/hash.cc",

package/index.js

@@ -55,8 +55,6 @@ class RocksLevel extends AbstractLevel {
         utf8: true
       },
       seek: true,
-      createIfMissing: true,
-      errorIfExists: true,
       additionalMethods: {
         updates: true,
         query: true
@@ -294,12 +292,6 @@ class RocksLevel extends AbstractLevel {
       this[kUnref]()
     }
   }
-
-  async flushWal (options) {
-    return new Promise((resolve, reject) => {
-      binding.db_flush_wal(this[kContext], options ?? {}, (err, val) => err ? reject(err) : resolve(val))
-    })
-  }
 }
 
 exports.RocksLevel = RocksLevel

package/package.json

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

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

@@ -1,7 +0,0 @@
-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

@@ -1,29 +0,0 @@
-# - 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

@@ -1,29 +0,0 @@
-# - 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

@@ -1,29 +0,0 @@
-# - 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

@@ -1,33 +0,0 @@
-# - 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

@@ -1,29 +0,0 @@
-# - 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

@@ -1,29 +0,0 @@
-# - 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

@@ -1,26 +0,0 @@
-# - 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

@@ -1,29 +0,0 @@
-# - 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

@@ -1,10 +0,0 @@
-# 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()