@nxtedition/rocksdb 15.4.1 → 15.5.0

package/deps/rocksdb/rocksdb/options/options_settable_test.cc

@@ -182,6 +182,7 @@ TEST_F(OptionsSettableTest, BlockBasedTableOptionsAllFieldsSettable) {
       "pin_l0_filter_and_index_blocks_in_cache=1;"
       "pin_top_level_index_and_filter=1;"
       "index_type=kHashSearch;"
+      "index_block_search_type=kBinary;"
       "data_block_index_type=kDataBlockBinaryAndHash;"
       "index_shortening=kNoShortening;"
       "data_block_hash_table_util_ratio=0.75;"
@@ -206,7 +207,9 @@ TEST_F(OptionsSettableTest, BlockBasedTableOptionsAllFieldsSettable) {
       "prepopulate_block_cache=kDisable;"
       "initial_auto_readahead_size=0;"
       "num_file_reads_for_auto_readahead=0;"
-      "fail_if_no_udi_on_open=true",
+      "fail_if_no_udi_on_open=true;"
+      "separate_key_value_in_data_block=true;"
+      "uniform_cv_threshold=0.2",
       new_bbto));
 
   ASSERT_EQ(unset_bytes_base,
@@ -292,7 +295,8 @@ TEST_F(OptionsSettableTest, TablePropertiesAllFieldsSettable) {
       "name=64656661756C74;user_defined_timestamps_persisted=1;num_entries=100;"
       "external_sst_file_global_seqno_offset=0;num_merge_operands=0;index_key_"
       "is_user_key=0;key_largest_seqno=18446744073709551615;key_smallest_seqno="
-      "18;",
+      "18;data_block_restart_interval=16;index_block_restart_interval=1;"
+      "separate_key_value_in_data_block=0;",
       new_tp));
 
   // All bytes are set from the parse
@@ -385,102 +389,104 @@ TEST_F(OptionsSettableTest, DBOptionsAllFieldsSettable) {
   ConfigOptions config_options(*options);
   config_options.input_strings_escaped = false;
   config_options.ignore_unknown_options = false;
-  ASSERT_OK(
-      GetDBOptionsFromString(config_options, *options,
-                             "wal_bytes_per_sync=4295048118;"
-                             "delete_obsolete_files_period_micros=4294967758;"
-                             "WAL_ttl_seconds=4295008036;"
-                             "WAL_size_limit_MB=4295036161;"
-                             "max_write_batch_group_size_bytes=1048576;"
-                             "wal_dir=path/to/wal_dir;"
-                             "db_write_buffer_size=2587;"
-                             "max_subcompactions=64330;"
-                             "table_cache_numshardbits=28;"
-                             "max_open_files=72;"
-                             "max_file_opening_threads=35;"
-                             "max_background_jobs=8;"
-                             "max_background_compactions=33;"
-                             "use_fsync=true;"
-                             "use_adaptive_mutex=false;"
-                             "max_total_wal_size=4295005604;"
-                             "compaction_readahead_size=0;"
-                             "keep_log_file_num=4890;"
-                             "skip_stats_update_on_db_open=false;"
-                             "skip_checking_sst_file_sizes_on_db_open=false;"
-                             "max_manifest_file_size=4295009941;"
-                             "max_manifest_space_amp_pct=321;"
-                             "db_log_dir=path/to/db_log_dir;"
-                             "writable_file_max_buffer_size=1048576;"
-                             "paranoid_checks=true;"
-                             "flush_verify_memtable_count=true;"
-                             "compaction_verify_record_count=true;"
-                             "track_and_verify_wals_in_manifest=true;"
-                             "track_and_verify_wals=true;"
-                             "verify_sst_unique_id_in_manifest=true;"
-                             "is_fd_close_on_exec=false;"
-                             "bytes_per_sync=4295013613;"
-                             "strict_bytes_per_sync=true;"
-                             "enable_thread_tracking=false;"
-                             "recycle_log_file_num=0;"
-                             "create_missing_column_families=true;"
-                             "log_file_time_to_roll=3097;"
-                             "max_background_flushes=35;"
-                             "create_if_missing=false;"
-                             "error_if_exists=true;"
-                             "delayed_write_rate=4294976214;"
-                             "manifest_preallocation_size=1222;"
-                             "allow_mmap_writes=false;"
-                             "stats_dump_period_sec=70127;"
-                             "stats_persist_period_sec=54321;"
-                             "persist_stats_to_disk=true;"
-                             "stats_history_buffer_size=14159;"
-                             "allow_fallocate=true;"
-                             "allow_mmap_reads=false;"
-                             "use_direct_reads=false;"
-                             "use_direct_io_for_flush_and_compaction=false;"
-                             "max_log_file_size=4607;"
-                             "advise_random_on_open=true;"
-                             "enable_pipelined_write=false;"
-                             "unordered_write=false;"
-                             "allow_concurrent_memtable_write=true;"
-                             "wal_recovery_mode=kPointInTimeRecovery;"
-                             "enable_write_thread_adaptive_yield=true;"
-                             "write_thread_slow_yield_usec=5;"
-                             "write_thread_max_yield_usec=1000;"
-                             "info_log_level=DEBUG_LEVEL;"
-                             "dump_malloc_stats=false;"
-                             "allow_2pc=false;"
-                             "avoid_flush_during_recovery=false;"
-                             "avoid_flush_during_shutdown=false;"
-                             "allow_ingest_behind=false;"
-                             "concurrent_prepare=false;"
-                             "two_write_queues=false;"
-                             "manual_wal_flush=false;"
-                             "wal_compression=kZSTD;"
-                             "background_close_inactive_wals=true;"
-                             "seq_per_batch=false;"
-                             "atomic_flush=false;"
-                             "avoid_unnecessary_blocking_io=false;"
-                             "log_readahead_size=0;"
-                             "write_dbid_to_manifest=false;"
-                             "best_efforts_recovery=false;"
-                             "max_bgerror_resume_count=2;"
-                             "bgerror_resume_retry_interval=1000000;"
-                             "db_host_id=hostname;"
-                             "lowest_used_cache_tier=kNonVolatileBlockTier;"
-                             "allow_data_in_errors=false;"
-                             "enforce_single_del_contracts=false;"
-                             "daily_offpeak_time_utc=08:30-19:00;"
-                             "follower_refresh_catchup_period_ms=123;"
-                             "follower_catchup_retry_count=456;"
-                             "follower_catchup_retry_wait_ms=789;"
-                             "metadata_write_temperature=kCold;"
-                             "wal_write_temperature=kHot;"
-                             "background_close_inactive_wals=true;"
-                             "write_dbid_to_manifest=true;"
-                             "write_identity_file=true;"
-                             "prefix_seek_opt_in_only=true;",
-                             new_options));
+  ASSERT_OK(GetDBOptionsFromString(
+      config_options, *options,
+      "wal_bytes_per_sync=4295048118;"
+      "delete_obsolete_files_period_micros=4294967758;"
+      "WAL_ttl_seconds=4295008036;"
+      "WAL_size_limit_MB=4295036161;"
+      "max_write_batch_group_size_bytes=1048576;"
+      "wal_dir=path/to/wal_dir;"
+      "db_write_buffer_size=2587;"
+      "max_subcompactions=64330;"
+      "table_cache_numshardbits=28;"
+      "max_open_files=72;"
+      "max_file_opening_threads=35;"
+      "max_background_jobs=8;"
+      "max_background_compactions=33;"
+      "use_fsync=true;"
+      "use_adaptive_mutex=false;"
+      "max_total_wal_size=4295005604;"
+      "compaction_readahead_size=0;"
+      "keep_log_file_num=4890;"
+      "skip_stats_update_on_db_open=false;"
+      "max_manifest_file_size=4295009941;"
+      "max_manifest_space_amp_pct=321;"
+      "db_log_dir=path/to/db_log_dir;"
+      "writable_file_max_buffer_size=1048576;"
+      "paranoid_checks=true;"
+      "open_files_async=true;"
+      "flush_verify_memtable_count=true;"
+      "compaction_verify_record_count=true;"
+      "track_and_verify_wals_in_manifest=true;"
+      "track_and_verify_wals=true;"
+      "verify_sst_unique_id_in_manifest=true;"
+      "is_fd_close_on_exec=false;"
+      "bytes_per_sync=4295013613;"
+      "strict_bytes_per_sync=true;"
+      "enable_thread_tracking=false;"
+      "recycle_log_file_num=0;"
+      "create_missing_column_families=true;"
+      "log_file_time_to_roll=3097;"
+      "max_background_flushes=35;"
+      "create_if_missing=false;"
+      "error_if_exists=true;"
+      "delayed_write_rate=4294976214;"
+      "manifest_preallocation_size=1222;"
+      "allow_mmap_writes=false;"
+      "stats_dump_period_sec=70127;"
+      "stats_persist_period_sec=54321;"
+      "persist_stats_to_disk=true;"
+      "stats_history_buffer_size=14159;"
+      "allow_fallocate=true;"
+      "allow_mmap_reads=false;"
+      "use_direct_reads=false;"
+      "use_direct_io_for_flush_and_compaction=false;"
+      "max_log_file_size=4607;"
+      "advise_random_on_open=true;"
+      "enable_pipelined_write=false;"
+      "unordered_write=false;"
+      "allow_concurrent_memtable_write=true;"
+      "wal_recovery_mode=kPointInTimeRecovery;"
+      "enable_write_thread_adaptive_yield=true;"
+      "write_thread_slow_yield_usec=5;"
+      "write_thread_max_yield_usec=1000;"
+      "info_log_level=DEBUG_LEVEL;"
+      "dump_malloc_stats=false;"
+      "allow_2pc=false;"
+      "avoid_flush_during_recovery=false;"
+      "enforce_write_buffer_manager_during_recovery=true;"
+      "avoid_flush_during_shutdown=false;"
+      "allow_ingest_behind=false;"
+      "concurrent_prepare=false;"
+      "two_write_queues=false;"
+      "manual_wal_flush=false;"
+      "wal_compression=kZSTD;"
+      "background_close_inactive_wals=true;"
+      "seq_per_batch=false;"
+      "atomic_flush=false;"
+      "avoid_unnecessary_blocking_io=false;"
+      "log_readahead_size=0;"
+      "write_dbid_to_manifest=false;"
+      "best_efforts_recovery=false;"
+      "max_bgerror_resume_count=2;"
+      "bgerror_resume_retry_interval=1000000;"
+      "db_host_id=hostname;"
+      "lowest_used_cache_tier=kNonVolatileBlockTier;"
+      "allow_data_in_errors=false;"
+      "enforce_single_del_contracts=false;"
+      "daily_offpeak_time_utc=08:30-19:00;"
+      "follower_refresh_catchup_period_ms=123;"
+      "follower_catchup_retry_count=456;"
+      "follower_catchup_retry_wait_ms=789;"
+      "metadata_write_temperature=kCold;"
+      "wal_write_temperature=kHot;"
+      "background_close_inactive_wals=true;"
+      "write_dbid_to_manifest=true;"
+      "write_identity_file=true;"
+      "verify_manifest_content_on_close=false;"
+      "prefix_seek_opt_in_only=true;",
+      new_options));
 
   ASSERT_EQ(unset_bytes_base, NumUnsetBytes(new_options_ptr, sizeof(DBOptions),
                                             kDBOptionsExcluded));
@@ -508,7 +514,7 @@ TEST_F(OptionsSettableTest, ColumnFamilyOptionsAllFieldsSettable) {
   // ColumnFamilyOptions.
   const OffsetGap kColumnFamilyOptionsExcluded = {
       {offsetof(struct ColumnFamilyOptions, inplace_callback),
-       sizeof(UpdateStatus(*)(char*, uint32_t*, Slice, std::string*))},
+       sizeof(UpdateStatus (*)(char*, uint32_t*, Slice, std::string*))},
       {offsetof(struct ColumnFamilyOptions,
                 memtable_insert_with_hint_prefix_extractor),
        sizeof(std::shared_ptr<const SliceTransform>)},
@@ -541,8 +547,6 @@ TEST_F(OptionsSettableTest, ColumnFamilyOptionsAllFieldsSettable) {
        sizeof(std::shared_ptr<CompressionManager>)},
       {offsetof(struct ColumnFamilyOptions, prefix_extractor),
        sizeof(std::shared_ptr<const SliceTransform>)},
-      {offsetof(struct ColumnFamilyOptions, snap_refresh_nanos),
-       sizeof(uint64_t)},
       {offsetof(struct ColumnFamilyOptions, table_factory),
        sizeof(std::shared_ptr<TableFactory>)},
       {offsetof(struct ColumnFamilyOptions, cf_paths),
@@ -677,7 +681,8 @@ TEST_F(OptionsSettableTest, ColumnFamilyOptionsAllFieldsSettable) {
       "preserve_internal_time_seconds=86400;"
       "compaction_options_fifo={max_table_files_size=3;allow_"
       "compaction=true;age_for_warm=0;file_temperature_age_thresholds={{"
-      "temperature=kCold;age=12345}};};"
+      "temperature=kCold;age=12345}};max_data_files_size=1073741824;"
+      "use_kv_ratio_compaction=false;};"
       "blob_cache=1M;"
       "memtable_protection_bytes_per_key=2;"
       "persist_user_defined_timestamps=true;"
@@ -690,7 +695,8 @@ TEST_F(OptionsSettableTest, ColumnFamilyOptionsAllFieldsSettable) {
       "memtable_op_scan_flush_trigger=123;"
       "memtable_avg_op_scan_flush_trigger=12;"
       "cf_allow_ingest_behind=1;"
-      "verify_output_flags=2049;",
+      "memtable_batch_lookup_optimization=1;"
+      "verify_output_flags=2053;",
       new_options));
 
   ASSERT_NE(new_options->blob_cache.get(), nullptr);

package/deps/rocksdb/rocksdb/options/options_test.cc

@@ -1752,6 +1752,19 @@ TEST_F(OptionsTest, MutableCFOptions) {
       config_options, cf_opts, {{"paranoid_file_checks", "false"}}, &cf_opts));
   ASSERT_EQ(cf_opts.paranoid_file_checks, false);
 
+  // Test verify_output_flags with kVerifyFileChecksum (bit 2)
+  // 2052 = 4 (kVerifyFileChecksum) | 2048 (kEnableForRemoteCompaction)
+  ASSERT_OK(GetColumnFamilyOptionsFromString(
+      config_options, cf_opts, "verify_output_flags=2052;", &cf_opts));
+  ASSERT_NE(
+      (cf_opts.verify_output_flags & VerifyOutputFlags::kVerifyFileChecksum),
+      VerifyOutputFlags::kVerifyNone);
+  ASSERT_NE((cf_opts.verify_output_flags &
+             VerifyOutputFlags::kEnableForRemoteCompaction),
+            VerifyOutputFlags::kVerifyNone);
+  ASSERT_EQ(
+      (cf_opts.verify_output_flags & VerifyOutputFlags::kVerifyBlockChecksum),
+      VerifyOutputFlags::kVerifyNone);
   // Should replace the factory with the new setting
   ASSERT_OK(GetColumnFamilyOptionsFromMap(
       config_options, cf_opts,
@@ -2417,6 +2430,7 @@ TEST_F(OptionsOldApiTest, GetOptionsFromMapTest) {
       {"max_compaction_bytes", "21"},
       {"soft_rate_limit", "1.1"},
       {"hard_rate_limit", "2.1"},
+      {"snap_refresh_nanos", "1000000"},
       {"rate_limit_delay_max_milliseconds", "100"},
       {"hard_pending_compaction_bytes_limit", "211"},
       {"arena_block_size", "22"},

package/deps/rocksdb/rocksdb/port/jemalloc_helper.h

@@ -59,33 +59,31 @@ static inline bool HasJemalloc() { return true; }
 
 // Declare non-standard jemalloc APIs as weak symbols. We can null-check these
 // symbols to detect whether jemalloc is linked with the binary.
-extern "C" JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN void JEMALLOC_NOTHROW *
+extern "C" JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN void JEMALLOC_NOTHROW*
 mallocx(size_t, int) JEMALLOC_ATTR(malloc) JEMALLOC_ALLOC_SIZE(1)
     __attribute__((__weak__));
-extern "C" JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN void JEMALLOC_NOTHROW *
-rallocx(void *, size_t, int) JEMALLOC_ALLOC_SIZE(2) __attribute__((__weak__));
-extern "C" size_t JEMALLOC_NOTHROW xallocx(void *, size_t, size_t, int)
+extern "C" JEMALLOC_ALLOCATOR JEMALLOC_RESTRICT_RETURN void JEMALLOC_NOTHROW*
+rallocx(void*, size_t, int) JEMALLOC_ALLOC_SIZE(2) __attribute__((__weak__));
+extern "C" size_t JEMALLOC_NOTHROW xallocx(void*, size_t, size_t, int)
     __attribute__((__weak__));
-extern "C" size_t JEMALLOC_NOTHROW sallocx(const void *, int)
-    JEMALLOC_ATTR(pure) __attribute__((__weak__));
-extern "C" void JEMALLOC_NOTHROW dallocx(void *, int) __attribute__((__weak__));
-extern "C" void JEMALLOC_NOTHROW sdallocx(void *, size_t, int)
+extern "C" size_t JEMALLOC_NOTHROW sallocx(const void*, int) JEMALLOC_ATTR(pure)
+    __attribute__((__weak__));
+extern "C" void JEMALLOC_NOTHROW dallocx(void*, int) __attribute__((__weak__));
+extern "C" void JEMALLOC_NOTHROW sdallocx(void*, size_t, int)
     __attribute__((__weak__));
 extern "C" size_t JEMALLOC_NOTHROW nallocx(size_t, int) JEMALLOC_ATTR(pure)
     __attribute__((__weak__));
-extern "C" int JEMALLOC_NOTHROW mallctl(const char *, void *, size_t *, void *,
+extern "C" int JEMALLOC_NOTHROW mallctl(const char*, void*, size_t*, void*,
                                         size_t) __attribute__((__weak__));
-extern "C" int JEMALLOC_NOTHROW mallctlnametomib(const char *, size_t *,
-                                                 size_t *)
-    __attribute__((__weak__));
-extern "C" int JEMALLOC_NOTHROW mallctlbymib(const size_t *, size_t, void *,
-                                             size_t *, void *, size_t)
+extern "C" int JEMALLOC_NOTHROW mallctlnametomib(const char*, size_t*, size_t*)
     __attribute__((__weak__));
-extern "C" void JEMALLOC_NOTHROW
-malloc_stats_print(void (*)(void *, const char *), void *, const char *)
+extern "C" int JEMALLOC_NOTHROW mallctlbymib(const size_t*, size_t, void*,
+                                             size_t*, void*, size_t)
     __attribute__((__weak__));
+extern "C" void JEMALLOC_NOTHROW malloc_stats_print(
+    void (*)(void*, const char*), void*, const char*) __attribute__((__weak__));
 extern "C" size_t JEMALLOC_NOTHROW
-malloc_usable_size(JEMALLOC_USABLE_SIZE_CONST void *) JEMALLOC_CXX_THROW
+malloc_usable_size(JEMALLOC_USABLE_SIZE_CONST void*) JEMALLOC_CXX_THROW
     __attribute__((__weak__));
 
 // Check if Jemalloc is linked with the binary. Note the main program might be

package/deps/rocksdb/rocksdb/port/lang.h

@@ -69,6 +69,10 @@ constexpr bool kMustFreeHeapAllocations = false;
 #define TSAN_SUPPRESSION
 #endif  // TSAN_SUPPRESSION
 
+// Fail in debug build with a useful message, for automatically grouping
+// related failures
+#define DEBUG_FAIL(msg) assert(false && msg)
+
 // Compile-time CPU feature testing compatibility
 //
 // A way to be extra sure these defines have been included.

package/deps/rocksdb/rocksdb/port/port_example.h

@@ -74,28 +74,5 @@ using OnceType = intptr_t;
 #define LEVELDB_ONCE_INIT 0
 void InitOnce(port::OnceType*, void (*initializer)());
 
-// ------------------ Compression -------------------
-
-// Store the snappy compression of "input[0,input_length-1]" in *output.
-// Returns false if snappy is not supported by this port.
-bool Snappy_Compress(const char* input, size_t input_length,
-                     std::string* output);
-
-// If input[0,input_length-1] looks like a valid snappy compressed
-// buffer, store the size of the uncompressed data in *result and
-// return true.  Else return false.
-bool Snappy_GetUncompressedLength(const char* input, size_t length,
-                                  size_t* result);
-
-// Attempt to snappy uncompress input[0,input_length-1] into *output.
-// Returns true if successful, false if the input is invalid lightweight
-// compressed data.
-//
-// REQUIRES: at least the first "n" bytes of output[] must be writable
-// where "n" is the result of a successful call to
-// Snappy_GetUncompressedLength.
-bool Snappy_Uncompress(const char* input_data, size_t input_length,
-                       char* output);
-
 }  // namespace port
 }  // namespace ROCKSDB_NAMESPACE

package/deps/rocksdb/rocksdb/port/stack_trace.cc

@@ -18,6 +18,7 @@ void PrintAndFreeStack(void* /*callstack*/, int /*num_frames*/) {}
 void* SaveStack(int* /*num_frames*/, int /*first_frames_to_skip*/) {
   return nullptr;
 }
+void RegisterCrashCallback(CrashCallback /*callback*/) {}
 }  // namespace port
 }  // namespace ROCKSDB_NAMESPACE
 
@@ -320,6 +321,7 @@ void* SaveStack(int* num_frames, int first_frames_to_skip) {
 static std::atomic<uint64_t> g_thread_handling_stack_trace{0};
 static int g_recursion_count = 0;
 static std::atomic<bool> g_at_exit_called{false};
+static std::atomic<CrashCallback> g_crash_callback{nullptr};
 
 static void StackTraceHandler(int sig) {
   fprintf(stderr, "Received signal %d (%s)\n", sig, strsignal(sig));
@@ -360,6 +362,12 @@ static void StackTraceHandler(int sig) {
       fprintf(stderr, "In a race with process already exiting...\n");
     }
 
+    // Invoke registered crash callback before printing stack trace
+    auto callback = g_crash_callback.load(std::memory_order_acquire);
+    if (callback) {
+      callback();
+    }
+
     // skip the top three signal handler related frames
     PrintStack(3);
 
@@ -398,13 +406,41 @@ static void AtExit() {
   g_at_exit_called.store(true, std::memory_order_release);
 }
 
+// Lightweight handler for graceful termination signals (SIGTERM, SIGINT).
+// Prints the crash callback (e.g., ring buffer) but skips the
+// expensive GDB/LLDB stack trace, since these are intentional terminations.
+static void TerminationHandler(int sig) {
+  char buf[64];
+  int len = snprintf(buf, sizeof(buf), "Received signal %d (%s)\n", sig,
+                     strsignal(sig));
+  if (len > 0) {
+    auto unused __attribute__((unused)) = write(STDOUT_FILENO, buf, len);
+  }
+  auto callback = g_crash_callback.load(std::memory_order_acquire);
+  if (callback) {
+    callback();
+  }
+  signal(sig, SIG_DFL);
+  raise(sig);
+}
+
+void RegisterCrashCallback(CrashCallback callback) {
+  g_crash_callback.store(callback, std::memory_order_release);
+}
+
 void InstallStackTraceHandler() {
   // just use the plain old signal as it's simple and sufficient
   // for this use case
+  // Crash signals — invoke full stack trace + ring buffer
   signal(SIGILL, StackTraceHandler);
   signal(SIGSEGV, StackTraceHandler);
   signal(SIGBUS, StackTraceHandler);
   signal(SIGABRT, StackTraceHandler);
+  signal(SIGFPE, StackTraceHandler);
+  signal(SIGQUIT, StackTraceHandler);
+  // Termination signals — print ring buffer only, no stack trace
+  signal(SIGTERM, TerminationHandler);
+  signal(SIGINT, TerminationHandler);
   atexit(AtExit);
   // Allow ouside debugger to attach, even with Yama security restrictions.
   // This is needed even outside of PrintStack() so that external mechanisms

package/deps/rocksdb/rocksdb/port/stack_trace.h

@@ -27,5 +27,14 @@ void PrintAndFreeStack(void* callstack, int num_frames);
 // Save the current callstack
 void* SaveStack(int* num_frame, int first_frames_to_skip = 0);
 
+// Register a callback to be invoked when a fatal signal is received,
+// before the stack trace is printed. This is useful for printing diagnostic
+// information (e.g., recently injected errors) when a crash occurs.
+// The callback must only call async-signal-safe functions (write, snprintf,
+// etc.) or functions that are safe enough in practice (fprintf to stderr).
+// Only one callback is supported; subsequent calls overwrite the previous one.
+using CrashCallback = void (*)();
+void RegisterCrashCallback(CrashCallback callback);
+
 }  // namespace port
 }  // namespace ROCKSDB_NAMESPACE

package/deps/rocksdb/rocksdb/src.mk

@@ -96,6 +96,7 @@ LIB_SOURCES =                                                   \
   db/version_edit.cc                                            \
   db/version_edit_handler.cc                                    \
   db/version_set.cc                                             \
+  db/version_util.cc                                            \
   db/wal_edit.cc                                                \
   db/wal_manager.cc                                             \
   db/wide/wide_column_serialization.cc                          \
@@ -182,6 +183,7 @@ LIB_SOURCES =                                                   \
   table/block_based/block_based_table_builder.cc                \
   table/block_based/block_based_table_factory.cc                \
   table/block_based/block_based_table_iterator.cc               \
+  table/block_based/multi_scan_index_iterator.cc                \
   table/block_based/block_based_table_reader.cc                 \
   table/block_based/block_builder.cc                            \
   table/block_based/block_cache.cc                              \
@@ -264,6 +266,7 @@ LIB_SOURCES =                                                   \
   util/string_util.cc                                           \
   util/thread_local.cc                                          \
   util/threadpool_imp.cc                                        \
+  util/io_dispatcher_imp.cc                                     \
   util/udt_util.cc                                              \
   util/write_batch_util.cc                                      \
   util/xxhash.cc                                                \
@@ -332,6 +335,9 @@ LIB_SOURCES =                                                   \
   utilities/transactions/write_unprepared_txn.cc                \
   utilities/transactions/write_unprepared_txn_db.cc             \
   utilities/ttl/db_ttl_impl.cc                                  \
+  utilities/trie_index/bitvector.cc                              \
+  utilities/trie_index/louds_trie.cc                             \
+  utilities/trie_index/trie_index_factory.cc                     \
   utilities/types_util.cc                                       \
   utilities/wal_filter.cc                                       \
   utilities/write_batch_with_index/write_batch_with_index.cc    \
@@ -489,6 +495,7 @@ TEST_MAIN_SOURCES =                                                     \
   db/db_basic_test.cc                                                   \
   db/db_block_cache_test.cc                                             \
   db/db_bloom_filter_test.cc                                            \
+  db/db_compaction_abort_test.cc                                        \
   db/db_compaction_filter_test.cc                                       \
   db/db_compaction_test.cc                                              \
   db/db_clip_test.cc                                                    \
@@ -620,6 +627,7 @@ TEST_MAIN_SOURCES =                                                     \
   util/hash_test.cc                                                     \
   util/heap_test.cc                                                     \
   util/interval_test.cc                                                 \
+  util/io_dispatcher_test.cc                                            \
   util/random_test.cc                                                   \
   util/rate_limiter_test.cc                                             \
   util/repeatable_thread_test.cc                                        \
@@ -641,6 +649,7 @@ TEST_MAIN_SOURCES =                                                     \
   utilities/cassandra/cassandra_serialize_test.cc                       \
   utilities/checkpoint/checkpoint_test.cc                               \
   utilities/env_timed_test.cc                                           \
+  utilities/fault_injection_fs_test.cc                                  \
   utilities/memory/memory_test.cc                                       \
   utilities/merge_operators/string_append/stringappend_test.cc          \
   utilities/object_registry_test.cc                                     \
@@ -658,10 +667,13 @@ TEST_MAIN_SOURCES =                                                     \
   utilities/transactions/lock/point/point_lock_manager_test.cc          \
   utilities/transactions/lock/point/point_lock_manager_stress_test.cc   \
   utilities/transactions/write_prepared_transaction_test.cc             \
+  utilities/transactions/write_prepared_transaction_seqno_test.cc       \
   utilities/transactions/write_unprepared_transaction_test.cc           \
   utilities/transactions/write_committed_transaction_ts_test.cc         \
   utilities/transactions/timestamped_snapshot_test.cc                   \
   utilities/ttl/ttl_test.cc                                             \
+  utilities/trie_index/trie_index_db_test.cc                            \
+  utilities/trie_index/trie_index_test.cc                               \
   utilities/types_util_test.cc                                          \
   utilities/util_merge_operators_test.cc                                \
   utilities/write_batch_with_index/write_batch_with_index_test.cc       \

package/deps/rocksdb/rocksdb/table/adaptive/adaptive_table_factory.cc

@@ -51,8 +51,7 @@ Status AdaptiveTableFactory::NewTableReader(
       footer.table_magic_number() == kLegacyPlainTableMagicNumber) {
     return plain_table_factory_->NewTableReader(
         table_reader_options, std::move(file), file_size, table);
-  } else if (footer.table_magic_number() == kBlockBasedTableMagicNumber ||
-             footer.table_magic_number() == kLegacyBlockBasedTableMagicNumber) {
+  } else if (footer.table_magic_number() == kBlockBasedTableMagicNumber) {
     return block_based_table_factory_->NewTableReader(
         ro, table_reader_options, std::move(file), file_size, table,
         prefetch_index_and_filter_in_cache);

package/deps/rocksdb/rocksdb/table/block_based/binary_search_index_reader.cc

@@ -63,7 +63,8 @@ InternalIteratorBase<IndexValue>* BinarySearchIndexReader::NewIterator(
       internal_comparator()->user_comparator(),
       rep->get_global_seqno(BlockType::kIndex), iter, kNullStats, true,
       index_has_first_key(), index_key_includes_seq(), index_value_is_full(),
-      false /* block_contents_pinned */, user_defined_timestamps_persisted());
+      false /* block_contents_pinned */, user_defined_timestamps_persisted(),
+      nullptr /* prefix_index */, rep->table_options.index_block_search_type);
 
   assert(it != nullptr);
   index_block.TransferTo(it);