Update version to 8.8.1

Make CacheWithSecondaryAdapter reservation accounting more robust (#12059 )
Summary: `CacheWithSecondaryAdapter` can distribute placeholder reservations across the primary and secondary caches. The current implementation of the accounting is quite complicated in order to avoid using a mutex. This may cause the accounting to be slightly off after changes to the cache capacity and ratio, resulting in assertion failures. There's also a bug in the unlikely event that the total reservation exceeds the cache capacity. Furthermore, the current implementation is difficult to reason about. This PR simplifies it by doing the accounting while holding a mutex. The reservations are processed in 1MB chunks in order to avoid taking a lock too frequently. As a side effect, this also removes the restriction of not allowing to increase the compressed secondary cache capacity after decreasing it to 0. Pull Request resolved: https://github.com/facebook/rocksdb/pull/12059 Test Plan: Existing unit tests, and a new test for capacity increase from 0 Reviewed By: pdillinger Differential Revision: D51278686 Pulled By: anand1976 fbshipit-source-id: 7e1ad2c50694772997072dd59cab35c93c12ba4f
2026-11-07 03:22:34 -05:00 · 2023-11-17 15:25:29 -08:00 · 2023-11-17 12:55:45 -08:00 · 2023-10-31 22:03:03 -07:00 · 2023-10-31 21:59:19 -07:00 · 2023-10-31 18:26:24 -07:00
333 changed files with 4025 additions and 11680 deletions
@@ -54,7 +54,6 @@ commands:
          command: |
            echo "Installing CMake..."
            choco install cmake --installargs 'ADD_CMAKE_TO_PATH=System' -y
-            choco install liberica8jdk -y
            mkdir $Env:THIRDPARTY_HOME
            cd $Env:THIRDPARTY_HOME
            echo "Building Snappy dependency..."
@@ -68,7 +67,6 @@ commands:
      - run:
          name: "Build RocksDB"
          command: |
-            $env:Path = $env:JAVA_HOME + ";" + $env:Path
            mkdir build
            cd build
            & $Env:CMAKE_BIN -G "$Env:CMAKE_GENERATOR" -DCMAKE_BUILD_TYPE=Debug -DOPTDBG=1 -DPORTABLE="$Env:CMAKE_PORTABLE" -DSNAPPY=1 -DJNI=1 ..
@@ -577,7 +575,6 @@ jobs:
      CMAKE_HOME: C:/Program Files/CMake
      CMAKE_BIN: C:/Program Files/CMake/bin/cmake.exe
      CTEST_BIN: C:/Program Files/CMake/bin/ctest.exe
-      JAVA_HOME: C:/Program Files/BellSoft/LibericaJDK-8
      SNAPPY_HOME: C:/Users/circleci/thirdparty/snappy-1.1.8
      SNAPPY_INCLUDE: C:/Users/circleci/thirdparty/snappy-1.1.8;C:/Users/circleci/thirdparty/snappy-1.1.8/build
      SNAPPY_LIB_DEBUG: C:/Users/circleci/thirdparty/snappy-1.1.8/build/Debug/snappy.lib
@@ -595,7 +592,6 @@ jobs:
      CMAKE_HOME: C:/Program Files/CMake
      CMAKE_BIN: C:/Program Files/CMake/bin/cmake.exe
      CTEST_BIN: C:/Program Files/CMake/bin/ctest.exe
-      JAVA_HOME: C:/Program Files/BellSoft/LibericaJDK-8
      SNAPPY_HOME: C:/Users/circleci/thirdparty/snappy-1.1.8
      SNAPPY_INCLUDE: C:/Users/circleci/thirdparty/snappy-1.1.8;C:/Users/circleci/thirdparty/snappy-1.1.8/build
      SNAPPY_LIB_DEBUG: C:/Users/circleci/thirdparty/snappy-1.1.8/build/Debug/snappy.lib
@@ -613,7 +609,6 @@ jobs:
      CMAKE_HOME: C:/Program Files/CMake
      CMAKE_BIN: C:/Program Files/CMake/bin/cmake.exe
      CTEST_BIN: C:/Program Files/CMake/bin/ctest.exe
-      JAVA_HOME: C:/Program Files/BellSoft/LibericaJDK-8
      SNAPPY_HOME: C:/Users/circleci/thirdparty/snappy-1.1.8
      SNAPPY_INCLUDE: C:/Users/circleci/thirdparty/snappy-1.1.8;C:/Users/circleci/thirdparty/snappy-1.1.8/build
      SNAPPY_LIB_DEBUG: C:/Users/circleci/thirdparty/snappy-1.1.8/build/Debug/snappy.lib
@@ -914,6 +909,8 @@ workflows:
      - build-linux-mini-crashtest
  jobs-windows:
    jobs:
+      - build-windows-vs2022-avx2
+      - build-windows-vs2022
      - build-windows-vs2019
      - build-cmake-mingw
  jobs-java:
@@ -962,5 +959,3 @@ workflows:
      - build-linux-non-shm
      - build-linux-clang-13-asan-ubsan-with-folly
      - build-linux-valgrind
-      - build-windows-vs2022-avx2
-      - build-windows-vs2022
@@ -772,7 +772,6 @@ set(SOURCES
        options/configurable.cc
        options/customizable.cc
        options/db_options.cc
-        options/offpeak_time_info.cc
        options/options.cc
        options/options_helper.cc
        options/options_parser.cc
@@ -1106,15 +1105,11 @@ set(BUILD_VERSION_CC ${CMAKE_BINARY_DIR}/build_version.cc)
 configure_file(util/build_version.cc.in ${BUILD_VERSION_CC} @ONLY)

 add_library(${ROCKSDB_STATIC_LIB} STATIC ${SOURCES} ${BUILD_VERSION_CC})
-target_include_directories(${ROCKSDB_STATIC_LIB} PUBLIC
-  $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
 target_link_libraries(${ROCKSDB_STATIC_LIB} PRIVATE
  ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})

 if(ROCKSDB_BUILD_SHARED)
  add_library(${ROCKSDB_SHARED_LIB} SHARED ${SOURCES} ${BUILD_VERSION_CC})
-  target_include_directories(${ROCKSDB_SHARED_LIB} PUBLIC
-    $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
  target_link_libraries(${ROCKSDB_SHARED_LIB} PRIVATE
    ${THIRDPARTY_LIBS} ${SYSTEM_LIBS})

@@ -1601,3 +1596,6 @@ option(WITH_BENCHMARK "build benchmark tests" OFF)
 if(WITH_BENCHMARK)
  add_subdirectory(${PROJECT_SOURCE_DIR}/microbench/)
 endif()
+
+target_include_directories(${PROJECT_NAME} PUBLIC
+  $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>)
@@ -1,73 +1,10 @@
 # Rocksdb Change Log
 > NOTE: Entries for next release do not go here. Follow instructions in `unreleased_history/README.txt`

-## 8.10.2 (02/16/2024)
-* Update zlib to 1.3.1 for Java builds
-
-## 8.10.1 (01/16/2024)
-### Bug Fixes
-* Fix bug in auto_readahead_size that combined with IndexType::kBinarySearchWithFirstKey + fails or iterator lands at a wrong key
-
-## 8.10.0 (12/15/2023)
-### New Features
-* Provide support for async_io to trim readahead_size by doing block cache lookup
-* Added initial wide-column support in `WriteBatchWithIndex`. This includes the `PutEntity` API and support for wide columns in the existing read APIs (`GetFromBatch`, `GetFromBatchAndDB`, `MultiGetFromBatchAndDB`, and `BaseDeltaIterator`).
-
-### Public API Changes
-* Custom implementations of `TablePropertiesCollectorFactory` may now return a `nullptr` collector to decline processing a file, reducing callback overheads in such cases.
-
-### Behavior Changes
-* Make ReadOptions.auto_readahead_size default true which does prefetching optimizations for forward scans if iterate_upper_bound and block_cache is also specified.
-* Compactions can be scheduled in parallel in an additional scenario: high compaction debt relative to the data size
-* HyperClockCache now has built-in protection against excessive CPU consumption under the extreme stress condition of no (or very few) evictable cache entries, which can slightly increase memory usage such conditions. New option `HyperClockCacheOptions::eviction_effort_cap` controls the space-time trade-off of the response. The default should be generally well-balanced, with no measurable affect on normal operation.
-
-### Bug Fixes
-* Fix a corner case with auto_readahead_size where Prev Operation returns NOT SUPPORTED error when scans direction is changed from forward to backward.
-* Avoid destroying the periodic task scheduler's default timer in order to prevent static destruction order issues.
-* Fix double counting of BYTES_WRITTEN ticker when doing writes with transactions.
-* Fix a WRITE_STALL counter that was reporting wrong value in few cases.
-* A lookup by MultiGet in a TieredCache that goes to the local flash cache and finishes with very low latency, i.e before the subsequent call to WaitAll, is ignored, resulting in a false negative and a memory leak.
-
-### Performance Improvements
-* Java API extensions to improve consistency and completeness of APIs
-1 Extended `RocksDB.get([ColumnFamilyHandle columnFamilyHandle,] ReadOptions opt, ByteBuffer key, ByteBuffer value)` which now accepts indirect buffer parameters as well as direct buffer parameters
-2 Extended `RocksDB.put( [ColumnFamilyHandle columnFamilyHandle,] WriteOptions writeOpts, final ByteBuffer key, final ByteBuffer value)` which now accepts indirect buffer parameters as well as direct buffer parameters
-3 Added `RocksDB.merge([ColumnFamilyHandle columnFamilyHandle,] WriteOptions writeOptions, ByteBuffer key, ByteBuffer value)` methods with the same parameter options as `put(...)` - direct and indirect buffers are supported
-4 Added `RocksIterator.key( byte[] key [, int offset, int len])` methods which retrieve the iterator key into the supplied buffer
-5 Added `RocksIterator.value( byte[] value [, int offset, int len])` methods which retrieve the iterator value into the supplied buffer
-6 Deprecated `get(final ColumnFamilyHandle columnFamilyHandle, final ReadOptions readOptions, byte[])` in favour of `get(final ReadOptions readOptions, final ColumnFamilyHandle columnFamilyHandle, byte[])` which has consistent parameter ordering with other methods in the same class
-7 Added `Transaction.get( ReadOptions opt, [ColumnFamilyHandle columnFamilyHandle, ] byte[] key, byte[] value)` methods which retrieve the requested value into the supplied buffer
-8 Added `Transaction.get( ReadOptions opt, [ColumnFamilyHandle columnFamilyHandle, ] ByteBuffer key, ByteBuffer value)` methods which retrieve the requested value into the supplied buffer
-9 Added `Transaction.getForUpdate( ReadOptions readOptions, [ColumnFamilyHandle columnFamilyHandle, ] byte[] key, byte[] value, boolean exclusive [, boolean doValidate])` methods which retrieve the requested value into the supplied buffer
-10 Added `Transaction.getForUpdate( ReadOptions readOptions, [ColumnFamilyHandle columnFamilyHandle, ] ByteBuffer key, ByteBuffer value, boolean exclusive [, boolean doValidate])` methods which retrieve the requested value into the supplied buffer
-11 Added `Transaction.getIterator()` method as a convenience which defaults the `ReadOptions` value supplied to existing `Transaction.iterator()` methods. This mirrors the existing `RocksDB.iterator()` method.
-12 Added `Transaction.put([ColumnFamilyHandle columnFamilyHandle, ]  ByteBuffer key, ByteBuffer value [, boolean assumeTracked])` methods which supply the key, and the value to be written in a `ByteBuffer` parameter
-13 Added `Transaction.merge([ColumnFamilyHandle columnFamilyHandle, ] ByteBuffer key, ByteBuffer value [,  boolean assumeTracked])` methods which supply the key, and the value to be written/merged in a `ByteBuffer` parameter
-14 Added `Transaction.mergeUntracked([ColumnFamilyHandle columnFamilyHandle, ] ByteBuffer key, ByteBuffer value)` methods which supply the key, and the value to be written/merged in a `ByteBuffer` parameter
-
-
-## 8.9.0 (11/17/2023)
-### New Features
-* Add GetEntity() and PutEntity() API implementation for Attribute Group support. Through the use of Column Families, AttributeGroup enables users to logically group wide-column entities.
-
-### Public API Changes
-* Added rocksdb_ratelimiter_create_auto_tuned API to create an auto-tuned GenericRateLimiter.
-* Added clipColumnFamily() to the Java API to clip the entries in the CF according to the range [begin_key, end_key).
-* Make the `EnableFileDeletion` API not default to force enabling. For users that rely on this default behavior and still
-want to continue to use force enabling, they need to explicitly pass a `true` to `EnableFileDeletion`.
-* Add new Cache APIs GetSecondaryCacheCapacity() and GetSecondaryCachePinnedUsage() to return the configured capacity, and cache reservation charged to the secondary cache.
-
-### Behavior Changes
-* During off-peak hours defined by `daily_offpeak_time_utc`, the compaction picker will select a larger number of files for periodic compaction. This selection will include files that are projected to expire by the next off-peak start time, ensuring that these files are not chosen for periodic compaction outside of off-peak hours.
-* If an error occurs when writing to a trace file after `DB::StartTrace()`, the subsequent trace writes are skipped to avoid writing to a file that has previously seen error. In this case, `DB::EndTrace()` will also return a non-ok status with info about the error occured previously in its status message.
-* Deleting stale files upon recovery are delegated to SstFileManger if available so they can be rate limited.
-* Make RocksDB only call `TablePropertiesCollector::Finish()` once.
-* When `WAL_ttl_seconds > 0`, we now process archived WALs for deletion at least every `WAL_ttl_seconds / 2` seconds. Previously it could be less frequent in case of small `WAL_ttl_seconds` values when size-based expiration (`WAL_size_limit_MB > 0 `) was simultaneously enabled.
-
-### Bug Fixes
-* Fixed a crash or assertion failure bug in experimental new HyperClockCache variant, especially when running with a SecondaryCache.
-* Fix a race between flush error recovery and db destruction that can lead to db crashing.
-* Fixed some bugs in the index builder/reader path for user-defined timestamps in Memtable only feature.
+## 8.8.1 (11/17/2023)
+### Bug fixes
+* Make the cache memory reservation accounting in Tiered cache (primary and compressed secondary cache) more accurate to avoid over/under charging the secondary cache.
+* Allow increasing the compressed_secondary_ratio in the Tiered cache after setting it to 0 to disable.

 ## 8.8.0 (10/23/2023)
 ### New Features
@@ -78,10 +15,12 @@ want to continue to use force enabling, they need to explicitly pass a `true` to

 ### Public API Changes
 * The default value of `DBOptions::fail_if_options_file_error` changed from `false` to `true`. Operations that set in-memory options (e.g., `DB::Open*()`, `DB::SetOptions()`, `DB::CreateColumnFamily*()`, and `DB::DropColumnFamily()`) but fail to persist the change will now return a non-OK `Status` by default.
+* Add new Cache APIs GetSecondaryCacheCapacity() and GetSecondaryCachePinnedUsage() to return the configured capacity, and cache reservation charged to the secondary cache.

 ### Behavior Changes
 * For non direct IO, eliminate the file system prefetching attempt for compaction read when `Options::compaction_readahead_size` is 0
 * During a write stop, writes now block on in-progress recovery attempts
+* Deleting stale files upon recovery are delegated to SstFileManger if available so they can be rate limited.

 ### Bug Fixes
 * Fix a bug in auto_readahead_size where first_internal_key of index blocks wasn't copied properly resulting in corruption error when first_internal_key was used for comparison.
@@ -539,7 +539,7 @@ endif

 ifdef USE_CLANG
 	# Used by some teams in Facebook
-	WARNING_FLAGS += -Wshift-sign-overflow -Wambiguous-reversed-operator -Wimplicit-fallthrough
+	WARNING_FLAGS += -Wshift-sign-overflow -Wambiguous-reversed-operator
 endif

 ifeq ($(PLATFORM), OS_OPENBSD)
@@ -994,7 +994,7 @@ endif

 .PHONY: check_0
 check_0:
-	@printf '%s\n' ''						\
+	printf '%s\n' ''						\
 	  'To monitor subtest <duration,pass/fail,name>,'		\
 	  '  run "make watch-log" in a separate window' '';		\
 	{ \
@@ -1016,7 +1016,7 @@ valgrind-exclude-regexp = InlineSkipTest.ConcurrentInsert|TransactionStressTest.
 .PHONY: valgrind_check_0
 valgrind_check_0: test_log_prefix := valgrind_
 valgrind_check_0:
-	@printf '%s\n' ''						\
+	printf '%s\n' ''						\
 	  'To monitor subtest <duration,pass/fail,name>,'		\
 	  '  run "make watch-log" in a separate window' '';		\
 	{								\
@@ -2060,7 +2060,7 @@ JAVA_INCLUDE = -I$(JAVA_HOME)/include/ -I$(JAVA_HOME)/include/linux
 ifeq ($(PLATFORM), OS_SOLARIS)
 	ARCH := $(shell isainfo -b)
 else ifeq ($(PLATFORM), OS_OPENBSD)
-	ifneq (,$(filter amd64 ppc64 ppc64le s390x arm64 aarch64 riscv64 sparc64 loongarch64, $(MACHINE)))
+	ifneq (,$(filter amd64 ppc64 ppc64le s390x arm64 aarch64 sparc64 loongarch64, $(MACHINE)))
 		ARCH := 64
 	else
 		ARCH := 32
@@ -2081,7 +2081,7 @@ ifneq ($(origin JNI_LIBC), undefined)
 endif

 ifeq (,$(ROCKSDBJNILIB))
-ifneq (,$(filter ppc% s390x arm64 aarch64 riscv64 sparc64 loongarch64, $(MACHINE)))
+ifneq (,$(filter ppc% s390x arm64 aarch64 sparc64 loongarch64, $(MACHINE)))
 	ROCKSDBJNILIB = librocksdbjni-linux-$(MACHINE)$(JNI_LIBC_POSTFIX).so
 else
 	ROCKSDBJNILIB = librocksdbjni-linux$(ARCH)$(JNI_LIBC_POSTFIX).so
@@ -2094,8 +2094,8 @@ ROCKSDB_JAVADOCS_JAR = rocksdbjni-$(ROCKSDB_JAVA_VERSION)-javadoc.jar
 ROCKSDB_SOURCES_JAR = rocksdbjni-$(ROCKSDB_JAVA_VERSION)-sources.jar
 SHA256_CMD = sha256sum

-ZLIB_VER ?= 1.3.1
-ZLIB_SHA256 ?= 9a93b2b7dfdac77ceba5a558a580e74667dd6fede4585b91eefb60f03b72df23
+ZLIB_VER ?= 1.3
+ZLIB_SHA256 ?= ff0ba4c292013dbc27530b3a81e1f9a813cd39de01ca5e0f8bf355702efa593e
 ZLIB_DOWNLOAD_BASE ?= http://zlib.net
 BZIP2_VER ?= 1.0.8
 BZIP2_SHA256 ?= ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269
@@ -2346,10 +2346,6 @@ rocksdbjavastaticdockers390x:
 	mkdir -p java/target
 	docker run --rm --name rocksdb_linux_s390x-be --attach stdin --attach stdout --attach stderr --volume $(HOME)/.m2:/root/.m2:ro --volume `pwd`:/rocksdb-host:ro --volume /rocksdb-local-build --volume `pwd`/java/target:/rocksdb-java-target --env DEBUG_LEVEL=$(DEBUG_LEVEL) evolvedbinary/rocksjava:ubuntu18_s390x-be /rocksdb-host/java/crossbuild/docker-build-linux-centos.sh

-rocksdbjavastaticdockerriscv64:
-	mkdir -p java/target
-	docker run --rm --name rocksdb_linux_riscv64-be --attach stdin --attach stdout --attach stderr --volume $(HOME)/.m2:/root/.m2:ro --volume `pwd`:/rocksdb-host:ro --volume /rocksdb-local-build --volume `pwd`/java/target:/rocksdb-java-target --env DEBUG_LEVEL=$(DEBUG_LEVEL) evolvedbinary/rocksjava:ubuntu20_riscv64-be /rocksdb-host/java/crossbuild/docker-build-linux-centos.sh
-
 rocksdbjavastaticdockerx86musl:
 	mkdir -p java/target
 	docker run --rm --name rocksdb_linux_x86-musl-be --platform linux/386 --attach stdin --attach stdout --attach stderr --volume $(HOME)/.m2:/root/.m2:ro --volume `pwd`:/rocksdb-host:ro --volume /rocksdb-local-build --volume `pwd`/java/target:/rocksdb-java-target --env DEBUG_LEVEL=$(DEBUG_LEVEL) evolvedbinary/rocksjava:alpine3_x86-be /rocksdb-host/java/crossbuild/docker-build-linux-alpine.sh
@@ -5,5 +5,4 @@ This is the list of all known third-party plugins for RocksDB. If something is m
 * [ZenFS](https://github.com/westerndigitalcorporation/zenfs): a file system for zoned block devices
 * [RADOS](https://github.com/riversand963/rocksdb-rados-env): an Env used for interacting with RADOS. Migrated from RocksDB main repo.
 * [PMEM](https://github.com/pmem/pmem-rocksdb-plugin): a collection of plugins to enable Persistent Memory on RocksDB.
-* [IPPCP](https://github.com/intel/ippcp-plugin-rocksdb): a plugin to enable encryption on RocksDB based on Intel optimized open source IPP-Crypto library.
-* [encfs](https://github.com/pegasus-kv/encfs): a plugin to enable encryption on RocksDB based on OpenSSL library.
+* [IPPCP](https://github.com/intel/ippcp-plugin-rocksdb): a plugin to enable encryption on RocksDB based on Intel optimized open source IPP-Crypto library.
@@ -163,7 +163,6 @@ cpp_library_wrapper(name="rocksdb_lib", srcs=[
        "options/configurable.cc",
        "options/customizable.cc",
        "options/db_options.cc",
-        "options/offpeak_time_info.cc",
        "options/options.cc",
        "options/options_helper.cc",
        "options/options_parser.cc",
@@ -5621,5 +5620,3 @@ cpp_unittest_wrapper(name="write_unprepared_transaction_test",
            deps=[":rocksdb_test_lib"],
            extra_compiler_flags=[])

-
-export_file(name = "tools/db_crashtest.py")
@@ -152,9 +152,6 @@ LzLabs is using RocksDB as a storage engine in their multi-database distributed
 ## ArangoDB
 [ArangoDB](https://www.arangodb.com/) is a native multi-model database with flexible data models for documents, graphs, and key-values, for building high performance applications using a convenient SQL-like query language or JavaScript extensions. It uses RocksDB as its storage engine.

-## Qdrant
-[Qdrant](https://qdrant.tech/) is an open source vector database, it [uses](https://qdrant.tech/documentation/concepts/storage/) RocksDB as its persistent storage.
-
 ## Milvus
 [Milvus](https://milvus.io/) is an open source vector database for unstructured data. It uses RocksDB not only as one of the supported kv storage engines, but also as a message queue.

@@ -303,7 +303,6 @@ def generate_targets(repo_path, deps_map):
                    deps=json.dumps(deps["extra_deps"] + [":rocksdb_test_lib"]),
                    extra_compiler_flags=json.dumps(deps["extra_compiler_flags"]),
                )
-    TARGETS.export_file("tools/db_crashtest.py")

    print(ColorString.info("Generated TARGETS Summary:"))
    print(ColorString.info("- %d libs" % TARGETS.total_lib))
@@ -148,9 +148,3 @@ add_c_test_wrapper()
                ).encode("utf-8")
            )
        self.total_test = self.total_test + 1
-
-    def export_file(self, name):
-        with open(self.path, "a") as targets_file:
-            targets_file.write(
-                targets_cfg.export_file_template.format(name=name)
-            )
@@ -37,7 +37,3 @@ fancy_bench_template = """
 fancy_bench_wrapper(suite_name="{name}", binary_to_bench_to_metric_list_map={bench_config}, slow={slow}, expected_runtime={expected_runtime}, sl_iterations={sl_iterations}, regression_threshold={regression_threshold})

 """
-
-export_file_template = """
-export_file(name = "{name}")
-"""
@@ -647,10 +647,8 @@ if [ "$PORTABLE" == "" ] || [ "$PORTABLE" == 0 ]; then
    fi
    COMMON_FLAGS="$COMMON_FLAGS"
  elif test -n "`echo $TARGET_ARCHITECTURE | grep ^riscv64`"; then
-    RISC_ISA=$(cat /proc/cpuinfo | grep -E '^isa\s*:' | head -1 | cut --delimiter=: -f 2 | cut -b 2-)
-    if [ -n "${RISCV_ISA}" ]; then
-      COMMON_FLAGS="$COMMON_FLAGS -march=${RISC_ISA}"
-    fi
+    RISC_ISA=$(cat /proc/cpuinfo | grep isa | head -1 | cut --delimiter=: -f 2 | cut -b 2-)
+    COMMON_FLAGS="$COMMON_FLAGS -march=${RISC_ISA}"
  elif [ "$TARGET_OS" == "IOS" ]; then
    COMMON_FLAGS="$COMMON_FLAGS"
  else
@@ -662,7 +660,8 @@ else
    if test -n "`echo $TARGET_ARCHITECTURE | grep ^s390x`"; then
      COMMON_FLAGS="$COMMON_FLAGS -march=z196 "
    elif test -n "`echo $TARGET_ARCHITECTURE | grep ^riscv64`"; then
-      COMMON_FLAGS="$COMMON_FLAGS -march=rv64gc"
+      RISC_ISA=$(cat /proc/cpuinfo | grep isa | head -1 | cut --delimiter=: -f 2 | cut -b 2-)
+      COMMON_FLAGS="$COMMON_FLAGS -march=${RISC_ISA}"
    elif test "$USE_SSE"; then
      # USE_SSE is DEPRECATED
      # This is a rough approximation of the old USE_SSE behavior
@@ -48,10 +48,6 @@ DEFINE_uint64(cache_size, 1 * GiB,
              "Number of bytes to use as a cache of uncompressed data.");
 DEFINE_int32(num_shard_bits, -1,
             "ShardedCacheOptions::shard_bits. Default = auto");
-DEFINE_int32(
-    eviction_effort_cap,
-    ROCKSDB_NAMESPACE::HyperClockCacheOptions(1, 1).eviction_effort_cap,
-    "HyperClockCacheOptions::eviction_effort_cap");

 DEFINE_double(resident_ratio, 0.25,
              "Ratio of keys fitting in cache to keyspace.");
@@ -67,22 +63,11 @@ DEFINE_int32(
 DEFINE_uint32(skew, 5, "Degree of skew in key selection. 0 = no skew");
 DEFINE_bool(populate_cache, true, "Populate cache before operations");

-DEFINE_double(pinned_ratio, 0.25,
-              "Keep roughly this portion of entries pinned in cache.");
-DEFINE_double(
-    vary_capacity_ratio, 0.0,
-    "If greater than 0.0, will periodically vary the capacity between this "
-    "ratio less than full size and full size. If vary_capacity_ratio + "
-    "pinned_ratio is close to or exceeds 1.0, the cache might thrash.");
-
-DEFINE_uint32(lookup_insert_percent, 82,
+DEFINE_uint32(lookup_insert_percent, 87,
              "Ratio of lookup (+ insert on not found) to total workload "
              "(expressed as a percentage)");
 DEFINE_uint32(insert_percent, 2,
              "Ratio of insert to total workload (expressed as a percentage)");
-DEFINE_uint32(blind_insert_percent, 5,
-              "Ratio of insert without keeping handle to total workload "
-              "(expressed as a percentage)");
 DEFINE_uint32(lookup_percent, 10,
              "Ratio of lookup to total workload (expressed as a percentage)");
 DEFINE_uint32(erase_percent, 1,
@@ -116,6 +101,7 @@ DEFINE_uint32(seed, 0, "Hashing/random seed to use. 0 = choose at random");

 DEFINE_string(secondary_cache_uri, "",
              "Full URI for creating a custom secondary cache object");
+static class std::shared_ptr<ROCKSDB_NAMESPACE::SecondaryCache> secondary_cache;

 DEFINE_string(cache_type, "lru_cache", "Type of block cache.");

@@ -214,19 +200,16 @@ class SharedState {

  bool Started() const { return start_; }

-  void AddLookupStats(uint64_t hits, uint64_t misses, size_t pinned_count) {
+  void AddLookupStats(uint64_t hits, uint64_t misses) {
    MutexLock l(&mu_);
    lookup_count_ += hits + misses;
    lookup_hits_ += hits;
-    pinned_count_ += pinned_count;
  }

  double GetLookupHitRatio() const {
    return 1.0 * lookup_hits_ / lookup_count_;
  }

-  size_t GetPinnedCount() const { return pinned_count_; }
-
 private:
  port::Mutex mu_;
  port::CondVar cv_;
@@ -238,7 +221,6 @@ class SharedState {
  uint64_t num_done_ = 0;
  uint64_t lookup_count_ = 0;
  uint64_t lookup_hits_ = 0;
-  size_t pinned_count_ = 0;
 };

 // Per-thread state for concurrent executions of the same benchmark.
@@ -331,28 +313,6 @@ Cache::CacheItemHelper helper2(CacheEntryRole::kIndexBlock, DeleteFn, SizeFn,
 Cache::CacheItemHelper helper3_wos(CacheEntryRole::kFilterBlock, DeleteFn);
 Cache::CacheItemHelper helper3(CacheEntryRole::kFilterBlock, DeleteFn, SizeFn,
                               SaveToFn, CreateFn, &helper3_wos);
-
-void ConfigureSecondaryCache(ShardedCacheOptions& opts) {
-  if (!FLAGS_secondary_cache_uri.empty()) {
-    std::shared_ptr<SecondaryCache> secondary_cache;
-    Status s = SecondaryCache::CreateFromString(
-        ConfigOptions(), FLAGS_secondary_cache_uri, &secondary_cache);
-    if (secondary_cache == nullptr) {
-      fprintf(stderr,
-              "No secondary cache registered matching string: %s status=%s\n",
-              FLAGS_secondary_cache_uri.c_str(), s.ToString().c_str());
-      exit(1);
-    }
-    opts.secondary_cache = secondary_cache;
-  }
-}
-
-ShardedCacheBase* AsShardedCache(Cache* c) {
-  if (!FLAGS_secondary_cache_uri.empty()) {
-    c = static_cast_with_check<CacheWrapper>(c)->GetTarget().get();
-  }
-  return static_cast_with_check<ShardedCacheBase>(c);
-}
 }  // namespace

 class CacheBench {
@@ -367,9 +327,7 @@ class CacheBench {
                                 FLAGS_lookup_insert_percent),
        insert_threshold_(lookup_insert_threshold_ +
                          kHundredthUint64 * FLAGS_insert_percent),
-        blind_insert_threshold_(insert_threshold_ +
-                                kHundredthUint64 * FLAGS_blind_insert_percent),
-        lookup_threshold_(blind_insert_threshold_ +
+        lookup_threshold_(insert_threshold_ +
                          kHundredthUint64 * FLAGS_lookup_percent),
        erase_threshold_(lookup_threshold_ +
                         kHundredthUint64 * FLAGS_erase_percent) {
@@ -395,7 +353,6 @@ class CacheBench {
          FLAGS_cache_size, /*estimated_entry_charge=*/0, FLAGS_num_shard_bits);
      opts.hash_seed = BitwiseAnd(FLAGS_seed, INT32_MAX);
      opts.memory_allocator = allocator;
-      opts.eviction_effort_cap = FLAGS_eviction_effort_cap;
      if (FLAGS_cache_type == "fixed_hyper_clock_cache" ||
          FLAGS_cache_type == "hyper_clock_cache") {
        opts.estimated_entry_charge = FLAGS_value_bytes_estimate > 0
@@ -409,7 +366,6 @@ class CacheBench {
        fprintf(stderr, "Cache type not supported.\n");
        exit(1);
      }
-      ConfigureSecondaryCache(opts);
      cache_ = opts.MakeSharedCache();
    } else if (FLAGS_cache_type == "lru_cache") {
      LRUCacheOptions opts(FLAGS_cache_size, FLAGS_num_shard_bits,
@@ -417,7 +373,19 @@ class CacheBench {
                           0.5 /* high_pri_pool_ratio */);
      opts.hash_seed = BitwiseAnd(FLAGS_seed, INT32_MAX);
      opts.memory_allocator = allocator;
-      ConfigureSecondaryCache(opts);
+      if (!FLAGS_secondary_cache_uri.empty()) {
+        Status s = SecondaryCache::CreateFromString(
+            ConfigOptions(), FLAGS_secondary_cache_uri, &secondary_cache);
+        if (secondary_cache == nullptr) {
+          fprintf(
+              stderr,
+              "No secondary cache registered matching string: %s status=%s\n",
+              FLAGS_secondary_cache_uri.c_str(), s.ToString().c_str());
+          exit(1);
+        }
+        opts.secondary_cache = secondary_cache;
+      }
+
      cache_ = NewLRUCache(opts);
    } else {
      fprintf(stderr, "Cache type not supported.\n");
@@ -537,8 +505,6 @@ class CacheBench {
    size_t slot = cache_->GetTableAddressCount();
    printf("Final load factor: %g (%zu / %zu)\n", 1.0 * occ / slot, occ, slot);

-    printf("Final pinned count: %zu\n", shared.GetPinnedCount());
-
    if (FLAGS_histograms) {
      printf("\nOperation latency (ns):\n");
      HistogramImpl combined;
@@ -570,7 +536,6 @@ class CacheBench {
  // Cumulative thresholds in the space of a random uint64_t
  const uint64_t lookup_insert_threshold_;
  const uint64_t insert_threshold_;
-  const uint64_t blind_insert_threshold_;
  const uint64_t lookup_threshold_;
  const uint64_t erase_threshold_;

@@ -686,44 +651,29 @@ class CacheBench {
    uint64_t lookup_misses = 0;
    uint64_t lookup_hits = 0;
    // To hold handles for a non-trivial amount of time
-    std::deque<Cache::Handle*> pinned;
-    size_t total_pin_count = static_cast<size_t>(
-        (FLAGS_cache_size * FLAGS_pinned_ratio) / FLAGS_value_bytes + 0.999999);
-    // For this thread. Some round up, some round down, as appropriate
-    size_t pin_count = (total_pin_count + thread->tid) / FLAGS_threads;
-
+    Cache::Handle* handle = nullptr;
    KeyGen gen;
    const auto clock = SystemClock::Default().get();
    uint64_t start_time = clock->NowMicros();
    StopWatchNano timer(clock);
    auto system_clock = SystemClock::Default();
-    size_t steps_to_next_capacity_change = 0;

    for (uint64_t i = 0; i < FLAGS_ops_per_thread; i++) {
      Slice key = gen.GetRand(thread->rnd, max_key_, FLAGS_skew);
      uint64_t random_op = thread->rnd.Next();

-      if (FLAGS_vary_capacity_ratio > 0.0 && thread->tid == 0) {
-        if (steps_to_next_capacity_change == 0) {
-          double cut_ratio = static_cast<double>(thread->rnd.Next()) /
-                             static_cast<double>(UINT64_MAX) *
-                             FLAGS_vary_capacity_ratio;
-          cache_->SetCapacity(FLAGS_cache_size * (1.0 - cut_ratio));
-          steps_to_next_capacity_change =
-              static_cast<size_t>(FLAGS_ops_per_thread / 100);
-        } else {
-          --steps_to_next_capacity_change;
-        }
-      }
-
      if (FLAGS_histograms) {
        timer.Start();
      }

      if (random_op < lookup_insert_threshold_) {
+        if (handle) {
+          cache_->Release(handle);
+          handle = nullptr;
+        }
        // do lookup
-        auto handle = cache_->Lookup(key, &helper2, /*context*/ nullptr,
-                                     Cache::Priority::LOW);
+        handle = cache_->Lookup(key, &helper2, /*context*/ nullptr,
+                                Cache::Priority::LOW);
        if (handle) {
          ++lookup_hits;
          if (!FLAGS_lean) {
@@ -731,31 +681,32 @@ class CacheBench {
            result += NPHash64(static_cast<char*>(cache_->Value(handle)),
                               FLAGS_value_bytes);
          }
-          pinned.push_back(handle);
        } else {
          ++lookup_misses;
          // do insert
          Status s = cache_->Insert(
              key, createValue(thread->rnd, cache_->memory_allocator()),
-              &helper2, FLAGS_value_bytes, &pinned.emplace_back());
+              &helper2, FLAGS_value_bytes, &handle);
          assert(s.ok());
        }
      } else if (random_op < insert_threshold_) {
+        if (handle) {
+          cache_->Release(handle);
+          handle = nullptr;
+        }
        // do insert
        Status s = cache_->Insert(
            key, createValue(thread->rnd, cache_->memory_allocator()), &helper3,
-            FLAGS_value_bytes, &pinned.emplace_back());
-        assert(s.ok());
-      } else if (random_op < blind_insert_threshold_) {
-        // insert without keeping a handle
-        Status s = cache_->Insert(
-            key, createValue(thread->rnd, cache_->memory_allocator()), &helper3,
-            FLAGS_value_bytes);
+            FLAGS_value_bytes, &handle);
        assert(s.ok());
      } else if (random_op < lookup_threshold_) {
+        if (handle) {
+          cache_->Release(handle);
+          handle = nullptr;
+        }
        // do lookup
-        auto handle = cache_->Lookup(key, &helper2, /*context*/ nullptr,
-                                     Cache::Priority::LOW);
+        handle = cache_->Lookup(key, &helper2, /*context*/ nullptr,
+                                Cache::Priority::LOW);
        if (handle) {
          ++lookup_hits;
          if (!FLAGS_lean) {
@@ -763,7 +714,6 @@ class CacheBench {
            result += NPHash64(static_cast<char*>(cache_->Value(handle)),
                               FLAGS_value_bytes);
          }
-          pinned.push_back(handle);
        } else {
          ++lookup_misses;
        }
@@ -777,6 +727,7 @@ class CacheBench {
      if (FLAGS_histograms) {
        thread->latency_ns_hist.Add(timer.ElapsedNanos());
      }
+      thread->shared->AddLookupStats(lookup_hits, lookup_misses);
      if (FLAGS_usleep > 0) {
        unsigned us =
            static_cast<unsigned>(thread->rnd.Uniform(FLAGS_usleep + 1));
@@ -784,17 +735,12 @@ class CacheBench {
          system_clock->SleepForMicroseconds(us);
        }
      }
-      while (pinned.size() > pin_count) {
-        cache_->Release(pinned.front());
-        pinned.pop_front();
-      }
    }
    if (FLAGS_early_exit) {
      MutexLock l(thread->shared->GetMutex());
      exit(0);
    }
-    thread->shared->AddLookupStats(lookup_hits, lookup_misses, pinned.size());
-    for (auto handle : pinned) {
+    if (handle) {
      cache_->Release(handle);
      handle = nullptr;
    }
@@ -823,7 +769,8 @@ class CacheBench {
    printf("Cache size          : %s\n",
           BytesToHumanString(FLAGS_cache_size).c_str());
    printf("Num shard bits      : %d\n",
-           AsShardedCache(cache_.get())->GetNumShardBits());
+           static_cast_with_check<ShardedCacheBase>(cache_.get())
+               ->GetNumShardBits());
    printf("Max key             : %" PRIu64 "\n", max_key_);
    printf("Resident ratio      : %g\n", FLAGS_resident_ratio);
    printf("Skew degree         : %u\n", FLAGS_skew);
@@ -11,7 +11,6 @@

 #include <array>
 #include <atomic>
-#include <climits>
 #include <cstddef>
 #include <cstdint>
 #include <memory>
@@ -25,7 +24,6 @@
 #include "port/port.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/secondary_cache.h"
-#include "util/atomic.h"
 #include "util/autovector.h"
 #include "util/math.h"

@@ -370,19 +368,11 @@ struct ClockHandle : public ClockHandleBasicData {
  // TODO: make these coundown values tuning parameters for eviction?

  // See above. Mutable for read reference counting.
-  mutable AcqRelAtomic<uint64_t> meta{};
+  mutable std::atomic<uint64_t> meta{};
 };  // struct ClockHandle

 class BaseClockTable {
 public:
-  struct BaseOpts {
-    explicit BaseOpts(int _eviction_effort_cap)
-        : eviction_effort_cap(_eviction_effort_cap) {}
-    explicit BaseOpts(const HyperClockCacheOptions& opts)
-        : BaseOpts(opts.eviction_effort_cap) {}
-    int eviction_effort_cap;
-  };
-
  BaseClockTable(CacheMetadataChargePolicy metadata_charge_policy,
                 MemoryAllocator* allocator,
                 const Cache::EvictionCallback* eviction_callback,
@@ -395,37 +385,36 @@ class BaseClockTable {
  template <class Table>
  typename Table::HandleImpl* CreateStandalone(ClockHandleBasicData& proto,
                                               size_t capacity,
-                                               uint32_t eec_and_scl,
+                                               bool strict_capacity_limit,
                                               bool allow_uncharged);

  template <class Table>
  Status Insert(const ClockHandleBasicData& proto,
                typename Table::HandleImpl** handle, Cache::Priority priority,
-                size_t capacity, uint32_t eec_and_scl);
+                size_t capacity, bool strict_capacity_limit);

  void Ref(ClockHandle& handle);

-  size_t GetOccupancy() const { return occupancy_.LoadRelaxed(); }
+  size_t GetOccupancy() const {
+    return occupancy_.load(std::memory_order_relaxed);
+  }

-  size_t GetUsage() const { return usage_.LoadRelaxed(); }
+  size_t GetUsage() const { return usage_.load(std::memory_order_relaxed); }

-  size_t GetStandaloneUsage() const { return standalone_usage_.LoadRelaxed(); }
+  size_t GetStandaloneUsage() const {
+    return standalone_usage_.load(std::memory_order_relaxed);
+  }

  uint32_t GetHashSeed() const { return hash_seed_; }

-  uint64_t GetYieldCount() const { return yield_count_.LoadRelaxed(); }
-
-  uint64_t GetEvictionEffortExceededCount() const {
-    return eviction_effort_exceeded_count_.LoadRelaxed();
-  }
+  uint64_t GetYieldCount() const { return yield_count_.load(); }

  struct EvictionData {
    size_t freed_charge = 0;
    size_t freed_count = 0;
-    size_t seen_pinned_count = 0;
  };

-  void TrackAndReleaseEvictedEntry(ClockHandle* h);
+  void TrackAndReleaseEvictedEntry(ClockHandle* h, EvictionData* data);

 #ifndef NDEBUG
  // Acquire N references
@@ -450,7 +439,6 @@ class BaseClockTable {
  template <class Table>
  Status ChargeUsageMaybeEvictStrict(size_t total_charge, size_t capacity,
                                     bool need_evict_for_occupancy,
-                                     uint32_t eviction_effort_cap,
                                     typename Table::InsertState& state);

  // Helper for updating `usage_` for new entry with given `total_charge`
@@ -464,7 +452,6 @@ class BaseClockTable {
  template <class Table>
  bool ChargeUsageMaybeEvictNonStrict(size_t total_charge, size_t capacity,
                                      bool need_evict_for_occupancy,
-                                      uint32_t eviction_effort_cap,
                                      typename Table::InsertState& state);

 protected:  // data
@@ -473,29 +460,21 @@ class BaseClockTable {
  // operations in ClockCacheShard.

  // Clock algorithm sweep pointer.
-  // (Relaxed: only needs to be consistent with itself.)
-  RelaxedAtomic<uint64_t> clock_pointer_{};
+  std::atomic<uint64_t> clock_pointer_{};

  // Counter for number of times we yield to wait on another thread.
-  // It is normal for this to occur rarely in normal operation.
-  // (Relaxed: a simple stat counter.)
-  RelaxedAtomic<uint64_t> yield_count_{};
-
-  // Counter for number of times eviction effort cap is exceeded.
-  // It is normal for this to occur rarely in normal operation.
-  // (Relaxed: a simple stat counter.)
-  RelaxedAtomic<uint64_t> eviction_effort_exceeded_count_{};
+  std::atomic<uint64_t> yield_count_{};

  // TODO: is this separation needed if we don't do background evictions?
  ALIGN_AS(CACHE_LINE_SIZE)
  // Number of elements in the table.
-  AcqRelAtomic<size_t> occupancy_{};
+  std::atomic<size_t> occupancy_{};

  // Memory usage by entries tracked by the cache (including standalone)
-  AcqRelAtomic<size_t> usage_{};
+  std::atomic<size_t> usage_{};

  // Part of usage by standalone entries (not in table)
-  AcqRelAtomic<size_t> standalone_usage_{};
+  std::atomic<size_t> standalone_usage_{};

  ALIGN_AS(CACHE_LINE_SIZE)
  const CacheMetadataChargePolicy metadata_charge_policy_;
@@ -521,11 +500,7 @@ class FixedHyperClockTable : public BaseClockTable {
  struct ALIGN_AS(64U) HandleImpl : public ClockHandle {
    // The number of elements that hash to this slot or a lower one, but wind
    // up in this slot or a higher one.
-    // (Relaxed: within a Cache op, does not need consistency with entries
-    // inserted/removed during that op. For example, a Lookup() that
-    // happens-after an Insert() will see an appropriate displacements value
-    // for the entry to be in a published state.)
-    RelaxedAtomic<uint32_t> displacements{};
+    std::atomic<uint32_t> displacements{};

    // Whether this is a "deteched" handle that is independently allocated
    // with `new` (so must be deleted with `delete`).
@@ -539,19 +514,17 @@ class FixedHyperClockTable : public BaseClockTable {
    inline void SetStandalone() { standalone = true; }
  };  // struct HandleImpl

-  struct Opts : public BaseOpts {
-    explicit Opts(size_t _estimated_value_size, int _eviction_effort_cap)
-        : BaseOpts(_eviction_effort_cap),
-          estimated_value_size(_estimated_value_size) {}
-    explicit Opts(const HyperClockCacheOptions& opts)
-        : BaseOpts(opts.eviction_effort_cap) {
+  struct Opts {
+    explicit Opts(size_t _estimated_value_size)
+        : estimated_value_size(_estimated_value_size) {}
+    explicit Opts(const HyperClockCacheOptions& opts) {
      assert(opts.estimated_entry_charge > 0);
      estimated_value_size = opts.estimated_entry_charge;
    }
    size_t estimated_value_size;
  };

-  FixedHyperClockTable(size_t capacity,
+  FixedHyperClockTable(size_t capacity, bool strict_capacity_limit,
                       CacheMetadataChargePolicy metadata_charge_policy,
                       MemoryAllocator* allocator,
                       const Cache::EvictionCallback* eviction_callback,
@@ -573,8 +546,7 @@ class FixedHyperClockTable : public BaseClockTable {
  // Runs the clock eviction algorithm trying to reclaim at least
  // requested_charge. Returns how much is evicted, which could be less
  // if it appears impossible to evict the requested amount without blocking.
-  void Evict(size_t requested_charge, InsertState& state, EvictionData* data,
-             uint32_t eviction_effort_cap);
+  void Evict(size_t requested_charge, InsertState& state, EvictionData* data);

  HandleImpl* Lookup(const UniqueId64x2& hashed_key);

@@ -815,33 +787,32 @@ class AutoHyperClockTable : public BaseClockTable {

    // See above. The head pointer is logically independent of the rest of
    // the entry, including the chain next pointer.
-    AcqRelAtomic<uint64_t> head_next_with_shift{kUnusedMarker};
-    AcqRelAtomic<uint64_t> chain_next_with_shift{kUnusedMarker};
+    std::atomic<uint64_t> head_next_with_shift{kUnusedMarker};
+    std::atomic<uint64_t> chain_next_with_shift{kUnusedMarker};

    // For supporting CreateStandalone and some fallback cases.
    inline bool IsStandalone() const {
-      return head_next_with_shift.Load() == kStandaloneMarker;
+      return head_next_with_shift.load(std::memory_order_acquire) ==
+             kStandaloneMarker;
    }

    inline void SetStandalone() {
-      head_next_with_shift.Store(kStandaloneMarker);
+      head_next_with_shift.store(kStandaloneMarker, std::memory_order_release);
    }
  };  // struct HandleImpl

-  struct Opts : public BaseOpts {
-    explicit Opts(size_t _min_avg_value_size, int _eviction_effort_cap)
-        : BaseOpts(_eviction_effort_cap),
-          min_avg_value_size(_min_avg_value_size) {}
+  struct Opts {
+    explicit Opts(size_t _min_avg_value_size)
+        : min_avg_value_size(_min_avg_value_size) {}

-    explicit Opts(const HyperClockCacheOptions& opts)
-        : BaseOpts(opts.eviction_effort_cap) {
+    explicit Opts(const HyperClockCacheOptions& opts) {
      assert(opts.estimated_entry_charge == 0);
      min_avg_value_size = opts.min_avg_entry_charge;
    }
    size_t min_avg_value_size;
  };

-  AutoHyperClockTable(size_t capacity,
+  AutoHyperClockTable(size_t capacity, bool strict_capacity_limit,
                      CacheMetadataChargePolicy metadata_charge_policy,
                      MemoryAllocator* allocator,
                      const Cache::EvictionCallback* eviction_callback,
@@ -868,8 +839,7 @@ class AutoHyperClockTable : public BaseClockTable {
  // Runs the clock eviction algorithm trying to reclaim at least
  // requested_charge. Returns how much is evicted, which could be less
  // if it appears impossible to evict the requested amount without blocking.
-  void Evict(size_t requested_charge, InsertState& state, EvictionData* data,
-             uint32_t eviction_effort_cap);
+  void Evict(size_t requested_charge, InsertState& state, EvictionData* data);

  HandleImpl* Lookup(const UniqueId64x2& hashed_key);

@@ -934,8 +904,7 @@ class AutoHyperClockTable : public BaseClockTable {
  // with proper handling to ensure all existing data is seen even in the
  // presence of concurrent insertions, etc. (See implementation.)
  template <class OpData>
-  void PurgeImpl(OpData* op_data, size_t home = SIZE_MAX,
-                 EvictionData* data = nullptr);
+  void PurgeImpl(OpData* op_data, size_t home = SIZE_MAX);

  // An RAII wrapper for locking a chain of entries for removals. See
  // implementation.
@@ -945,7 +914,7 @@ class AutoHyperClockTable : public BaseClockTable {
  // implementation.
  template <class OpData>
  void PurgeImplLocked(OpData* op_data, ChainRewriteLock& rewrite_lock,
-                       size_t home, EvictionData* data);
+                       size_t home);

  // Update length_info_ as much as possible without waiting, given a known
  // usable (ready for inserts and lookups) grow_home. (Previous grow_homes
@@ -970,25 +939,22 @@ class AutoHyperClockTable : public BaseClockTable {
  // log time to find the correct chain, but normally this value enables
  // readers to find the correct chain on the first try.
  //
-  // To maximize parallelization of Grow() operations, this field is only
-  // updated opportunistically after Grow() operations and in DoInsert() where
-  // it is found to be out-of-date. See CatchUpLengthInfoNoWait().
-  AcqRelAtomic<uint64_t> length_info_;
+  // NOTES: length_info_ is only updated at the end of a Grow operation,
+  // so that waiting in Grow operations isn't done while entries are pinned
+  // for internal operation purposes. Thus, Lookup and Insert have to
+  // detect and support cases where length_info hasn't caught up to updated
+  // chains. Winning grow thread is the one that transitions
+  // head_next_with_shift from zeros. Grow threads can spin/yield wait for
+  // preconditions and postconditions to be met.
+  std::atomic<uint64_t> length_info_;

  // An already-computed version of the usable length times the max load
  // factor. Could be slightly out of date but GrowIfNeeded()/Grow() handle
  // that internally.
-  // (Relaxed: allowed to lag behind length_info_ by a little)
-  RelaxedAtomic<size_t> occupancy_limit_;
-
-  // The next index to use from array_ upon the next Grow(). Might be ahead of
-  // length_info_.
-  // (Relaxed: self-contained source of truth for next grow home)
-  RelaxedAtomic<size_t> grow_frontier_;
+  std::atomic<size_t> occupancy_limit_;

  // See explanation in AutoHyperClockTable::Evict
-  // (Relaxed: allowed to lag behind clock_pointer_ and length_info_ state)
-  RelaxedAtomic<size_t> clock_pointer_mask_;
+  std::atomic<size_t> clock_pointer_mask_;
 };  // class AutoHyperClockTable

 // A single shard of sharded cache.
@@ -1104,13 +1070,10 @@ class ALIGN_AS(CACHE_LINE_SIZE) ClockCacheShard final : public CacheShardBase {
  Table table_;

  // Maximum total charge of all elements stored in the table.
-  // (Relaxed: eventual consistency/update is OK)
-  RelaxedAtomic<size_t> capacity_;
+  std::atomic<size_t> capacity_;

-  // Encodes eviction_effort_cap (bottom 31 bits) and strict_capacity_limit
-  // (top bit). See HyperClockCacheOptions::eviction_effort_cap etc.
-  // (Relaxed: eventual consistency/update is OK)
-  RelaxedAtomic<uint32_t> eec_and_scl_;
+  // Whether to reject insertion if cache reaches its full capacity.
+  std::atomic<bool> strict_capacity_limit_;
 };  // class ClockCacheShard

 template <class Table>
@@ -31,7 +31,7 @@ CompressedSecondaryCache::~CompressedSecondaryCache() {}
 std::unique_ptr<SecondaryCacheResultHandle> CompressedSecondaryCache::Lookup(
    const Slice& key, const Cache::CacheItemHelper* helper,
    Cache::CreateContext* create_context, bool /*wait*/, bool advise_erase,
-    Statistics* stats, bool& kept_in_sec_cache) {
+    bool& kept_in_sec_cache) {
  assert(helper);
  // This is a minor optimization. Its ok to skip it in TSAN in order to
  // avoid a false positive.
@@ -51,7 +51,6 @@ std::unique_ptr<SecondaryCacheResultHandle> CompressedSecondaryCache::Lookup(
  void* handle_value = cache_->Value(lru_handle);
  if (handle_value == nullptr) {
    cache_->Release(lru_handle, /*erase_if_last_ref=*/false);
-    RecordTick(stats, COMPRESSED_SECONDARY_CACHE_DUMMY_HITS);
    return nullptr;
  }

@@ -138,7 +137,6 @@ std::unique_ptr<SecondaryCacheResultHandle> CompressedSecondaryCache::Lookup(
    cache_->Release(lru_handle, /*erase_if_last_ref=*/false);
  }
  handle.reset(new CompressedSecondaryCacheResultHandle(value, charge));
-  RecordTick(stats, COMPRESSED_SECONDARY_CACHE_HITS);
  return handle;
 }

@@ -86,7 +86,7 @@ class CompressedSecondaryCache : public SecondaryCache {
  std::unique_ptr<SecondaryCacheResultHandle> Lookup(
      const Slice& key, const Cache::CacheItemHelper* helper,
      Cache::CreateContext* create_context, bool /*wait*/, bool advise_erase,
-      Statistics* stats, bool& kept_in_sec_cache) override;
+      bool& kept_in_sec_cache) override;

  bool SupportForceErase() const override { return true; }

@@ -44,7 +44,7 @@ class CompressedSecondaryCacheTestBase : public testing::Test,
    // Lookup an non-existent key.
    std::unique_ptr<SecondaryCacheResultHandle> handle0 =
        sec_cache->Lookup(key0, GetHelper(), this, true, /*advise_erase=*/true,
-                          /*stats=*/nullptr, kept_in_sec_cache);
+                          kept_in_sec_cache);
    ASSERT_EQ(handle0, nullptr);

    Random rnd(301);
@@ -59,7 +59,7 @@ class CompressedSecondaryCacheTestBase : public testing::Test,

    std::unique_ptr<SecondaryCacheResultHandle> handle1_1 =
        sec_cache->Lookup(key1, GetHelper(), this, true, /*advise_erase=*/false,
-                          /*stats=*/nullptr, kept_in_sec_cache);
+                          kept_in_sec_cache);
    ASSERT_EQ(handle1_1, nullptr);

    // Insert and Lookup the item k1 for the second time and advise erasing it.
@@ -68,7 +68,7 @@ class CompressedSecondaryCacheTestBase : public testing::Test,

    std::unique_ptr<SecondaryCacheResultHandle> handle1_2 =
        sec_cache->Lookup(key1, GetHelper(), this, true, /*advise_erase=*/true,
-                          /*stats=*/nullptr, kept_in_sec_cache);
+                          kept_in_sec_cache);
    ASSERT_NE(handle1_2, nullptr);
    ASSERT_FALSE(kept_in_sec_cache);
    if (sec_cache_is_compressed) {
@@ -89,7 +89,7 @@ class CompressedSecondaryCacheTestBase : public testing::Test,
    // Lookup the item k1 again.
    std::unique_ptr<SecondaryCacheResultHandle> handle1_3 =
        sec_cache->Lookup(key1, GetHelper(), this, true, /*advise_erase=*/true,
-                          /*stats=*/nullptr, kept_in_sec_cache);
+                          kept_in_sec_cache);
    ASSERT_EQ(handle1_3, nullptr);

    // Insert and Lookup the item k2.
@@ -99,7 +99,7 @@ class CompressedSecondaryCacheTestBase : public testing::Test,
    ASSERT_EQ(get_perf_context()->compressed_sec_cache_insert_dummy_count, 2);
    std::unique_ptr<SecondaryCacheResultHandle> handle2_1 =
        sec_cache->Lookup(key2, GetHelper(), this, true, /*advise_erase=*/false,
-                          /*stats=*/nullptr, kept_in_sec_cache);
+                          kept_in_sec_cache);
    ASSERT_EQ(handle2_1, nullptr);

    ASSERT_OK(sec_cache->Insert(key2, &item2, GetHelper(), false));
@@ -115,7 +115,7 @@ class CompressedSecondaryCacheTestBase : public testing::Test,
    }
    std::unique_ptr<SecondaryCacheResultHandle> handle2_2 =
        sec_cache->Lookup(key2, GetHelper(), this, true, /*advise_erase=*/false,
-                          /*stats=*/nullptr, kept_in_sec_cache);
+                          kept_in_sec_cache);
    ASSERT_NE(handle2_2, nullptr);
    std::unique_ptr<TestItem> val2 =
        std::unique_ptr<TestItem>(static_cast<TestItem*>(handle2_2->Value()));
@@ -196,14 +196,14 @@ class CompressedSecondaryCacheTestBase : public testing::Test,
    bool kept_in_sec_cache{false};
    std::unique_ptr<SecondaryCacheResultHandle> handle1 =
        sec_cache->Lookup(key1, GetHelper(), this, true, /*advise_erase=*/false,
-                          /*stats=*/nullptr, kept_in_sec_cache);
+                          kept_in_sec_cache);
    ASSERT_EQ(handle1, nullptr);

    // Insert k2 and k1 is evicted.
    ASSERT_OK(sec_cache->Insert(key2, &item2, GetHelper(), false));
    std::unique_ptr<SecondaryCacheResultHandle> handle2 =
        sec_cache->Lookup(key2, GetHelper(), this, true, /*advise_erase=*/false,
-                          /*stats=*/nullptr, kept_in_sec_cache);
+                          kept_in_sec_cache);
    ASSERT_NE(handle2, nullptr);
    std::unique_ptr<TestItem> val2 =
        std::unique_ptr<TestItem>(static_cast<TestItem*>(handle2->Value()));
@@ -215,14 +215,14 @@ class CompressedSecondaryCacheTestBase : public testing::Test,

    std::unique_ptr<SecondaryCacheResultHandle> handle1_1 =
        sec_cache->Lookup(key1, GetHelper(), this, true, /*advise_erase=*/false,
-                          /*stats=*/nullptr, kept_in_sec_cache);
+                          kept_in_sec_cache);
    ASSERT_EQ(handle1_1, nullptr);

    // Create Fails.
    SetFailCreate(true);
    std::unique_ptr<SecondaryCacheResultHandle> handle2_1 =
        sec_cache->Lookup(key2, GetHelper(), this, true, /*advise_erase=*/true,
-                          /*stats=*/nullptr, kept_in_sec_cache);
+                          kept_in_sec_cache);
    ASSERT_EQ(handle2_1, nullptr);

    // Save Fails.
@@ -912,9 +912,9 @@ TEST_P(CompressedSecondaryCacheTestWithCompressionParam, EntryRoles) {
    ASSERT_EQ(get_perf_context()->compressed_sec_cache_insert_real_count, 1U);

    bool kept_in_sec_cache{true};
-    std::unique_ptr<SecondaryCacheResultHandle> handle = sec_cache->Lookup(
-        ith_key, GetHelper(role), this, true,
-        /*advise_erase=*/true, /*stats=*/nullptr, kept_in_sec_cache);
+    std::unique_ptr<SecondaryCacheResultHandle> handle =
+        sec_cache->Lookup(ith_key, GetHelper(role), this, true,
+                          /*advise_erase=*/true, kept_in_sec_cache);
    ASSERT_NE(handle, nullptr);

    // Lookup returns the right data
@@ -992,8 +992,6 @@ class CompressedSecCacheTestWithTiered
        /*_capacity=*/0,
        /*_estimated_entry_charge=*/256 << 10,
        /*_num_shard_bits=*/0);
-    // eviction_effort_cap setting simply to avoid churn in existing test
-    hcc_opts.eviction_effort_cap = 100;
    TieredCacheOptions opts;
    lru_opts.capacity = 0;
    lru_opts.num_shard_bits = 0;
@@ -389,13 +389,12 @@ class ClockCacheTest : public testing::Test {
    }
  }

-  void NewShard(size_t capacity, bool strict_capacity_limit = true,
-                int eviction_effort_cap = 30) {
+  void NewShard(size_t capacity, bool strict_capacity_limit = true) {
    DeleteShard();
    shard_ =
        reinterpret_cast<Shard*>(port::cacheline_aligned_alloc(sizeof(Shard)));

-    TableOpts opts{1 /*value_size*/, eviction_effort_cap};
+    TableOpts opts{1 /*value_size*/};
    new (shard_)
        Shard(capacity, strict_capacity_limit, kDontChargeCacheMetadata,
              /*allocator*/ nullptr, &eviction_callback_, &hash_seed_, opts);
@@ -446,20 +445,12 @@ class ClockCacheTest : public testing::Test {
    return Slice(reinterpret_cast<const char*>(&hashed_key), 16U);
  }

-  // A bad hash function for testing / stressing collision handling
  static inline UniqueId64x2 TestHashedKey(char key) {
    // For testing hash near-collision behavior, put the variance in
    // hashed_key in bits that are unlikely to be used as hash bits.
    return {(static_cast<uint64_t>(key) << 56) + 1234U, 5678U};
  }

-  // A reasonable hash function, for testing "typical behavior" etc.
-  template <typename T>
-  static inline UniqueId64x2 CheapHash(T i) {
-    return {static_cast<uint64_t>(i) * uint64_t{0x85EBCA77C2B2AE63},
-            static_cast<uint64_t>(i) * uint64_t{0xC2B2AE3D27D4EB4F}};
-  }
-
  Shard* shard_ = nullptr;

 private:
@@ -692,53 +683,6 @@ TYPED_TEST(ClockCacheTest, ClockEvictionTest) {
  }
 }

-TYPED_TEST(ClockCacheTest, ClockEvictionEffortCapTest) {
-  using HandleImpl = typename ClockCacheTest<TypeParam>::Shard::HandleImpl;
-  for (bool strict_capacity_limit : {true, false}) {
-    SCOPED_TRACE("strict_capacity_limit = " +
-                 std::to_string(strict_capacity_limit));
-    for (int eec : {-42, 0, 1, 10, 100, 1000}) {
-      SCOPED_TRACE("eviction_effort_cap = " + std::to_string(eec));
-      constexpr size_t kCapacity = 1000;
-      // Start with much larger capacity to ensure that we can go way over
-      // capacity without reaching table occupancy limit.
-      this->NewShard(3 * kCapacity, strict_capacity_limit, eec);
-      auto& shard = *this->shard_;
-      shard.SetCapacity(kCapacity);
-
-      // Nearly fill the cache with pinned entries, then add a bunch of
-      // non-pinned entries. eviction_effort_cap should affect how many
-      // evictable entries are present beyond the cache capacity, despite
-      // being evictable.
-      constexpr size_t kCount = kCapacity - 1;
-      std::unique_ptr<HandleImpl* []> ha { new HandleImpl* [kCount] {} };
-      for (size_t i = 0; i < 2 * kCount; ++i) {
-        UniqueId64x2 hkey = this->CheapHash(i);
-        ASSERT_OK(shard.Insert(
-            this->TestKey(hkey), hkey, nullptr /*value*/, &kNoopCacheItemHelper,
-            1 /*charge*/, i < kCount ? &ha[i] : nullptr, Cache::Priority::LOW));
-      }
-
-      if (strict_capacity_limit) {
-        // If strict_capacity_limit is enabled, the cache will never exceed its
-        // capacity
-        EXPECT_EQ(shard.GetOccupancyCount(), kCapacity);
-      } else {
-        // Rough inverse relationship between cap and possible memory
-        // explosion, which shows up as increased table occupancy count.
-        int effective_eec = std::max(int{1}, eec) + 1;
-        EXPECT_NEAR(shard.GetOccupancyCount() * 1.0,
-                    kCount * (1 + 1.4 / effective_eec),
-                    kCount * (0.6 / effective_eec) + 1.0);
-      }
-
-      for (size_t i = 0; i < kCount; ++i) {
-        shard.Release(ha[i]);
-      }
-    }
-  }
-}
-
 namespace {
 struct DeleteCounter {
  int deleted = 0;
@@ -1091,8 +1035,7 @@ class TestSecondaryCache : public SecondaryCache {
  std::unique_ptr<SecondaryCacheResultHandle> Lookup(
      const Slice& key, const Cache::CacheItemHelper* helper,
      Cache::CreateContext* create_context, bool /*wait*/,
-      bool /*advise_erase*/, Statistics* /*stats*/,
-      bool& kept_in_sec_cache) override {
+      bool /*advise_erase*/, bool& kept_in_sec_cache) override {
    std::string key_str = key.ToString();
    TEST_SYNC_POINT_CALLBACK("TestSecondaryCache::Lookup", &key_str);

@@ -119,8 +119,6 @@ CacheWithSecondaryAdapter::~CacheWithSecondaryAdapter() {
    size_t sec_capacity = 0;
    Status s = secondary_cache_->GetCapacity(sec_capacity);
    assert(s.ok());
-    assert(placeholder_usage_ == 0);
-    assert(reserved_usage_ == 0);
    assert(pri_cache_res_->GetTotalMemoryUsed() == sec_capacity);
  }
 #endif  // NDEBUG
@@ -294,8 +292,7 @@ Cache::Handle* CacheWithSecondaryAdapter::Lookup(const Slice& key,
    bool kept_in_sec_cache = false;
    std::unique_ptr<SecondaryCacheResultHandle> secondary_handle =
        secondary_cache_->Lookup(key, helper, create_context, /*wait*/ true,
-                                 found_dummy_entry, stats,
-                                 /*out*/ kept_in_sec_cache);
+                                 found_dummy_entry, /*out*/ kept_in_sec_cache);
    if (secondary_handle) {
      result = Promote(std::move(secondary_handle), key, helper, priority,
                       stats, found_dummy_entry, kept_in_sec_cache);
@@ -349,10 +346,10 @@ void CacheWithSecondaryAdapter::StartAsyncLookupOnMySecondary(
  assert(async_handle.result_handle == nullptr);

  std::unique_ptr<SecondaryCacheResultHandle> secondary_handle =
-      secondary_cache_->Lookup(
-          async_handle.key, async_handle.helper, async_handle.create_context,
-          /*wait*/ false, async_handle.found_dummy_entry, async_handle.stats,
-          /*out*/ async_handle.kept_in_sec_cache);
+      secondary_cache_->Lookup(async_handle.key, async_handle.helper,
+                               async_handle.create_context, /*wait*/ false,
+                               async_handle.found_dummy_entry,
+                               /*out*/ async_handle.kept_in_sec_cache);
  if (secondary_handle) {
    // TODO with stacked secondaries: Check & process if already ready?
    async_handle.pending_handle = secondary_handle.release();
@@ -684,14 +681,12 @@ std::shared_ptr<Cache> NewTieredCache(const TieredCacheOptions& _opts) {
        *(static_cast_with_check<LRUCacheOptions, ShardedCacheOptions>(
            opts.cache_opts));
    cache_opts.capacity = opts.total_capacity;
-    cache_opts.secondary_cache = nullptr;
    cache = cache_opts.MakeSharedCache();
  } else if (opts.cache_type == PrimaryCacheType::kCacheTypeHCC) {
    HyperClockCacheOptions cache_opts =
        *(static_cast_with_check<HyperClockCacheOptions, ShardedCacheOptions>(
            opts.cache_opts));
    cache_opts.capacity = opts.total_capacity;
-    cache_opts.secondary_cache = nullptr;
    cache = cache_opts.MakeSharedCache();
  } else {
    return nullptr;
@@ -5,8 +5,6 @@

 #include "cache/tiered_secondary_cache.h"

-#include "monitoring/statistics_impl.h"
-
 namespace ROCKSDB_NAMESPACE {

 // Creation callback for use in the lookup path. It calls the upper layer
@@ -31,9 +29,6 @@ Status TieredSecondaryCache::MaybeInsertAndCreate(
    // TODO: Don't hardcode the source
    context->comp_sec_cache->InsertSaved(*context->key, data, type, source)
        .PermitUncheckedError();
-    RecordTick(context->stats, COMPRESSED_SECONDARY_CACHE_PROMOTIONS);
-  } else {
-    RecordTick(context->stats, COMPRESSED_SECONDARY_CACHE_PROMOTION_SKIPS);
  }
  // Primary cache will accept the object, so call its helper to create
  // the object
@@ -48,10 +43,10 @@ Status TieredSecondaryCache::MaybeInsertAndCreate(
 std::unique_ptr<SecondaryCacheResultHandle> TieredSecondaryCache::Lookup(
    const Slice& key, const Cache::CacheItemHelper* helper,
    Cache::CreateContext* create_context, bool wait, bool advise_erase,
-    Statistics* stats, bool& kept_in_sec_cache) {
+    bool& kept_in_sec_cache) {
  bool dummy = false;
  std::unique_ptr<SecondaryCacheResultHandle> result =
-      target()->Lookup(key, helper, create_context, wait, advise_erase, stats,
+      target()->Lookup(key, helper, create_context, wait, advise_erase,
                       /*kept_in_sec_cache=*/dummy);
  // We never want the item to spill back into the secondary cache
  kept_in_sec_cache = true;
@@ -71,10 +66,9 @@ std::unique_ptr<SecondaryCacheResultHandle> TieredSecondaryCache::Lookup(
    ctx.helper = helper;
    ctx.inner_ctx = create_context;
    ctx.comp_sec_cache = target();
-    ctx.stats = stats;

    return nvm_sec_cache_->Lookup(key, outer_helper, &ctx, wait, advise_erase,
-                                  stats, kept_in_sec_cache);
+                                  kept_in_sec_cache);
  }

  // If wait is false, i.e its an async lookup, we have to allocate a result
@@ -86,10 +80,8 @@ std::unique_ptr<SecondaryCacheResultHandle> TieredSecondaryCache::Lookup(
  handle->ctx()->helper = helper;
  handle->ctx()->inner_ctx = create_context;
  handle->ctx()->comp_sec_cache = target();
-  handle->ctx()->stats = stats;
-  handle->SetInnerHandle(
-      nvm_sec_cache_->Lookup(key, outer_helper, handle->ctx(), wait,
-                             advise_erase, stats, kept_in_sec_cache));
+  handle->SetInnerHandle(nvm_sec_cache_->Lookup(
+      key, outer_helper, handle->ctx(), wait, advise_erase, kept_in_sec_cache));
  if (!handle->inner_handle()) {
    handle.reset();
  } else {
@@ -117,8 +109,10 @@ void TieredSecondaryCache::WaitAll(
  }
  nvm_sec_cache_->WaitAll(nvm_handles);
  for (auto handle : my_handles) {
-    assert(handle->inner_handle()->IsReady());
-    handle->Complete();
+    assert(handle->IsReady());
+    auto nvm_handle = handle->inner_handle();
+    handle->SetSize(nvm_handle->Size());
+    handle->SetValue(nvm_handle->Value());
  }
 }

@@ -59,7 +59,7 @@ class TieredSecondaryCache : public SecondaryCacheWrapper {
  virtual std::unique_ptr<SecondaryCacheResultHandle> Lookup(
      const Slice& key, const Cache::CacheItemHelper* helper,
      Cache::CreateContext* create_context, bool wait, bool advise_erase,
-      Statistics* stats, bool& kept_in_sec_cache) override;
+      bool& kept_in_sec_cache) override;

  virtual void WaitAll(
      std::vector<SecondaryCacheResultHandle*> handles) override;
@@ -72,7 +72,6 @@ class TieredSecondaryCache : public SecondaryCacheWrapper {
    Cache::CreateContext* inner_ctx;
    std::shared_ptr<SecondaryCacheResultHandle> inner_handle;
    SecondaryCache* comp_sec_cache;
-    Statistics* stats;
  };

  class ResultHandle : public SecondaryCacheResultHandle {
@@ -80,10 +79,7 @@ class TieredSecondaryCache : public SecondaryCacheWrapper {
    ~ResultHandle() override {}

    bool IsReady() override {
-      if (inner_handle_ && inner_handle_->IsReady()) {
-        Complete();
-      }
-      return ready_;
+      return !inner_handle_ || inner_handle_->IsReady();
    }

    void Wait() override {
@@ -96,10 +92,10 @@ class TieredSecondaryCache : public SecondaryCacheWrapper {
    Cache::ObjectPtr Value() override { return value_; }

    void Complete() {
+      assert(IsReady());
      size_ = inner_handle_->Size();
      value_ = inner_handle_->Value();
      inner_handle_.reset();
-      ready_ = true;
    }

    void SetInnerHandle(std::unique_ptr<SecondaryCacheResultHandle>&& handle) {
@@ -119,7 +115,6 @@ class TieredSecondaryCache : public SecondaryCacheWrapper {
    CreateContext ctx_;
    size_t size_;
    Cache::ObjectPtr value_;
-    bool ready_ = false;
  };

  static void NoopDelete(Cache::ObjectPtr /*obj*/,
@@ -15,11 +15,10 @@ namespace ROCKSDB_NAMESPACE {

 class TestSecondaryCache : public SecondaryCache {
 public:
-  explicit TestSecondaryCache(size_t capacity, bool ready_before_wait)
+  explicit TestSecondaryCache(size_t capacity)
      : cache_(NewLRUCache(capacity, 0, false, 0.5 /* high_pri_pool_ratio */,
                           nullptr, kDefaultToAdaptiveMutex,
                           kDontChargeCacheMetadata)),
-        ready_before_wait_(ready_before_wait),
        num_insert_saved_(0),
        num_hits_(0),
        num_misses_(0) {}
@@ -62,7 +61,7 @@ class TestSecondaryCache : public SecondaryCache {
  std::unique_ptr<SecondaryCacheResultHandle> Lookup(
      const Slice& key, const Cache::CacheItemHelper* helper,
      Cache::CreateContext* create_context, bool wait, bool /*advise_erase*/,
-      Statistics* /*stats*/, bool& kept_in_sec_cache) override {
+      bool& kept_in_sec_cache) override {
    std::string key_str = key.ToString();
    TEST_SYNC_POINT_CALLBACK("TestSecondaryCache::Lookup", &key_str);

@@ -89,8 +88,7 @@ class TestSecondaryCache : public SecondaryCache {
                            /*alloc*/ nullptr, &value, &charge);
      if (s.ok()) {
        secondary_handle.reset(new TestSecondaryCacheResultHandle(
-            cache_.get(), handle, value, charge,
-            /*ready=*/wait || ready_before_wait_));
+            cache_.get(), handle, value, charge, /*ready=*/wait));
        kept_in_sec_cache = true;
      } else {
        cache_.Release(handle);
@@ -170,7 +168,6 @@ class TestSecondaryCache : public SecondaryCache {
      BasicTypedSharedCacheInterface<char[], CacheEntryRole::kMisc>;
  using TypedHandle = SharedCache::TypedHandle;
  SharedCache cache_;
-  bool ready_before_wait_;
  uint32_t num_insert_saved_;
  uint32_t num_hits_;
  uint32_t num_misses_;
@@ -182,10 +179,11 @@ class DBTieredSecondaryCacheTest : public DBTestBase {
  DBTieredSecondaryCacheTest()
      : DBTestBase("db_tiered_secondary_cache_test", /*env_do_fsync=*/true) {}

-  std::shared_ptr<Cache> NewCache(
-      size_t pri_capacity, size_t compressed_capacity, size_t nvm_capacity,
-      TieredAdmissionPolicy adm_policy = TieredAdmissionPolicy::kAdmPolicyAuto,
-      bool ready_before_wait = false) {
+  std::shared_ptr<Cache> NewCache(size_t pri_capacity,
+                                  size_t compressed_capacity,
+                                  size_t nvm_capacity,
+                                  TieredAdmissionPolicy adm_policy =
+                                      TieredAdmissionPolicy::kAdmPolicyAuto) {
    LRUCacheOptions lru_opts;
    TieredCacheOptions opts;
    lru_opts.capacity = 0;
@@ -196,11 +194,10 @@ class DBTieredSecondaryCacheTest : public DBTestBase {
    opts.comp_cache_opts.capacity = 0;
    opts.comp_cache_opts.num_shard_bits = 0;
    opts.total_capacity = pri_capacity + compressed_capacity;
-    opts.compressed_secondary_ratio = compressed_secondary_ratio_ =
+    opts.compressed_secondary_ratio =
        (double)compressed_capacity / opts.total_capacity;
    if (nvm_capacity > 0) {
-      nvm_sec_cache_.reset(
-          new TestSecondaryCache(nvm_capacity, ready_before_wait));
+      nvm_sec_cache_.reset(new TestSecondaryCache(nvm_capacity));
      opts.nvm_sec_cache = nvm_sec_cache_;
    }
    opts.adm_policy = adm_policy;
@@ -210,12 +207,6 @@ class DBTieredSecondaryCacheTest : public DBTestBase {
    return cache_;
  }

-  void ClearPrimaryCache() {
-    ASSERT_EQ(UpdateTieredCache(cache_, -1, 1.0), Status::OK());
-    ASSERT_EQ(UpdateTieredCache(cache_, -1, compressed_secondary_ratio_),
-              Status::OK());
-  }
-
  TestSecondaryCache* nvm_sec_cache() { return nvm_sec_cache_.get(); }

  CompressedSecondaryCache* compressed_secondary_cache() {
@@ -227,7 +218,6 @@ class DBTieredSecondaryCacheTest : public DBTestBase {
 private:
  std::shared_ptr<Cache> cache_;
  std::shared_ptr<TestSecondaryCache> nvm_sec_cache_;
-  double compressed_secondary_ratio_;
 };

 // In this test, the block size is set to 4096. Each value is 1007 bytes, so
@@ -592,116 +582,6 @@ TEST_F(DBTieredSecondaryCacheTest, WaitAllTest) {
  Destroy(options);
 }

-TEST_F(DBTieredSecondaryCacheTest, ReadyBeforeWaitAllTest) {
-  if (!LZ4_Supported()) {
-    ROCKSDB_GTEST_SKIP("This test requires LZ4 support.");
-    return;
-  }
-
-  BlockBasedTableOptions table_options;
-  table_options.block_cache = NewCache(250 * 1024, 20 * 1024, 256 * 1024,
-                                       TieredAdmissionPolicy::kAdmPolicyAuto,
-                                       /*ready_before_wait=*/true);
-  table_options.block_size = 4 * 1024;
-  table_options.cache_index_and_filter_blocks = false;
-  Options options = GetDefaultOptions();
-  options.create_if_missing = true;
-  options.table_factory.reset(NewBlockBasedTableFactory(table_options));
-  options.statistics = CreateDBStatistics();
-
-  options.paranoid_file_checks = false;
-  DestroyAndReopen(options);
-  Random rnd(301);
-  const int N = 256;
-  for (int i = 0; i < N; i++) {
-    std::string p_v;
-    test::CompressibleString(&rnd, 0.5, 1007, &p_v);
-    ASSERT_OK(Put(Key(i), p_v));
-  }
-
-  ASSERT_OK(Flush());
-
-  std::vector<std::string> keys;
-  std::vector<std::string> values;
-
-  keys.push_back(Key(0));
-  keys.push_back(Key(4));
-  keys.push_back(Key(8));
-  values = MultiGet(keys, /*snapshot=*/nullptr, /*async=*/true);
-  ASSERT_EQ(values.size(), keys.size());
-  for (auto value : values) {
-    ASSERT_EQ(1007, value.size());
-  }
-  ASSERT_EQ(nvm_sec_cache()->num_insert_saved(), 3u);
-  ASSERT_EQ(nvm_sec_cache()->num_misses(), 3u);
-  ASSERT_EQ(nvm_sec_cache()->num_hits(), 0u);
-  ASSERT_EQ(options.statistics->getTickerCount(BLOCK_CACHE_MISS), 3u);
-
-  keys.clear();
-  values.clear();
-  keys.push_back(Key(12));
-  keys.push_back(Key(16));
-  keys.push_back(Key(20));
-  values = MultiGet(keys, /*snapshot=*/nullptr, /*async=*/true);
-  ASSERT_EQ(values.size(), keys.size());
-  for (auto value : values) {
-    ASSERT_EQ(1007, value.size());
-  }
-  ASSERT_EQ(nvm_sec_cache()->num_insert_saved(), 6u);
-  ASSERT_EQ(nvm_sec_cache()->num_misses(), 6u);
-  ASSERT_EQ(nvm_sec_cache()->num_hits(), 0u);
-  ASSERT_EQ(options.statistics->getTickerCount(BLOCK_CACHE_MISS), 6u);
-
-  keys.clear();
-  values.clear();
-  keys.push_back(Key(0));
-  keys.push_back(Key(4));
-  keys.push_back(Key(8));
-  values = MultiGet(keys, /*snapshot=*/nullptr, /*async=*/true);
-  ASSERT_EQ(values.size(), keys.size());
-  for (auto value : values) {
-    ASSERT_EQ(1007, value.size());
-  }
-  ASSERT_EQ(nvm_sec_cache()->num_insert_saved(), 6u);
-  ASSERT_EQ(nvm_sec_cache()->num_misses(), 6u);
-  ASSERT_EQ(nvm_sec_cache()->num_hits(), 3u);
-  ASSERT_EQ(options.statistics->getTickerCount(BLOCK_CACHE_MISS), 6u);
-
-  ClearPrimaryCache();
-
-  keys.clear();
-  values.clear();
-  keys.push_back(Key(0));
-  keys.push_back(Key(32));
-  keys.push_back(Key(36));
-  values = MultiGet(keys, /*snapshot=*/nullptr, /*async=*/true);
-  ASSERT_EQ(values.size(), keys.size());
-  for (auto value : values) {
-    ASSERT_EQ(1007, value.size());
-  }
-  ASSERT_EQ(nvm_sec_cache()->num_insert_saved(), 8u);
-  ASSERT_EQ(nvm_sec_cache()->num_misses(), 8u);
-  ASSERT_EQ(nvm_sec_cache()->num_hits(), 4u);
-  ASSERT_EQ(options.statistics->getTickerCount(BLOCK_CACHE_MISS), 8u);
-
-  keys.clear();
-  values.clear();
-  keys.push_back(Key(0));
-  keys.push_back(Key(32));
-  keys.push_back(Key(36));
-  values = MultiGet(keys, /*snapshot=*/nullptr, /*async=*/true);
-  ASSERT_EQ(values.size(), keys.size());
-  for (auto value : values) {
-    ASSERT_EQ(1007, value.size());
-  }
-  ASSERT_EQ(nvm_sec_cache()->num_insert_saved(), 8u);
-  ASSERT_EQ(nvm_sec_cache()->num_misses(), 8u);
-  ASSERT_EQ(nvm_sec_cache()->num_hits(), 4u);
-  ASSERT_EQ(options.statistics->getTickerCount(BLOCK_CACHE_MISS), 8u);
-
-  Destroy(options);
-}
-
 // This test is for iteration. It iterates through a set of keys in two
 // passes. First pass loads the compressed blocks into the nvm tier, and
 // the second pass should hit all of those blocks.
@@ -1220,7 +1220,7 @@ TEST_F(BlobSecondaryCacheTest, GetBlobsFromSecondaryCache) {
      auto sec_handle0 = secondary_cache->Lookup(
          key0, BlobSource::SharedCacheInterface::GetFullHelper(),
          /*context*/ nullptr, true,
-          /*advise_erase=*/true, /*stats=*/nullptr, kept_in_sec_cache);
+          /*advise_erase=*/true, kept_in_sec_cache);
      ASSERT_FALSE(kept_in_sec_cache);
      ASSERT_NE(sec_handle0, nullptr);
      ASSERT_TRUE(sec_handle0->IsReady());
@@ -1248,7 +1248,7 @@ TEST_F(BlobSecondaryCacheTest, GetBlobsFromSecondaryCache) {
      auto sec_handle1 = secondary_cache->Lookup(
          key1, BlobSource::SharedCacheInterface::GetFullHelper(),
          /*context*/ nullptr, true,
-          /*advise_erase=*/true, /*stats=*/nullptr, kept_in_sec_cache);
+          /*advise_erase=*/true, kept_in_sec_cache);
      ASSERT_FALSE(kept_in_sec_cache);
      ASSERT_EQ(sec_handle1, nullptr);

@@ -45,7 +45,6 @@
 #include "rocksdb/utilities/transaction_db.h"
 #include "rocksdb/utilities/write_batch_with_index.h"
 #include "rocksdb/write_batch.h"
-#include "rocksdb/write_buffer_manager.h"
 #include "utilities/merge_operators.h"

 using ROCKSDB_NAMESPACE::BackupEngine;
@@ -126,7 +125,6 @@ using ROCKSDB_NAMESPACE::WALRecoveryMode;
 using ROCKSDB_NAMESPACE::WritableFile;
 using ROCKSDB_NAMESPACE::WriteBatch;
 using ROCKSDB_NAMESPACE::WriteBatchWithIndex;
-using ROCKSDB_NAMESPACE::WriteBufferManager;
 using ROCKSDB_NAMESPACE::WriteOptions;

 using std::unordered_set;
@@ -221,9 +219,6 @@ struct rocksdb_memory_allocator_t {
 struct rocksdb_cache_t {
  std::shared_ptr<Cache> rep;
 };
-struct rocksdb_write_buffer_manager_t {
-  std::shared_ptr<WriteBufferManager> rep;
-};
 struct rocksdb_livefiles_t {
  std::vector<LiveFileMetaData> rep;
 };
@@ -2909,16 +2904,6 @@ void rocksdb_options_set_db_paths(rocksdb_options_t* opt,
  opt->rep.db_paths = db_paths;
 }

-void rocksdb_options_set_cf_paths(rocksdb_options_t* opt,
-                                  const rocksdb_dbpath_t** dbpath_values,
-                                  size_t num_paths) {
-  std::vector<DbPath> cf_paths(num_paths);
-  for (size_t i = 0; i < num_paths; ++i) {
-    cf_paths[i] = dbpath_values[i]->rep;
-  }
-  opt->rep.cf_paths = cf_paths;
-}
-
 void rocksdb_options_set_env(rocksdb_options_t* opt, rocksdb_env_t* env) {
  opt->rep.env = (env ? env->rep : nullptr);
 }
@@ -2950,11 +2935,6 @@ void rocksdb_options_set_write_buffer_size(rocksdb_options_t* opt, size_t s) {
  opt->rep.write_buffer_size = s;
 }

-void rocksdb_options_set_write_buffer_manager(
-    rocksdb_options_t* opt, rocksdb_write_buffer_manager_t* wbm) {
-  opt->rep.write_buffer_manager = wbm->rep;
-}
-
 size_t rocksdb_options_get_write_buffer_size(rocksdb_options_t* opt) {
  return opt->rep.write_buffer_size;
 }
@@ -3049,16 +3029,6 @@ void rocksdb_options_set_max_bytes_for_level_multiplier_additional(
  }
 }

-void rocksdb_options_set_periodic_compaction_seconds(rocksdb_options_t* opt,
-                                                     uint64_t seconds) {
-  opt->rep.periodic_compaction_seconds = seconds;
-}
-
-uint64_t rocksdb_options_get_periodic_compaction_seconds(
-    rocksdb_options_t* opt) {
-  return opt->rep.periodic_compaction_seconds;
-}
-
 void rocksdb_options_enable_statistics(rocksdb_options_t* opt) {
  opt->rep.statistics = ROCKSDB_NAMESPACE::CreateDBStatistics();
 }
@@ -3987,16 +3957,6 @@ rocksdb_ratelimiter_t* rocksdb_ratelimiter_create(int64_t rate_bytes_per_sec,
  return rate_limiter;
 }

-rocksdb_ratelimiter_t* rocksdb_ratelimiter_create_auto_tuned(
-    int64_t rate_bytes_per_sec, int64_t refill_period_us, int32_t fairness) {
-  rocksdb_ratelimiter_t* rate_limiter = new rocksdb_ratelimiter_t;
-  rate_limiter->rep.reset(NewGenericRateLimiter(rate_bytes_per_sec,
-                                                refill_period_us, fairness,
-                                                RateLimiter::Mode::kWritesOnly,
-                                                true));  // auto_tuned
-  return rate_limiter;
-}
-
 void rocksdb_ratelimiter_destroy(rocksdb_ratelimiter_t* limiter) {
  delete limiter;
 }
@@ -4906,60 +4866,6 @@ size_t rocksdb_cache_get_occupancy_count(const rocksdb_cache_t* cache) {
  return cache->rep->GetOccupancyCount();
 }

-rocksdb_write_buffer_manager_t* rocksdb_write_buffer_manager_create(
-    size_t buffer_size, bool allow_stall) {
-  rocksdb_write_buffer_manager_t* wbm = new rocksdb_write_buffer_manager_t;
-  wbm->rep.reset(new WriteBufferManager(buffer_size, {}, allow_stall));
-  return wbm;
-}
-
-rocksdb_write_buffer_manager_t* rocksdb_write_buffer_manager_create_with_cache(
-    size_t buffer_size, const rocksdb_cache_t* cache, bool allow_stall) {
-  rocksdb_write_buffer_manager_t* wbm = new rocksdb_write_buffer_manager_t;
-  wbm->rep.reset(new WriteBufferManager(buffer_size, cache->rep, allow_stall));
-  return wbm;
-}
-
-void rocksdb_write_buffer_manager_destroy(rocksdb_write_buffer_manager_t* wbm) {
-  delete wbm;
-}
-
-bool rocksdb_write_buffer_manager_enabled(rocksdb_write_buffer_manager_t* wbm) {
-  return wbm->rep->enabled();
-}
-
-bool rocksdb_write_buffer_manager_cost_to_cache(
-    rocksdb_write_buffer_manager_t* wbm) {
-  return wbm->rep->cost_to_cache();
-}
-
-size_t rocksdb_write_buffer_manager_memory_usage(
-    rocksdb_write_buffer_manager_t* wbm) {
-  return wbm->rep->memory_usage();
-}
-
-size_t rocksdb_write_buffer_manager_mutable_memtable_memory_usage(
-    rocksdb_write_buffer_manager_t* wbm) {
-  return wbm->rep->mutable_memtable_memory_usage();
-}
-
-size_t rocksdb_write_buffer_manager_dummy_entries_in_cache_usage(
-    rocksdb_write_buffer_manager_t* wbm) {
-  return wbm->rep->dummy_entries_in_cache_usage();
-}
-size_t rocksdb_write_buffer_manager_buffer_size(
-    rocksdb_write_buffer_manager_t* wbm) {
-  return wbm->rep->buffer_size();
-}
-void rocksdb_write_buffer_manager_set_buffer_size(
-    rocksdb_write_buffer_manager_t* wbm, size_t new_size) {
-  wbm->rep->SetBufferSize(new_size);
-}
-ROCKSDB_LIBRARY_API void rocksdb_write_buffer_manager_set_allow_stall(
-    rocksdb_write_buffer_manager_t* wbm, bool new_allow_stall) {
-  wbm->rep->SetAllowStall(new_allow_stall);
-}
-
 rocksdb_dbpath_t* rocksdb_dbpath_create(const char* path,
                                        uint64_t target_size) {
  rocksdb_dbpath_t* result = new rocksdb_dbpath_t;
@@ -5558,11 +5464,6 @@ char* rocksdb_sst_file_metadata_get_relative_filename(
  return strdup(file_meta->rep->relative_filename.c_str());
 }

-char* rocksdb_sst_file_metadata_get_directory(
-    rocksdb_sst_file_metadata_t* file_meta) {
-  return strdup(file_meta->rep->directory.c_str());
-}
-
 uint64_t rocksdb_sst_file_metadata_get_size(
    rocksdb_sst_file_metadata_t* file_meta) {
  return file_meta->rep->size;
@@ -713,11 +713,6 @@ int main(int argc, char** argv) {
  rocksdb_options_set_ratelimiter(options, rate_limiter);
  rocksdb_ratelimiter_destroy(rate_limiter);

-  rate_limiter =
-      rocksdb_ratelimiter_create_auto_tuned(1000 * 1024 * 1024, 100 * 1000, 10);
-  rocksdb_options_set_ratelimiter(options, rate_limiter);
-  rocksdb_ratelimiter_destroy(rate_limiter);
-
  roptions = rocksdb_readoptions_create();
  rocksdb_readoptions_set_verify_checksums(roptions, 1);
  rocksdb_readoptions_set_fill_cache(roptions, 1);
@@ -1479,20 +1474,10 @@ int main(int argc, char** argv) {
    CheckCondition(cflen == 2);
    rocksdb_list_column_families_destroy(column_fams, cflen);

-    rocksdb_options_t* cf_options_1 = rocksdb_options_create();
-    rocksdb_options_t* cf_options_2 = rocksdb_options_create();
-
-    // use dbpathname2 as the cf_path for "cf1"
-    rocksdb_dbpath_t* dbpath2;
-    char dbpathname2[200];
-    snprintf(dbpathname2, sizeof(dbpathname2), "%s/rocksdb_c_test-%d-dbpath2",
-             GetTempDir(), ((int)geteuid()));
-    dbpath2 = rocksdb_dbpath_create(dbpathname2, 1024 * 1024);
-    const rocksdb_dbpath_t* cf_paths[1] = {dbpath2};
-    rocksdb_options_set_cf_paths(cf_options_2, cf_paths, 1);
+    rocksdb_options_t* cf_options = rocksdb_options_create();

    const char* cf_names[2] = {"default", "cf1"};
-    const rocksdb_options_t* cf_opts[2] = {cf_options_1, cf_options_2};
+    const rocksdb_options_t* cf_opts[2] = {cf_options, cf_options};
    rocksdb_column_family_handle_t* handles[2];

    LoadAndCheckLatestOptions(dbname, env, false, cache, NULL, 2, cf_names,
@@ -1520,37 +1505,6 @@ int main(int argc, char** argv) {
    rocksdb_flushoptions_t* flush_options = rocksdb_flushoptions_create();
    rocksdb_flushoptions_set_wait(flush_options, 1);
    rocksdb_flush_cf(db, flush_options, handles[1], &err);
-
-    // make sure all files in "cf1" are under the specified cf path
-    {
-      rocksdb_column_family_metadata_t* cf_meta =
-          rocksdb_get_column_family_metadata_cf(db, handles[1]);
-      size_t cf_file_count = rocksdb_column_family_metadata_get_size(cf_meta);
-      assert(cf_file_count > 0);
-      size_t level_count =
-          rocksdb_column_family_metadata_get_level_count(cf_meta);
-      assert(level_count > 0);
-      for (size_t l = 0; l < level_count; ++l) {
-        rocksdb_level_metadata_t* level_meta =
-            rocksdb_column_family_metadata_get_level_metadata(cf_meta, l);
-        assert(level_meta);
-
-        size_t file_count = rocksdb_level_metadata_get_file_count(level_meta);
-        for (size_t f = 0; f < file_count; ++f) {
-          rocksdb_sst_file_metadata_t* file_meta =
-              rocksdb_level_metadata_get_sst_file_metadata(level_meta, f);
-          assert(file_meta);
-          char* file_path = rocksdb_sst_file_metadata_get_directory(file_meta);
-          assert(strcmp(file_path, dbpathname2) == 0);
-          Free(&file_path);
-          rocksdb_sst_file_metadata_destroy(file_meta);
-        }
-        rocksdb_level_metadata_destroy(level_meta);
-      }
-
-      rocksdb_column_family_metadata_destroy(cf_meta);
-    }
-
    CheckNoError(err) rocksdb_flushoptions_destroy(flush_options);

    CheckGetCF(db, roptions, handles[1], "foo", "hello");
@@ -1714,9 +1668,7 @@ int main(int argc, char** argv) {
    }
    rocksdb_destroy_db(options, dbname, &err);
    rocksdb_options_destroy(db_options);
-    rocksdb_options_destroy(cf_options_1);
-    rocksdb_options_destroy(cf_options_2);
-    rocksdb_dbpath_destroy(dbpath2);
+    rocksdb_options_destroy(cf_options);
  }

  StartPhase("prefix");
@@ -1921,10 +1873,6 @@ int main(int argc, char** argv) {
    CheckCondition(2.0 ==
                   rocksdb_options_get_max_bytes_for_level_multiplier(o));

-    rocksdb_options_set_periodic_compaction_seconds(o, 100000);
-    CheckCondition(100000 ==
-                   rocksdb_options_get_periodic_compaction_seconds(o));
-
    rocksdb_options_set_skip_stats_update_on_db_open(o, 1);
    CheckCondition(1 == rocksdb_options_get_skip_stats_update_on_db_open(o));

@@ -2355,12 +2303,6 @@ int main(int argc, char** argv) {
    CheckCondition(2.0 ==
                   rocksdb_options_get_max_bytes_for_level_multiplier(o));

-    rocksdb_options_set_periodic_compaction_seconds(copy, 8000);
-    CheckCondition(8000 ==
-                   rocksdb_options_get_periodic_compaction_seconds(copy));
-    CheckCondition(100000 ==
-                   rocksdb_options_get_periodic_compaction_seconds(o));
-
    rocksdb_options_set_skip_stats_update_on_db_open(copy, 0);
    CheckCondition(0 == rocksdb_options_get_skip_stats_update_on_db_open(copy));
    CheckCondition(1 == rocksdb_options_get_skip_stats_update_on_db_open(o));
@@ -3781,30 +3723,6 @@ int main(int argc, char** argv) {
    rocksdb_wait_for_compact_options_destroy(wco);
  }

-  StartPhase("write_buffer_manager");
-  {
-    rocksdb_cache_t* lru;
-    lru = rocksdb_cache_create_lru(100);
-
-    rocksdb_write_buffer_manager_t* write_buffer_manager;
-    write_buffer_manager =
-        rocksdb_write_buffer_manager_create_with_cache(200, lru, false);
-
-    CheckCondition(true ==
-                   rocksdb_write_buffer_manager_enabled(write_buffer_manager));
-    CheckCondition(true == rocksdb_write_buffer_manager_cost_to_cache(
-                               write_buffer_manager));
-    CheckCondition(
-        200 == rocksdb_write_buffer_manager_buffer_size(write_buffer_manager));
-
-    rocksdb_write_buffer_manager_set_buffer_size(write_buffer_manager, 300);
-    CheckCondition(
-        300 == rocksdb_write_buffer_manager_buffer_size(write_buffer_manager));
-
-    rocksdb_write_buffer_manager_destroy(write_buffer_manager);
-    rocksdb_cache_destroy(lru);
-  }
-
  StartPhase("cancel_all_background_work");
  rocksdb_cancel_all_background_work(db, 1);

@@ -833,8 +833,8 @@ std::unique_ptr<WriteControllerToken> SetupDelay(
  return write_controller->GetDelayToken(write_rate);
 }

-int GetL0FileCountForCompactionSpeedup(int level0_file_num_compaction_trigger,
-                                       int level0_slowdown_writes_trigger) {
+int GetL0ThresholdSpeedupCompaction(int level0_file_num_compaction_trigger,
+                                    int level0_slowdown_writes_trigger) {
  // SanitizeOptions() ensures it.
  assert(level0_file_num_compaction_trigger <= level0_slowdown_writes_trigger);

@@ -864,36 +864,6 @@ int GetL0FileCountForCompactionSpeedup(int level0_file_num_compaction_trigger,
    return static_cast<int>(res);
  }
 }
-
-uint64_t GetPendingCompactionBytesForCompactionSpeedup(
-    const MutableCFOptions& mutable_cf_options,
-    const VersionStorageInfo* vstorage) {
-  // Compaction debt relatively large compared to the stable (bottommost) data
-  // size indicates compaction fell behind.
-  const uint64_t kBottommostSizeMultiplier = 8;
-  // Meaningful progress toward the slowdown trigger is another good indication.
-  const uint64_t kSlowdownTriggerDivisor = 4;
-
-  uint64_t bottommost_files_size = 0;
-  for (const auto& level_and_file : vstorage->BottommostFiles()) {
-    bottommost_files_size += level_and_file.second->fd.GetFileSize();
-  }
-
-  // Slowdown trigger might be zero but that means compaction speedup should
-  // always happen (undocumented/historical), so no special treatment is needed.
-  uint64_t slowdown_threshold =
-      mutable_cf_options.soft_pending_compaction_bytes_limit /
-      kSlowdownTriggerDivisor;
-
-  // Size of zero, however, should not be used to decide to speedup compaction.
-  if (bottommost_files_size == 0) {
-    return slowdown_threshold;
-  }
-
-  uint64_t size_threshold =
-      MultiplyCheckOverflow(bottommost_files_size, kBottommostSizeMultiplier);
-  return std::min(size_threshold, slowdown_threshold);
-}
 }  // anonymous namespace

 std::pair<WriteStallCondition, WriteStallCause>
@@ -1049,7 +1019,7 @@ WriteStallCondition ColumnFamilyData::RecalculateWriteStallConditions(
    } else {
      assert(write_stall_condition == WriteStallCondition::kNormal);
      if (vstorage->l0_delay_trigger_count() >=
-          GetL0FileCountForCompactionSpeedup(
+          GetL0ThresholdSpeedupCompaction(
              mutable_cf_options.level0_file_num_compaction_trigger,
              mutable_cf_options.level0_slowdown_writes_trigger)) {
        write_controller_token_ =
@@ -1059,22 +1029,22 @@ WriteStallCondition ColumnFamilyData::RecalculateWriteStallConditions(
            "[%s] Increasing compaction threads because we have %d level-0 "
            "files ",
            name_.c_str(), vstorage->l0_delay_trigger_count());
-      } else if (mutable_cf_options.soft_pending_compaction_bytes_limit == 0) {
+      } else if (vstorage->estimated_compaction_needed_bytes() >=
+                 mutable_cf_options.soft_pending_compaction_bytes_limit / 4) {
+        // Increase compaction threads if bytes needed for compaction exceeds
+        // 1/4 of threshold for slowing down.
        // If soft pending compaction byte limit is not set, always speed up
        // compaction.
        write_controller_token_ =
            write_controller->GetCompactionPressureToken();
-      } else if (vstorage->estimated_compaction_needed_bytes() >=
-                 GetPendingCompactionBytesForCompactionSpeedup(
-                     mutable_cf_options, vstorage)) {
-        write_controller_token_ =
-            write_controller->GetCompactionPressureToken();
-        ROCKS_LOG_INFO(
-            ioptions_.logger,
-            "[%s] Increasing compaction threads because of estimated pending "
-            "compaction "
-            "bytes %" PRIu64,
-            name_.c_str(), vstorage->estimated_compaction_needed_bytes());
+        if (mutable_cf_options.soft_pending_compaction_bytes_limit > 0) {
+          ROCKS_LOG_INFO(
+              ioptions_.logger,
+              "[%s] Increasing compaction threads because of estimated pending "
+              "compaction "
+              "bytes %" PRIu64,
+              name_.c_str(), vstorage->estimated_compaction_needed_bytes());
+        }
      } else {
        write_controller_token_.reset();
      }
@@ -2971,43 +2971,6 @@ TEST_P(ColumnFamilyTest, CompactionSpeedupTwoColumnFamilies) {
  ASSERT_EQ(1, dbfull()->TEST_BGCompactionsAllowed());
 }

-TEST_P(ColumnFamilyTest, CompactionSpeedupForCompactionDebt) {
-  db_options_.max_background_compactions = 6;
-  Open();
-  ColumnFamilyData* cfd =
-      static_cast<ColumnFamilyHandleImpl*>(db_->DefaultColumnFamily())->cfd();
-  MutableCFOptions mutable_cf_options(column_family_options_);
-  mutable_cf_options.soft_pending_compaction_bytes_limit =
-      std::numeric_limits<uint64_t>::max();
-
-  {
-    // No bottommost data, so debt ratio cannot trigger speedup.
-    VersionStorageInfo* vstorage = cfd->current()->storage_info();
-    vstorage->TEST_set_estimated_compaction_needed_bytes(1048576 /* 1MB */);
-    RecalculateWriteStallConditions(cfd, mutable_cf_options);
-    ASSERT_EQ(1, dbfull()->TEST_BGCompactionsAllowed());
-  }
-
-  // Add a tiny amount of bottommost data.
-  ASSERT_OK(db_->Put(WriteOptions(), "foo", "bar"));
-  ASSERT_OK(db_->Flush(FlushOptions()));
-
-  {
-    // 1MB debt is way bigger than bottommost data so definitely triggers
-    // speedup.
-    VersionStorageInfo* vstorage = cfd->current()->storage_info();
-    vstorage->TEST_set_estimated_compaction_needed_bytes(1048576 /* 1MB */);
-    RecalculateWriteStallConditions(cfd, mutable_cf_options);
-    ASSERT_EQ(6, dbfull()->TEST_BGCompactionsAllowed());
-
-    // Eight bytes is way smaller than bottommost data so definitely does not
-    // trigger speedup.
-    vstorage->TEST_set_estimated_compaction_needed_bytes(8);
-    RecalculateWriteStallConditions(cfd, mutable_cf_options);
-    ASSERT_EQ(1, dbfull()->TEST_BGCompactionsAllowed());
-  }
-}
-
 TEST_P(ColumnFamilyTest, CreateAndDestroyOptions) {
  std::unique_ptr<ColumnFamilyOptions> cfo(new ColumnFamilyOptions());
  ColumnFamilyHandle* cfh;
@@ -115,42 +115,6 @@ void Compaction::GetBoundaryKeys(
  }
 }

-void Compaction::GetBoundaryInternalKeys(
-    VersionStorageInfo* vstorage,
-    const std::vector<CompactionInputFiles>& inputs, InternalKey* smallest_key,
-    InternalKey* largest_key, int exclude_level) {
-  bool initialized = false;
-  const InternalKeyComparator* icmp = vstorage->InternalComparator();
-  for (size_t i = 0; i < inputs.size(); ++i) {
-    if (inputs[i].files.empty() || inputs[i].level == exclude_level) {
-      continue;
-    }
-    if (inputs[i].level == 0) {
-      // we need to consider all files on level 0
-      for (const auto* f : inputs[i].files) {
-        if (!initialized || icmp->Compare(f->smallest, *smallest_key) < 0) {
-          *smallest_key = f->smallest;
-        }
-        if (!initialized || icmp->Compare(f->largest, *largest_key) > 0) {
-          *largest_key = f->largest;
-        }
-        initialized = true;
-      }
-    } else {
-      // we only need to consider the first and last file
-      if (!initialized ||
-          icmp->Compare(inputs[i].files[0]->smallest, *smallest_key) < 0) {
-        *smallest_key = inputs[i].files[0]->smallest;
-      }
-      if (!initialized ||
-          icmp->Compare(inputs[i].files.back()->largest, *largest_key) > 0) {
-        *largest_key = inputs[i].files.back()->largest;
-      }
-      initialized = true;
-    }
-  }
-}
-
 std::vector<CompactionInputFiles> Compaction::PopulateWithAtomicBoundaries(
    VersionStorageInfo* vstorage, std::vector<CompactionInputFiles> inputs) {
  const Comparator* ucmp = vstorage->InternalComparator()->user_comparator();
@@ -435,14 +399,9 @@ void Compaction::PopulatePenultimateLevelOutputRange() {
    }
  }

-  // FIXME: should make use of `penultimate_output_range_type_`.
-  // FIXME: when last level's input range does not overlap with
-  //  penultimate level, and penultimate level input is empty,
-  //  this call will not set penultimate_level_smallest_ or
-  //  penultimate_level_largest_. No keys will be compacted up.
-  GetBoundaryInternalKeys(input_vstorage_, inputs_,
-                          &penultimate_level_smallest_,
-                          &penultimate_level_largest_, exclude_level);
+  GetBoundaryKeys(input_vstorage_, inputs_,
+                  &penultimate_level_smallest_user_key_,
+                  &penultimate_level_largest_user_key_, exclude_level);
 }

 Compaction::~Compaction() {
@@ -467,11 +426,23 @@ bool Compaction::OverlapPenultimateLevelOutputRange(
  if (!SupportsPerKeyPlacement()) {
    return false;
  }
+  const Comparator* ucmp =
+      input_vstorage_->InternalComparator()->user_comparator();

-  // See FIXME in Compaction::PopulatePenultimateLevelOutputRange().
-  // We do not compact any key up in this case.
-  if (penultimate_level_smallest_.size() == 0 ||
-      penultimate_level_largest_.size() == 0) {
+  return ucmp->CompareWithoutTimestamp(
+             smallest_key, penultimate_level_largest_user_key_) <= 0 &&
+         ucmp->CompareWithoutTimestamp(
+             largest_key, penultimate_level_smallest_user_key_) >= 0;
+}
+
+// key includes timestamp if user-defined timestamp is enabled.
+bool Compaction::WithinPenultimateLevelOutputRange(const Slice& key) const {
+  if (!SupportsPerKeyPlacement()) {
+    return false;
+  }
+
+  if (penultimate_level_smallest_user_key_.empty() ||
+      penultimate_level_largest_user_key_.empty()) {
    return false;
  }

@@ -479,28 +450,9 @@ bool Compaction::OverlapPenultimateLevelOutputRange(
      input_vstorage_->InternalComparator()->user_comparator();

  return ucmp->CompareWithoutTimestamp(
-             smallest_key, penultimate_level_largest_.user_key()) <= 0 &&
+             key, penultimate_level_smallest_user_key_) >= 0 &&
         ucmp->CompareWithoutTimestamp(
-             largest_key, penultimate_level_smallest_.user_key()) >= 0;
-}
-
-// key includes timestamp if user-defined timestamp is enabled.
-bool Compaction::WithinPenultimateLevelOutputRange(
-    const ParsedInternalKey& ikey) const {
-  if (!SupportsPerKeyPlacement()) {
-    return false;
-  }
-
-  if (penultimate_level_smallest_.size() == 0 ||
-      penultimate_level_largest_.size() == 0) {
-    return false;
-  }
-
-  const InternalKeyComparator* icmp = input_vstorage_->InternalComparator();
-
-  // op_type of a key can change during compaction, e.g. Merge -> Put.
-  return icmp->CompareKeySeq(ikey, penultimate_level_smallest_.Encode()) >= 0 &&
-         icmp->CompareKeySeq(ikey, penultimate_level_largest_.Encode()) <= 0;
+             key, penultimate_level_largest_user_key_) <= 0;
 }

 bool Compaction::InputCompressionMatchesOutput() const {
@@ -353,6 +353,14 @@ class Compaction {

  Slice GetLargestUserKey() const { return largest_user_key_; }

+  Slice GetPenultimateLevelSmallestUserKey() const {
+    return penultimate_level_smallest_user_key_;
+  }
+
+  Slice GetPenultimateLevelLargestUserKey() const {
+    return penultimate_level_largest_user_key_;
+  }
+
  PenultimateOutputRangeType GetPenultimateOutputRangeType() const {
    return penultimate_output_range_type_;
  }
@@ -375,8 +383,10 @@ class Compaction {
  // per_key_placement feature, which is safe to place the key to the
  // penultimate level. different compaction strategy has different rules.
  // If per_key_placement is not supported, always return false.
+  // TODO: currently it doesn't support moving data from the last level to the
+  //  penultimate level
  //  key includes timestamp if user-defined timestamp is enabled.
-  bool WithinPenultimateLevelOutputRange(const ParsedInternalKey& ikey) const;
+  bool WithinPenultimateLevelOutputRange(const Slice& key) const;

  CompactionReason compaction_reason() const { return compaction_reason_; }

@@ -446,13 +456,6 @@ class Compaction {
                              Slice* smallest_key, Slice* largest_key,
                              int exclude_level = -1);

-  // get the smallest and largest internal key present in files to be compacted
-  static void GetBoundaryInternalKeys(
-      VersionStorageInfo* vstorage,
-      const std::vector<CompactionInputFiles>& inputs,
-      InternalKey* smallest_key, InternalKey* largest_key,
-      int exclude_level = -1);
-
  // populate penultimate level output range, which will be used to determine if
  // a key is safe to output to the penultimate level (details see
  // `Compaction::WithinPenultimateLevelOutputRange()`.
@@ -565,8 +568,8 @@ class Compaction {
  // Key range for penultimate level output
  // includes timestamp if user-defined timestamp is enabled.
  // penultimate_output_range_type_ shows the range type
-  InternalKey penultimate_level_smallest_;
-  InternalKey penultimate_level_largest_;
+  Slice penultimate_level_smallest_user_key_;
+  Slice penultimate_level_largest_user_key_;
  PenultimateOutputRangeType penultimate_output_range_type_ =
      PenultimateOutputRangeType::kNotSupported;
 };
@@ -1227,7 +1227,7 @@ void CompactionIterator::DecideOutputLevel() {
    // not from this compaction.
    // TODO: add statistic for declined output_to_penultimate_level
    bool safe_to_penultimate_level =
-        compaction_->WithinPenultimateLevelOutputRange(ikey_);
+        compaction_->WithinPenultimateLevelOutputRange(ikey_.user_key);
    if (!safe_to_penultimate_level) {
      output_to_penultimate_level_ = false;
      // It could happen when disable/enable `last_level_temperature` while
@@ -1256,13 +1256,10 @@ void CompactionIterator::PrepareOutput() {
      } else if (ikey_.type == kTypeBlobIndex) {
        GarbageCollectBlobIfNeeded();
      }
+    }

-      // For range del sentinel, we don't use it to cut files for bottommost
-      // compaction. So it should not make a difference which output level we
-      // decide.
-      if (compaction_ != nullptr && compaction_->SupportsPerKeyPlacement()) {
-        DecideOutputLevel();
-      }
+    if (compaction_ != nullptr && compaction_->SupportsPerKeyPlacement()) {
+      DecideOutputLevel();
    }

    // Zeroing out the sequence number leads to better compression.
@@ -119,8 +119,7 @@ class CompactionIterator {
    virtual bool SupportsPerKeyPlacement() const = 0;

    // `key` includes timestamp if user-defined timestamp is enabled.
-    virtual bool WithinPenultimateLevelOutputRange(
-        const ParsedInternalKey&) const = 0;
+    virtual bool WithinPenultimateLevelOutputRange(const Slice& key) const = 0;
  };

  class RealCompaction : public CompactionProxy {
@@ -187,9 +186,8 @@ class CompactionIterator {
    // Check if key is within penultimate level output range, to see if it's
    // safe to output to the penultimate level for per_key_placement feature.
    // `key` includes timestamp if user-defined timestamp is enabled.
-    bool WithinPenultimateLevelOutputRange(
-        const ParsedInternalKey& ikey) const override {
-      return compaction_->WithinPenultimateLevelOutputRange(ikey);
+    bool WithinPenultimateLevelOutputRange(const Slice& key) const override {
+      return compaction_->WithinPenultimateLevelOutputRange(key);
    }

   private:
@@ -184,9 +184,8 @@ class FakeCompaction : public CompactionIterator::CompactionProxy {
    return supports_per_key_placement;
  }

-  bool WithinPenultimateLevelOutputRange(
-      const ParsedInternalKey& key) const override {
-    return (!key.user_key.starts_with("unsafe_pb"));
+  bool WithinPenultimateLevelOutputRange(const Slice& key) const override {
+    return (!key.starts_with("unsafe_pb"));
  }

  bool key_not_exists_beyond_output_level = false;
@@ -1900,8 +1900,6 @@ Status CompactionJob::OpenCompactionOutputFile(SubcompactionState* sub_compact,
          sub_compact->start.has_value() ? &tmp_start : nullptr,
          sub_compact->end.has_value() ? &tmp_end : nullptr);
  if (oldest_ancester_time == std::numeric_limits<uint64_t>::max()) {
-    // TODO: fix DBSSTTest.GetTotalSstFilesSize and use
-    //  kUnknownOldestAncesterTime
    oldest_ancester_time = current_time;
  }

@@ -215,9 +215,7 @@ class CompactionJobTestBase : public testing::Test {
            dbname_, &db_options_, env_options_, table_cache_.get(),
            &write_buffer_manager_, &write_controller_,
            /*block_cache_tracer=*/nullptr,
-            /*io_tracer=*/nullptr, /*db_id=*/"", /*db_session_id=*/"",
-            /*daily_offpeak_time_utc=*/"",
-            /*error_handler=*/nullptr)),
+            /*io_tracer=*/nullptr, /*db_id*/ "", /*db_session_id*/ "")),
        shutting_down_(false),
        mock_table_factory_(new mock::MockTableFactory()),
        error_handler_(nullptr, db_options_, &mutex_),
@@ -542,12 +540,11 @@ class CompactionJobTestBase : public testing::Test {
    ASSERT_OK(s);
    db_options_.info_log = info_log;

-    versions_.reset(new VersionSet(
-        dbname_, &db_options_, env_options_, table_cache_.get(),
-        &write_buffer_manager_, &write_controller_,
-        /*block_cache_tracer=*/nullptr, /*io_tracer=*/nullptr,
-        /*db_id=*/"", /*db_session_id=*/"", /*daily_offpeak_time_utc=*/"",
-        /*error_handler=*/nullptr));
+    versions_.reset(
+        new VersionSet(dbname_, &db_options_, env_options_, table_cache_.get(),
+                       &write_buffer_manager_, &write_controller_,
+                       /*block_cache_tracer=*/nullptr, /*io_tracer=*/nullptr,
+                       /*db_id*/ "", /*db_session_id*/ ""));
    compaction_job_stats_.Reset();
    ASSERT_OK(SetIdentityFile(env_, dbname_));

@@ -1527,15 +1524,13 @@ TEST_F(CompactionJobTest, VerifyPenultimateLevelOutput) {
      {files0, files1, files2, files3}, input_levels,
      /*verify_func=*/[&](Compaction& comp) {
        for (char c = 'a'; c <= 'z'; c++) {
+          std::string c_str;
+          c_str = c;
+          const Slice key(c_str);
          if (c == 'a') {
-            ParsedInternalKey pik("a", 0U, kTypeValue);
-            ASSERT_FALSE(comp.WithinPenultimateLevelOutputRange(pik));
+            ASSERT_FALSE(comp.WithinPenultimateLevelOutputRange(key));
          } else {
-            std::string c_str{c};
-            // WithinPenultimateLevelOutputRange checks internal key range.
-            // 'z' is the last key, so set seqno properly.
-            ParsedInternalKey pik(c_str, c == 'z' ? 12U : 0U, kTypeValue);
-            ASSERT_TRUE(comp.WithinPenultimateLevelOutputRange(pik));
+            ASSERT_TRUE(comp.WithinPenultimateLevelOutputRange(key));
          }
        }
      });
@@ -85,8 +85,7 @@ class CompactionPickerTestBase : public testing::Test {
    vstorage_.reset(new VersionStorageInfo(
        &icmp_, ucmp_, options_.num_levels, style, nullptr, false,
        EpochNumberRequirement::kMustPresent, ioptions_.clock,
-        options_.bottommost_file_compaction_delay,
-        OffpeakTimeOption(mutable_db_options_.daily_offpeak_time_utc)));
+        options_.bottommost_file_compaction_delay));
    vstorage_->PrepareForVersionAppend(ioptions_, mutable_cf_options_);
  }

@@ -96,8 +95,7 @@ class CompactionPickerTestBase : public testing::Test {
    temp_vstorage_.reset(new VersionStorageInfo(
        &icmp_, ucmp_, options_.num_levels, ioptions_.compaction_style,
        vstorage_.get(), false, EpochNumberRequirement::kMustPresent,
-        ioptions_.clock, options_.bottommost_file_compaction_delay,
-        OffpeakTimeOption(mutable_db_options_.daily_offpeak_time_utc)));
+        ioptions_.clock, options_.bottommost_file_compaction_delay));
  }

  void DeleteVersionStorage() {
@@ -1202,120 +1202,15 @@ TEST_P(TieredCompactionTest, RangeBasedTieredStorageLevel) {
  ASSERT_EQ("0,0,0,0,0,0,1", FilesPerLevel());
  ASSERT_EQ(GetSstSizeHelper(Temperature::kUnknown), 0);
  ASSERT_GT(GetSstSizeHelper(Temperature::kCold), 0);
+
  ASSERT_EQ(
      options.statistics->getTickerCount(COMPACTION_RANGE_DEL_DROP_OBSOLETE),
      1);
-
-  // Tests that we only compact keys up to penultimate level
-  // that are within penultimate level input's internal key range.
-  {
-    MutexLock l(&mutex);
-    hot_start = Key(0);
-    hot_end = Key(100);
-  }
-  const Snapshot* temp_snap = db_->GetSnapshot();
-  // Key(0) and Key(1) here are inserted with higher sequence number
-  // than Key(0) and Key(1) inserted above.
-  // Only Key(0) in last level will be compacted up, not Key(1).
-  ASSERT_OK(Put(Key(0), "value" + std::to_string(0)));
-  ASSERT_OK(Put(Key(1), "value" + std::to_string(100)));
-  ASSERT_OK(db_->CompactRange(cro, nullptr, nullptr));
-  ASSERT_EQ("0,0,0,0,0,1,1", FilesPerLevel());
-  {
-    std::vector<LiveFileMetaData> metas;
-    db_->GetLiveFilesMetaData(&metas);
-    for (const auto& f : metas) {
-      if (f.temperature == Temperature::kUnknown) {
-        // Expect Key(0), Key(0), Key(1)
-        ASSERT_EQ(f.num_entries, 3);
-        ASSERT_EQ(f.smallestkey, Key(0));
-        ASSERT_EQ(f.largestkey, Key(1));
-      } else {
-        ASSERT_EQ(f.temperature, Temperature::kCold);
-        // Key(2)-Key(49) and Key(100).
-        ASSERT_EQ(f.num_entries, 50);
-      }
-    }
-  }
-  db_->ReleaseSnapshot(temp_snap);
 }

 INSTANTIATE_TEST_CASE_P(TieredCompactionTest, TieredCompactionTest,
                        testing::Bool());

-TEST_P(TieredCompactionTest, CheckInternalKeyRange) {
-  // When compacting keys from the last level to penultimate level,
-  // output to penultimate level should be within internal key range
-  // of input files from penultimate level.
-  // Set up:
-  // L5:
-  //  File 1: DeleteRange[1, 3)@4, File 2: [3@5, 100@6]
-  // L6:
-  // File 3: [2@1, 3@2], File 4: [50@3]
-  //
-  // When File 1 and File 3 are being compacted,
-  // Key(3) cannot be compacted up, otherwise it causes
-  // inconsistency where File 3's Key(3) has a lower sequence number
-  // than File 2's Key(3).
-  const int kNumLevels = 7;
-  auto options = CurrentOptions();
-  SetColdTemperature(options);
-  options.level_compaction_dynamic_level_bytes = true;
-  options.num_levels = kNumLevels;
-  options.statistics = CreateDBStatistics();
-  options.max_subcompactions = 10;
-  options.preclude_last_level_data_seconds = 10000;
-  DestroyAndReopen(options);
-  auto cmp = options.comparator;
-
-  std::string hot_start = Key(0);
-  std::string hot_end = Key(0);
-  SyncPoint::GetInstance()->SetCallBack(
-      "CompactionIterator::PrepareOutput.context", [&](void* arg) {
-        auto context = static_cast<PerKeyPlacementContext*>(arg);
-        context->output_to_penultimate_level =
-            cmp->Compare(context->key, hot_start) >= 0 &&
-            cmp->Compare(context->key, hot_end) < 0;
-      });
-  SyncPoint::GetInstance()->EnableProcessing();
-  // File 1
-  ASSERT_OK(Put(Key(2), "val2"));
-  ASSERT_OK(Put(Key(3), "val3"));
-  ASSERT_OK(Flush());
-  MoveFilesToLevel(6);
-  // File 2
-  ASSERT_OK(Put(Key(50), "val50"));
-  ASSERT_OK(Flush());
-  MoveFilesToLevel(6);
-
-  const Snapshot* snapshot = db_->GetSnapshot();
-  hot_end = Key(100);
-  std::string start = Key(1);
-  std::string end = Key(3);
-  ASSERT_OK(
-      db_->DeleteRange(WriteOptions(), db_->DefaultColumnFamily(), start, end));
-  ASSERT_OK(Flush());
-  MoveFilesToLevel(5);
-  // File 3
-  ASSERT_OK(Put(Key(3), "vall"));
-  ASSERT_OK(Put(Key(100), "val100"));
-  ASSERT_OK(Flush());
-  MoveFilesToLevel(5);
-  // Try to compact keys up
-  CompactRangeOptions cro;
-  cro.bottommost_level_compaction = BottommostLevelCompaction::kForce;
-  start = Key(1);
-  end = Key(2);
-  Slice begin_slice(start);
-  Slice end_slice(end);
-  ASSERT_OK(db_->CompactRange(cro, &begin_slice, &end_slice));
-  // Without internal key range checking, we get the following error:
-  // Corruption: force_consistency_checks(DEBUG): VersionBuilder: L5 has
-  // overlapping ranges: file #18 largest key: '6B6579303030303033' seq:102,
-  // type:1 vs. file #15 smallest key: '6B6579303030303033' seq:104, type:1
-  db_->ReleaseSnapshot(snapshot);
-}
-
 class PrecludeLastLevelTest : public DBTestBase {
 public:
  PrecludeLastLevelTest()
@@ -2076,7 +1971,13 @@ TEST_F(PrecludeLastLevelTest, PartialPenultimateLevelCompaction) {
  Close();
 }

-TEST_F(PrecludeLastLevelTest, RangeDelsCauseFileEndpointsToOverlap) {
+// FIXME broken test:
+// dbfull()->TEST_WaitForCompact()
+// Corruption: force_consistency_checks(DEBUG): VersionBuilder: L5 has
+// overlapping ranges:
+// file #14 largest key: '6B6579303030303134' seq:32, type:1 vs.
+// file #19 smallest key: '6B6579303030303130' seq:10, type:1
+TEST_F(PrecludeLastLevelTest, DISABLED_RangeDelsCauseFileEndpointsToOverlap) {
  const int kNumLevels = 7;
  const int kSecondsPerKey = 10;
  const int kNumFiles = 3;
@@ -4415,8 +4415,6 @@ TEST_F(DBBasicTest, ManifestWriteFailure) {
  options.create_if_missing = true;
  options.disable_auto_compactions = true;
  options.env = env_;
-  options.enable_blob_files = true;
-  options.blob_file_size = 0;
  DestroyAndReopen(options);
  ASSERT_OK(Put("foo", "bar"));
  ASSERT_OK(Flush());
@@ -4437,11 +4435,6 @@ TEST_F(DBBasicTest, ManifestWriteFailure) {
  SyncPoint::GetInstance()->ClearAllCallBacks();
  SyncPoint::GetInstance()->EnableProcessing();
  Reopen(options);
-  // The IO error was a mocked one from the `AfterSyncManifest` callback. The
-  // Flush's VersionEdit actually made it into the Manifest. So these keys can
-  // be read back. Read them to check all live sst files and blob files.
-  ASSERT_EQ("bar", Get("foo"));
-  ASSERT_EQ("value", Get("key"));
 }

 TEST_F(DBBasicTest, DestroyDefaultCfHandle) {
@@ -19,7 +19,7 @@
 #include "rocksdb/concurrent_task_limiter.h"
 #include "rocksdb/experimental.h"
 #include "rocksdb/sst_file_writer.h"
-#include "test_util/mock_time_env.h"
+#include "rocksdb/utilities/convenience.h"
 #include "test_util/sync_point.h"
 #include "test_util/testutil.h"
 #include "util/concurrent_task_limiter_impl.h"
@@ -4794,9 +4794,9 @@ TEST_F(DBCompactionTest, LevelTtlCascadingCompactions) {
      ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
          "VersionEdit::EncodeTo:VarintOldestAncesterTime", [&](void* arg) {
            if (if_restart && if_open_all_files) {
-              std::string* encoded_field = static_cast<std::string*>(arg);
-              *encoded_field = "";
-              PutVarint64(encoded_field, 0);
+              std::string* encoded_fieled = static_cast<std::string*>(arg);
+              *encoded_fieled = "";
+              PutVarint64(encoded_fieled, 0);
            }
          });
      ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->EnableProcessing();
@@ -4942,9 +4942,9 @@ TEST_F(DBCompactionTest, LevelPeriodicCompaction) {
      ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
          "VersionEdit::EncodeTo:VarintFileCreationTime", [&](void* arg) {
            if (if_restart && if_open_all_files) {
-              std::string* encoded_field = static_cast<std::string*>(arg);
-              *encoded_field = "";
-              PutVarint64(encoded_field, 0);
+              std::string* encoded_fieled = static_cast<std::string*>(arg);
+              *encoded_fieled = "";
+              PutVarint64(encoded_fieled, 0);
            }
          });
      ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->EnableProcessing();
@@ -5020,106 +5020,6 @@ TEST_F(DBCompactionTest, LevelPeriodicCompaction) {
  }
 }

-TEST_F(DBCompactionTest, LevelPeriodicCompactionOffpeak) {
-  // This test simply checks if offpeak adjustment works in Leveled
-  // Compactions. For testing offpeak periodic compactions in various
-  // scenarios, please refer to
-  // DBTestUniversalCompaction2::PeriodicCompactionOffpeak
-  constexpr int kNumKeysPerFile = 32;
-  constexpr int kNumLevelFiles = 2;
-  constexpr int kValueSize = 100;
-  constexpr int kSecondsPerDay = 86400;
-  constexpr int kSecondsPerHour = 3600;
-  constexpr int kSecondsPerMinute = 60;
-
-  for (bool if_restart : {false, true}) {
-    SCOPED_TRACE("if_restart=" + std::to_string(if_restart));
-    Options options = CurrentOptions();
-    options.ttl = 0;
-    options.periodic_compaction_seconds = 5 * kSecondsPerDay;  // 5 days
-    // In the case where all files are opened and doing DB restart
-    // forcing the file creation time in manifest file to be 0 to
-    // simulate the case of reading from an old version.
-    ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
-        "VersionEdit::EncodeTo:VarintFileCreationTime", [&](void* arg) {
-          if (if_restart) {
-            std::string* encoded_field = static_cast<std::string*>(arg);
-            *encoded_field = "";
-            PutVarint64(encoded_field, 0);
-          }
-        });
-    ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->EnableProcessing();
-
-    // Just to add some extra random days to current time
-    Random rnd(test::RandomSeed());
-    int days = rnd.Uniform(100);
-
-    int periodic_compactions = 0;
-    ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
-        "LevelCompactionPicker::PickCompaction:Return", [&](void* arg) {
-          Compaction* compaction = static_cast<Compaction*>(arg);
-          auto compaction_reason = compaction->compaction_reason();
-          if (compaction_reason == CompactionReason::kPeriodicCompaction) {
-            periodic_compactions++;
-          }
-        });
-
-    // Starting at 12:15AM
-    int now_hour = 0;
-    int now_minute = 15;
-    auto mock_clock = std::make_shared<MockSystemClock>(env_->GetSystemClock());
-    auto mock_env = std::make_unique<CompositeEnvWrapper>(env_, mock_clock);
-    options.env = mock_env.get();
-    mock_clock->SetCurrentTime(days * kSecondsPerDay +
-                               now_hour * kSecondsPerHour +
-                               now_minute * kSecondsPerMinute);
-    // Offpeak is set from 12:30AM to 4:30AM
-    options.daily_offpeak_time_utc = "00:30-04:30";
-    Reopen(options);
-
-    for (int i = 0; i < kNumLevelFiles; ++i) {
-      for (int j = 0; j < kNumKeysPerFile; ++j) {
-        ASSERT_OK(
-            Put(Key(i * kNumKeysPerFile + j), rnd.RandomString(kValueSize)));
-      }
-      ASSERT_OK(Flush());
-    }
-    ASSERT_OK(dbfull()->TEST_WaitForCompact());
-    ASSERT_EQ("2", FilesPerLevel());
-    ASSERT_EQ(0, periodic_compactions);
-
-    // Move clock forward by 1 hour. Now at 1:15AM Day 0. No compaction.
-    mock_clock->MockSleepForSeconds(1 * kSecondsPerHour);
-    ASSERT_OK(Put("a", "1"));
-    ASSERT_OK(Flush());
-    ASSERT_OK(dbfull()->TEST_WaitForCompact());
-    // Assert that the files stay in the same level
-    ASSERT_EQ("3", FilesPerLevel());
-    ASSERT_EQ(0, periodic_compactions);
-    MoveFilesToLevel(1);
-    ASSERT_EQ("0,3", FilesPerLevel());
-
-    // Move clock forward by 4 days and check if it triggers periodic
-    // comapaction at 1:15AM Day 4. Files created on Day 0 at 12:15AM is
-    // expected to expire before the offpeak starts next day at 12:30AM
-    mock_clock->MockSleepForSeconds(4 * kSecondsPerDay);
-    ASSERT_OK(Put("b", "2"));
-    if (if_restart) {
-      Reopen(options);
-    } else {
-      ASSERT_OK(Flush());
-    }
-    ASSERT_OK(dbfull()->TEST_WaitForCompact());
-    ASSERT_EQ("1,3", FilesPerLevel());
-    // The two old files go through the periodic compaction process
-    ASSERT_EQ(2, periodic_compactions);
-
-    Destroy(options);
-
-    ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->DisableProcessing();
-  }
-}
-
 TEST_F(DBCompactionTest, LevelPeriodicCompactionWithOldDB) {
  // This test makes sure that periodic compactions are working with a DB
  // where file_creation_time of some files is 0.
@@ -121,7 +121,7 @@ Status DBImpl::GetSortedWalFiles(VectorLogPtr& files) {

  // DisableFileDeletions / EnableFileDeletions not supported in read-only DB
  if (deletions_disabled.ok()) {
-    Status s2 = EnableFileDeletions(/*force=*/false);
+    Status s2 = EnableFileDeletions(/*force*/ false);
    assert(s2.ok());
    s2.PermitUncheckedError();
  } else {
@@ -276,11 +276,10 @@ DBImpl::DBImpl(const DBOptions& options, const std::string& dbname,
        this->RecordSeqnoToTimeMapping(/*populate_historical_seconds=*/0);
      });

-  versions_.reset(new VersionSet(
-      dbname_, &immutable_db_options_, file_options_, table_cache_.get(),
-      write_buffer_manager_, &write_controller_, &block_cache_tracer_,
-      io_tracer_, db_id_, db_session_id_, options.daily_offpeak_time_utc,
-      &error_handler_));
+  versions_.reset(new VersionSet(dbname_, &immutable_db_options_, file_options_,
+                                 table_cache_.get(), write_buffer_manager_,
+                                 &write_controller_, &block_cache_tracer_,
+                                 io_tracer_, db_id_, db_session_id_));
  column_family_memtables_.reset(
      new ColumnFamilyMemTablesImpl(versions_->GetColumnFamilySet()));

@@ -360,8 +359,10 @@ Status DBImpl::ResumeImpl(DBRecoverContext context) {
    if (io_s.IsIOError()) {
      // If resuming from IOError resulted from MANIFEST write, then assert
      // that we must have already set the MANIFEST writer to nullptr during
-      // clean-up phase MANIFEST writing.
+      // clean-up phase MANIFEST writing. We must have also disabled file
+      // deletions.
      assert(!versions_->descriptor_log_);
+      assert(!IsFileDeletionsEnabled());
      // Since we are trying to recover from MANIFEST write error, we need to
      // switch to a new MANIFEST anyway. The old MANIFEST can be corrupted.
      // Therefore, force writing a dummy version edit because we do not know
@@ -1327,24 +1328,17 @@ Status DBImpl::SetDBOptions(
      const bool max_compactions_increased =
          new_bg_job_limits.max_compactions >
          current_bg_job_limits.max_compactions;
-      const bool offpeak_time_changed =
-          versions_->offpeak_time_option().daily_offpeak_time_utc !=
-          new_db_options.daily_offpeak_time_utc;

-      if (max_flushes_increased || max_compactions_increased ||
-          offpeak_time_changed) {
+      if (max_flushes_increased || max_compactions_increased) {
        if (max_flushes_increased) {
          env_->IncBackgroundThreadsIfNeeded(new_bg_job_limits.max_flushes,
                                             Env::Priority::HIGH);
        }
+
        if (max_compactions_increased) {
          env_->IncBackgroundThreadsIfNeeded(new_bg_job_limits.max_compactions,
                                             Env::Priority::LOW);
        }
-        if (offpeak_time_changed) {
-          versions_->ChangeOffpeakTimeOption(
-              new_db_options.daily_offpeak_time_utc);
-        }

        MaybeScheduleFlushOrCompaction();
      }
@@ -2056,73 +2050,6 @@ Status DBImpl::GetEntity(const ReadOptions& _read_options,
  return GetImpl(read_options, key, get_impl_options);
 }

-Status DBImpl::GetEntity(const ReadOptions& _read_options, const Slice& key,
-                         PinnableAttributeGroups* result) {
-  if (!result) {
-    return Status::InvalidArgument(
-        "Cannot call GetEntity without PinnableAttributeGroups object");
-  }
-  Status s;
-  const size_t num_column_families = result->size();
-  if (_read_options.io_activity != Env::IOActivity::kUnknown &&
-      _read_options.io_activity != Env::IOActivity::kGetEntity) {
-    s = Status::InvalidArgument(
-        "Cannot call GetEntity with `ReadOptions::io_activity` != "
-        "`Env::IOActivity::kUnknown` or `Env::IOActivity::kGetEntity`");
-    for (size_t i = 0; i < num_column_families; ++i) {
-      (*result)[i].SetStatus(s);
-    }
-    return s;
-  }
-  // return early if no CF was passed in
-  if (num_column_families == 0) {
-    return s;
-  }
-  ReadOptions read_options(_read_options);
-  if (read_options.io_activity == Env::IOActivity::kUnknown) {
-    read_options.io_activity = Env::IOActivity::kGetEntity;
-  }
-  std::vector<Slice> keys;
-  std::vector<ColumnFamilyHandle*> column_families;
-  for (size_t i = 0; i < num_column_families; ++i) {
-    // If any of the CFH is null, break early since the entire query will fail
-    if (!(*result)[i].column_family()) {
-      s = Status::InvalidArgument(
-          "DB failed to query because one or more group(s) have null column "
-          "family handle");
-      (*result)[i].SetStatus(
-          Status::InvalidArgument("Column family handle cannot be null"));
-      break;
-    }
-    // Adding the same key slice for different CFs
-    keys.emplace_back(key);
-    column_families.emplace_back((*result)[i].column_family());
-  }
-  if (!s.ok()) {
-    for (size_t i = 0; i < num_column_families; ++i) {
-      if ((*result)[i].status().ok()) {
-        (*result)[i].SetStatus(
-            Status::Incomplete("DB not queried due to invalid argument(s) in "
-                               "one or more of the attribute groups"));
-      }
-    }
-    return s;
-  }
-  std::vector<PinnableWideColumns> columns(num_column_families);
-  std::vector<Status> statuses(num_column_families);
-  MultiGetCommon(
-      read_options, num_column_families, column_families.data(), keys.data(),
-      /* values */ nullptr, columns.data(),
-      /* timestamps */ nullptr, statuses.data(), /* sorted_input */ false);
-  // Set results
-  for (size_t i = 0; i < num_column_families; ++i) {
-    (*result)[i].Reset();
-    (*result)[i].SetStatus(statuses[i]);
-    (*result)[i].SetColumns(std::move(columns[i]));
-  }
-  return s;
-}
-
 bool DBImpl::ShouldReferenceSuperVersion(const MergeContext& merge_context) {
  // If both thresholds are reached, a function returning merge operands as
  // `PinnableSlice`s should reference the `SuperVersion` to avoid large and/or
@@ -2902,6 +2829,7 @@ void DBImpl::MultiGetCommon(const ReadOptions& read_options,
  bool should_fail = false;
  for (size_t i = 0; i < num_keys; ++i) {
    ColumnFamilyHandle* cfh = column_families[i];
+    assert(cfh);
    if (read_options.timestamp) {
      statuses[i] = FailIfTsMismatchCf(cfh, *(read_options.timestamp));
      if (!statuses[i].ok()) {
@@ -197,8 +197,6 @@ class DBImpl : public DB {
  Status PutEntity(const WriteOptions& options,
                   ColumnFamilyHandle* column_family, const Slice& key,
                   const WideColumns& columns) override;
-  Status PutEntity(const WriteOptions& options, const Slice& key,
-                   const AttributeGroups& attribute_groups) override;

  using DB::Merge;
  Status Merge(const WriteOptions& options, ColumnFamilyHandle* column_family,
@@ -244,8 +242,6 @@ class DBImpl : public DB {
  Status GetEntity(const ReadOptions& options,
                   ColumnFamilyHandle* column_family, const Slice& key,
                   PinnableWideColumns* columns) override;
-  Status GetEntity(const ReadOptions& options, const Slice& key,
-                   PinnableAttributeGroups* result) override;

  using DB::GetMergeOperands;
  Status GetMergeOperands(const ReadOptions& options,
@@ -1190,7 +1186,6 @@ class DBImpl : public DB {
  size_t TEST_GetWalPreallocateBlockSize(uint64_t write_buffer_size) const;
  void TEST_WaitForPeriodicTaskRun(std::function<void()> callback) const;
  SeqnoToTimeMapping TEST_GetSeqnoToTimeMapping() const;
-  const autovector<uint64_t>& TEST_GetFilesToQuarantine() const;
  size_t TEST_EstimateInMemoryStatsHistorySize() const;

  uint64_t TEST_GetCurrentLogNumber() const {
@@ -2381,6 +2376,10 @@ class DBImpl : public DB {

  Status DisableFileDeletionsWithLock();

+  // Safely decrease `disable_delete_obsolete_files_` by one while holding lock
+  // and return its remaning value.
+  int EnableFileDeletionsWithLock();
+
  Status IncreaseFullHistoryTsLowImpl(ColumnFamilyData* cfd,
                                      std::string ts_low);

@@ -2870,9 +2869,7 @@ static void ClipToRange(T* ptr, V minvalue, V maxvalue) {

 inline Status DBImpl::FailIfCfHasTs(
    const ColumnFamilyHandle* column_family) const {
-  if (!column_family) {
-    return Status::InvalidArgument("column family handle cannot be null");
-  }
+  column_family = column_family ? column_family : DefaultColumnFamily();
  assert(column_family);
  const Comparator* const ucmp = column_family->GetComparator();
  assert(ucmp);
@@ -2783,7 +2783,6 @@ void DBImpl::EnableManualCompaction() {

 void DBImpl::MaybeScheduleFlushOrCompaction() {
  mutex_.AssertHeld();
-  TEST_SYNC_POINT("DBImpl::MaybeScheduleFlushOrCompaction:Start");
  if (!opened_successfully_) {
    // Compaction may introduce data race to DB open
    return;
@@ -3301,7 +3300,7 @@ void DBImpl::BackgroundCallFlush(Env::Priority thread_pri) {

    TEST_SYNC_POINT("DBImpl::BackgroundCallFlush:FlushFinish:0");
    ReleaseFileNumberFromPendingOutputs(pending_outputs_inserted_elem);
-    // There is no need to find obsolete files if the flush job is rescheduled
+    // There is no need to do these clean up if the flush job is rescheduled
    // to retain user-defined timestamps because the job doesn't get to the
    // stage of actually flushing the MemTables.
    if (!flush_rescheduled_to_retain_udt) {
@@ -3309,25 +3308,25 @@ void DBImpl::BackgroundCallFlush(Env::Priority thread_pri) {
      // have created. Thus, we force full scan in FindObsoleteFiles()
      FindObsoleteFiles(&job_context, !s.ok() && !s.IsShutdownInProgress() &&
                                          !s.IsColumnFamilyDropped());
-    }
-    // delete unnecessary files if any, this is done outside the mutex
-    if (job_context.HaveSomethingToClean() ||
-        job_context.HaveSomethingToDelete() || !log_buffer.IsEmpty()) {
-      mutex_.Unlock();
-      TEST_SYNC_POINT("DBImpl::BackgroundCallFlush:FilesFound");
-      // Have to flush the info logs before bg_flush_scheduled_--
-      // because if bg_flush_scheduled_ becomes 0 and the lock is
-      // released, the deconstructor of DB can kick in and destroy all the
-      // states of DB so info_log might not be available after that point.
-      // It also applies to access other states that DB owns.
-      log_buffer.FlushBufferToLog();
-      if (job_context.HaveSomethingToDelete()) {
-        PurgeObsoleteFiles(job_context);
+      // delete unnecessary files if any, this is done outside the mutex
+      if (job_context.HaveSomethingToClean() ||
+          job_context.HaveSomethingToDelete() || !log_buffer.IsEmpty()) {
+        mutex_.Unlock();
+        TEST_SYNC_POINT("DBImpl::BackgroundCallFlush:FilesFound");
+        // Have to flush the info logs before bg_flush_scheduled_--
+        // because if bg_flush_scheduled_ becomes 0 and the lock is
+        // released, the deconstructor of DB can kick in and destroy all the
+        // states of DB so info_log might not be available after that point.
+        // It also applies to access other states that DB owns.
+        log_buffer.FlushBufferToLog();
+        if (job_context.HaveSomethingToDelete()) {
+          PurgeObsoleteFiles(job_context);
+        }
+        job_context.Clean();
+        mutex_.Lock();
      }
-      job_context.Clean();
-      mutex_.Lock();
+      TEST_SYNC_POINT("DBImpl::BackgroundCallFlush:ContextCleanedUp");
    }
-    TEST_SYNC_POINT("DBImpl::BackgroundCallFlush:ContextCleanedUp");

    assert(num_running_flushes_ > 0);
    num_running_flushes_--;
@@ -309,10 +309,6 @@ SeqnoToTimeMapping DBImpl::TEST_GetSeqnoToTimeMapping() const {
  return seqno_to_time_mapping_;
 }

-const autovector<uint64_t>& DBImpl::TEST_GetFilesToQuarantine() const {
-  InstrumentedMutexLock l(&mutex_);
-  return error_handler_.GetFilesToQuarantine();
-}

 size_t DBImpl::TEST_EstimateInMemoryStatsHistorySize() const {
  InstrumentedMutexLock l(&const_cast<DBImpl*>(this)->stats_history_mutex_);
@@ -100,6 +100,14 @@ Status DBImpl::EnableFileDeletions(bool force) {
  return Status::OK();
 }

+int DBImpl::EnableFileDeletionsWithLock() {
+  mutex_.AssertHeld();
+  // In case others have called EnableFileDeletions(true /* force */) in between
+  disable_delete_obsolete_files_ =
+      std::max(0, disable_delete_obsolete_files_ - 1);
+  return disable_delete_obsolete_files_;
+}
+
 bool DBImpl::IsFileDeletionsEnabled() const {
  return 0 == disable_delete_obsolete_files_;
 }
@@ -146,7 +154,6 @@ void DBImpl::FindObsoleteFiles(JobContext* job_context, bool force,
  // mutex_ cannot be released. Otherwise, we might see no min_pending_output
  // here but later find newer generated unfinalized files while scanning.
  job_context->min_pending_output = MinObsoleteSstNumberToKeep();
-  job_context->files_to_quarantine = error_handler_.GetFilesToQuarantine();

  // Get obsolete files.  This function will also update the list of
  // pending files in VersionSet().
@@ -420,8 +427,6 @@ void DBImpl::PurgeObsoleteFiles(JobContext& state, bool schedule_only) {
                                             state.blob_live.end());
  std::unordered_set<uint64_t> log_recycle_files_set(
      state.log_recycle_files.begin(), state.log_recycle_files.end());
-  std::unordered_set<uint64_t> quarantine_files_set(
-      state.files_to_quarantine.begin(), state.files_to_quarantine.end());

  auto candidate_files = state.full_scan_candidate_files;
  candidate_files.reserve(
@@ -525,10 +530,6 @@ void DBImpl::PurgeObsoleteFiles(JobContext& state, bool schedule_only) {
      continue;
    }

-    if (quarantine_files_set.find(number) != quarantine_files_set.end()) {
-      continue;
-    }
-
    bool keep = true;
    switch (type) {
      case kWalFile:
@@ -1251,13 +1251,6 @@ Status DBImpl::RecoverLogFiles(const std::vector<uint64_t>& wal_numbers,
      }

      SequenceNumber sequence = WriteBatchInternal::Sequence(batch_to_use);
-      if (sequence > kMaxSequenceNumber) {
-        reporter.Corruption(
-            record.size(),
-            Status::Corruption("sequence " + std::to_string(sequence) +
-                               " is too large"));
-        continue;
-      }

      if (immutable_db_options_.wal_recovery_mode ==
          WALRecoveryMode::kPointInTimeRecovery) {
@@ -53,10 +53,6 @@ class DBImplReadOnly : public DBImpl {
                   const WideColumns& /* columns */) override {
    return Status::NotSupported("Not supported operation in read only mode.");
  }
-  Status PutEntity(const WriteOptions& /* options */, const Slice& /* key */,
-                   const AttributeGroups& /* attribute_groups */) override {
-    return Status::NotSupported("Not supported operation in read only mode.");
-  }

  using DBImpl::Merge;
  virtual Status Merge(const WriteOptions& /*options*/,
@@ -136,10 +136,6 @@ class DBImplSecondary : public DBImpl {
                   const WideColumns& /* columns */) override {
    return Status::NotSupported("Not supported operation in secondary mode.");
  }
-  Status PutEntity(const WriteOptions& /* options */, const Slice& /* key */,
-                   const AttributeGroups& /* attribute_groups */) override {
-    return Status::NotSupported("Not supported operation in secondary mode.");
-  }

  using DBImpl::Merge;
  Status Merge(const WriteOptions& /*options*/,
@@ -48,17 +48,6 @@ Status DBImpl::PutEntity(const WriteOptions& options,
  return DB::PutEntity(options, column_family, key, columns);
 }

-Status DBImpl::PutEntity(const WriteOptions& options, const Slice& key,
-                         const AttributeGroups& attribute_groups) {
-  for (const AttributeGroup& ag : attribute_groups) {
-    const Status s = FailIfCfHasTs(ag.column_family());
-    if (!s.ok()) {
-      return s;
-    }
-  }
-  return DB::PutEntity(options, key, attribute_groups);
-}
-
 Status DBImpl::Merge(const WriteOptions& o, ColumnFamilyHandle* column_family,
                     const Slice& key, const Slice& val) {
  const Status s = FailIfCfHasTs(column_family);
@@ -437,10 +426,10 @@ Status DBImpl::WriteImpl(const WriteOptions& write_options,
        valid_batches += writer->batch_cnt;
        if (writer->ShouldWriteToMemtable()) {
          total_count += WriteBatchInternal::Count(writer->batch);
-          total_byte_size = WriteBatchInternal::AppendedByteSize(
-              total_byte_size, WriteBatchInternal::ByteSize(writer->batch));
          parallel = parallel && !writer->batch->HasMerge();
        }
+        total_byte_size = WriteBatchInternal::AppendedByteSize(
+            total_byte_size, WriteBatchInternal::ByteSize(writer->batch));
        if (writer->pre_release_callback) {
          pre_release_callback_cnt++;
        }
@@ -720,11 +709,11 @@ Status DBImpl::PipelinedWriteImpl(const WriteOptions& write_options,
          if (writer->ShouldWriteToMemtable()) {
            writer->sequence = next_sequence;
            size_t count = WriteBatchInternal::Count(writer->batch);
-            total_byte_size = WriteBatchInternal::AppendedByteSize(
-                total_byte_size, WriteBatchInternal::ByteSize(writer->batch));
            next_sequence += count;
            total_count += count;
          }
+          total_byte_size = WriteBatchInternal::AppendedByteSize(
+              total_byte_size, WriteBatchInternal::ByteSize(writer->batch));
        }
      }
      if (w.disable_wal) {
@@ -1825,9 +1814,11 @@ uint64_t DBImpl::GetMaxTotalWalSize() const {
 Status DBImpl::DelayWrite(uint64_t num_bytes, WriteThread& write_thread,
                          const WriteOptions& write_options) {
  mutex_.AssertHeld();
-  uint64_t start_time = 0;
+  uint64_t time_delayed = 0;
  bool delayed = false;
  {
+    StopWatch sw(immutable_db_options_.clock, stats_, WRITE_STALL,
+                 Histograms::HISTOGRAM_ENUM_MAX, &time_delayed);
    // To avoid parallel timed delays (bad throttling), only support them
    // on the primary write queue.
    uint64_t delay;
@@ -1839,8 +1830,6 @@ Status DBImpl::DelayWrite(uint64_t num_bytes, WriteThread& write_thread,
      delay = 0;
    }
    TEST_SYNC_POINT("DBImpl::DelayWrite:Start");
-    start_time = immutable_db_options_.clock->NowMicros();
-
    if (delay > 0) {
      if (write_options.no_slowdown) {
        return Status::Incomplete("Write stall");
@@ -1857,7 +1846,7 @@ Status DBImpl::DelayWrite(uint64_t num_bytes, WriteThread& write_thread,
      // (slightly longer because WriteController minimum delay is 1ms, in
      // case of sleep imprecision, rounding, etc.)
      const uint64_t kDelayInterval = 1001;
-      uint64_t stall_end = start_time + delay;
+      uint64_t stall_end = sw.start_time() + delay;
      while (write_controller_.NeedsDelay()) {
        if (immutable_db_options_.clock->NowMicros() >= stall_end) {
          // We already delayed this write `delay` microseconds
@@ -1898,11 +1887,9 @@ Status DBImpl::DelayWrite(uint64_t num_bytes, WriteThread& write_thread,
  }
  assert(!delayed || !write_options.no_slowdown);
  if (delayed) {
-    auto time_delayed = immutable_db_options_.clock->NowMicros() - start_time;
    default_cf_internal_stats_->AddDBStats(
        InternalStats::kIntStatsWriteStallMicros, time_delayed);
    RecordTick(stats_, STALL_MICROS, time_delayed);
-    RecordInHistogram(stats_, WRITE_STALL, time_delayed);
  }

  // If DB is not in read-only mode and write_controller is not stopping
@@ -1969,13 +1956,9 @@ Status DBImpl::ThrottleLowPriWritesIfNeeded(const WriteOptions& write_options,
      // a chance to run. Now we guarantee we are still slowly making
      // progress.
      PERF_TIMER_GUARD(write_delay_time);
-      auto data_size = my_batch->GetDataSize();
-      while (data_size > 0) {
-        size_t allowed = write_controller_.low_pri_rate_limiter()->RequestToken(
-            data_size, 0 /* alignment */, Env::IO_HIGH, nullptr /* stats */,
-            RateLimiter::OpType::kWrite);
-        data_size -= allowed;
-      }
+      write_controller_.low_pri_rate_limiter()->Request(
+          my_batch->GetDataSize(), Env::IO_HIGH, nullptr /* stats */,
+          RateLimiter::OpType::kWrite);
    }
  }
  return Status::OK();
@@ -2398,22 +2381,6 @@ Status DB::PutEntity(const WriteOptions& options,
  return Write(options, &batch);
 }

-Status DB::PutEntity(const WriteOptions& options, const Slice& key,
-                     const AttributeGroups& attribute_groups) {
-  ColumnFamilyHandle* default_cf = DefaultColumnFamily();
-  assert(default_cf);
-  const Comparator* const default_cf_ucmp = default_cf->GetComparator();
-  assert(default_cf_ucmp);
-  WriteBatch batch(0 /* reserved_bytes */, 0 /* max_bytes */,
-                   options.protection_bytes_per_key,
-                   default_cf_ucmp->timestamp_size());
-  const Status s = batch.PutEntity(key, attribute_groups);
-  if (!s.ok()) {
-    return s;
-  }
-  return Write(options, &batch);
-}
-
 Status DB::Delete(const WriteOptions& opt, ColumnFamilyHandle* column_family,
                  const Slice& key) {
  WriteBatch batch(0 /* reserved_bytes */, 0 /* max_bytes */,
@@ -83,7 +83,8 @@ DBIter::DBIter(Env* _env, const ReadOptions& read_options,
      cfd_(cfd),
      timestamp_ub_(read_options.timestamp),
      timestamp_lb_(read_options.iter_start_ts),
-      timestamp_size_(timestamp_ub_ ? timestamp_ub_->size() : 0) {
+      timestamp_size_(timestamp_ub_ ? timestamp_ub_->size() : 0),
+      auto_readahead_size_(read_options.auto_readahead_size) {
  RecordTick(statistics_, NO_ITERATOR_CREATED);
  if (pin_thru_lifetime_) {
    pinned_iters_mgr_.StartPinning();
@@ -113,9 +114,6 @@ Status DBIter::GetProperty(std::string prop_name, std::string* prop) {
  } else if (prop_name == "rocksdb.iterator.internal-key") {
    *prop = saved_key_.GetUserKey().ToString();
    return Status::OK();
-  } else if (prop_name == "rocksdb.iterator.write-time") {
-    // TODO(yuzhangyu): implement return the actual write time.
-    return Status::NotSupported("write time property is under construction");
  }
  return Status::InvalidArgument("Unidentified property.");
 }
@@ -394,7 +392,9 @@ bool DBIter::FindNextUserEntryInternal(bool skipping_saved_key,
          case kTypeValue:
          case kTypeBlobIndex:
          case kTypeWideColumnEntity:
-            if (!PrepareValue()) {
+            if (!iter_.PrepareValue()) {
+              assert(!iter_.status().ok());
+              valid_ = false;
              return false;
            }
            if (timestamp_lb_) {
@@ -425,7 +425,9 @@ bool DBIter::FindNextUserEntryInternal(bool skipping_saved_key,
            return true;
            break;
          case kTypeMerge:
-            if (!PrepareValue()) {
+            if (!iter_.PrepareValue()) {
+              assert(!iter_.status().ok());
+              valid_ = false;
              return false;
            }
            saved_key_.SetUserKey(
@@ -570,7 +572,8 @@ bool DBIter::MergeValuesNewToOld() {
      iter_.Next();
      break;
    }
-    if (!PrepareValue()) {
+    if (!iter_.PrepareValue()) {
+      valid_ = false;
      return false;
    }

@@ -741,15 +744,22 @@ bool DBIter::ReverseToBackward() {
  // When current_entry_is_merged_ is true, iter_ may be positioned on the next
  // key, which may not exist or may have prefix different from current.
  // If that's the case, seek to saved_key_.
-  if (current_entry_is_merged_ &&
-      (!expect_total_order_inner_iter() || !iter_.Valid())) {
+  //
+  // In case of auto_readahead_size enabled, index_iter moves forward during
+  // forward scan for block cache lookup and points to different block. If Prev
+  // op is called, it needs to call SeekForPrev to point to right index_iter_ in
+  // BlockBasedTableIterator. This only happens when direction is changed from
+  // forward to backward.
+  if ((current_entry_is_merged_ &&
+       (!expect_total_order_inner_iter() || !iter_.Valid())) ||
+      auto_readahead_size_) {
    IterKey last_key;
    // Using kMaxSequenceNumber and kValueTypeForSeek
    // (not kValueTypeForSeekForPrev) to seek to a key strictly smaller
    // than saved_key_.
    last_key.SetInternalKey(ParsedInternalKey(
        saved_key_.GetUserKey(), kMaxSequenceNumber, kValueTypeForSeek));
-    if (!expect_total_order_inner_iter()) {
+    if (!expect_total_order_inner_iter() || auto_readahead_size_) {
      iter_.SeekForPrev(last_key.GetInternalKey());
    } else {
      // Some iterators may not support SeekForPrev(), so we avoid using it
@@ -896,7 +906,8 @@ bool DBIter::FindValueForCurrentKey() {
      return FindValueForCurrentKeyUsingSeek();
    }

-    if (!PrepareValue()) {
+    if (!iter_.PrepareValue()) {
+      valid_ = false;
      return false;
    }

@@ -1135,7 +1146,8 @@ bool DBIter::FindValueForCurrentKeyUsingSeek() {
    }
    return true;
  }
-  if (!PrepareValue()) {
+  if (!iter_.PrepareValue()) {
+    valid_ = false;
    return false;
  }
  if (timestamp_size_ > 0) {
@@ -1200,7 +1212,8 @@ bool DBIter::FindValueForCurrentKeyUsingSeek() {
        ikey.type == kTypeDeletionWithTimestamp) {
      break;
    }
-    if (!PrepareValue()) {
+    if (!iter_.PrepareValue()) {
+      valid_ = false;
      return false;
    }

@@ -1277,8 +1290,8 @@ bool DBIter::MergeWithNoBaseValue(const Slice& user_key) {
  const Status s = MergeHelper::TimedFullMerge(
      merge_operator_, user_key, MergeHelper::kNoBaseValue,
      merge_context_.GetOperands(), logger_, statistics_, clock_,
-      /* update_num_ops_stats */ true, /* op_failure_scope */ nullptr,
-      &saved_value_, &pinned_value_, &result_type);
+      /* update_num_ops_stats */ true, &saved_value_, &pinned_value_,
+      &result_type, /* op_failure_scope */ nullptr);
  return SetValueAndColumnsFromMergeResult(s, result_type);
 }

@@ -1290,8 +1303,8 @@ bool DBIter::MergeWithPlainBaseValue(const Slice& value,
  const Status s = MergeHelper::TimedFullMerge(
      merge_operator_, user_key, MergeHelper::kPlainBaseValue, value,
      merge_context_.GetOperands(), logger_, statistics_, clock_,
-      /* update_num_ops_stats */ true, /* op_failure_scope */ nullptr,
-      &saved_value_, &pinned_value_, &result_type);
+      /* update_num_ops_stats */ true, &saved_value_, &pinned_value_,
+      &result_type, /* op_failure_scope */ nullptr);
  return SetValueAndColumnsFromMergeResult(s, result_type);
 }

@@ -1303,8 +1316,8 @@ bool DBIter::MergeWithWideColumnBaseValue(const Slice& entity,
  const Status s = MergeHelper::TimedFullMerge(
      merge_operator_, user_key, MergeHelper::kWideBaseValue, entity,
      merge_context_.GetOperands(), logger_, statistics_, clock_,
-      /* update_num_ops_stats */ true, /* op_failure_scope */ nullptr,
-      &saved_value_, &pinned_value_, &result_type);
+      /* update_num_ops_stats */ true, &saved_value_, &pinned_value_,
+      &result_type, /* op_failure_scope */ nullptr);
  return SetValueAndColumnsFromMergeResult(s, result_type);
 }

@@ -328,22 +328,6 @@ class DBIter final : public Iterator {
  bool MergeWithPlainBaseValue(const Slice& value, const Slice& user_key);
  bool MergeWithWideColumnBaseValue(const Slice& entity, const Slice& user_key);

-  bool PrepareValue() {
-    if (!iter_.PrepareValue()) {
-      assert(!iter_.status().ok());
-      valid_ = false;
-      return false;
-    }
-    // ikey_ could change as BlockBasedTableIterator does Block cache
-    // lookup and index_iter_ could point to different block resulting
-    // in ikey_ pointing to wrong key. So ikey_ needs to be updated in
-    // case of Seek/Next calls to point to right key again.
-    if (!ParseKey(&ikey_)) {
-      return false;
-    }
-    return true;
-  }
-
  const SliceTransform* prefix_extractor_;
  Env* const env_;
  SystemClock* clock_;
@@ -418,6 +402,7 @@ class DBIter final : public Iterator {
  const Slice* const timestamp_lb_;
  const size_t timestamp_size_;
  std::string saved_timestamp_;
+  bool auto_readahead_size_;
 };

 // Return a new iterator that converts internal keys (yielded by
@@ -236,7 +236,7 @@ TEST_F(DBTestXactLogIterator, TransactionLogIteratorCorruptedLog) {
    ASSERT_OK(test::TruncateFile(env_, logfile_path,
                                 wal_files.front()->SizeFileBytes() / 2));

-    ASSERT_OK(db_->EnableFileDeletions(/*force=*/false));
+    ASSERT_OK(db_->EnableFileDeletions());

    // Insert a new entry to a new log file
    ASSERT_OK(Put("key1025", DummyString(10)));
@@ -1099,7 +1099,7 @@ TEST_F(DBOptionsTest, SetFIFOCompactionOptions) {
  ASSERT_EQ(fifo_temp_opt[1].age, 30000);
 }

-TEST_F(DBOptionsTest, OffpeakTimes) {
+TEST_F(DBOptionsTest, OffPeakTimes) {
  Options options;
  options.create_if_missing = true;
  Random rnd(test::RandomSeed());
@@ -1155,125 +1155,139 @@ TEST_F(DBOptionsTest, OffpeakTimes) {
    verify_valid();
  }

-  auto verify_offpeak_info = [&](bool expected_is_now_off_peak,
-                                 int expected_seconds_till_next_offpeak_start,
-                                 int now_utc_hour, int now_utc_minute,
-                                 int now_utc_second = 0) {
+  auto verify_is_now_offpeak = [&](bool expected, int now_utc_hour,
+                                   int now_utc_minute, int now_utc_second = 0) {
    auto mock_clock = std::make_shared<MockSystemClock>(env_->GetSystemClock());
    // Add some extra random days to current time
    int days = rnd.Uniform(100);
-    mock_clock->SetCurrentTime(
-        days * OffpeakTimeOption::kSecondsPerDay +
-        now_utc_hour * OffpeakTimeOption::kSecondsPerHour +
-        now_utc_minute * OffpeakTimeOption::kSecondsPerMinute + now_utc_second);
+    mock_clock->SetCurrentTime(days * 86400 + now_utc_hour * 3600 +
+                               now_utc_minute * 60 + now_utc_second);
    Status s = DBImpl::TEST_ValidateOptions(options);
    ASSERT_OK(s);
-    auto offpeak_option = OffpeakTimeOption(options.daily_offpeak_time_utc);
-    int64_t now;
-    ASSERT_OK(mock_clock.get()->GetCurrentTime(&now));
-    auto offpeak_info = offpeak_option.GetOffpeakTimeInfo(now);
-    ASSERT_EQ(expected_is_now_off_peak, offpeak_info.is_now_offpeak);
-    ASSERT_EQ(expected_seconds_till_next_offpeak_start,
-              offpeak_info.seconds_till_next_offpeak_start);
+    auto db_options = MutableDBOptions(options);
+    ASSERT_EQ(expected, db_options.IsNowOffPeak(mock_clock.get()));
  };

  options.daily_offpeak_time_utc = "";
-  verify_offpeak_info(false, 0, 12, 30);
+  verify_is_now_offpeak(false, 12, 30);

  options.daily_offpeak_time_utc = "06:30-11:30";
-  verify_offpeak_info(false, 1 * OffpeakTimeOption::kSecondsPerHour, 5, 30);
-  verify_offpeak_info(true, 24 * OffpeakTimeOption::kSecondsPerHour, 6, 30);
-  verify_offpeak_info(true, 20 * OffpeakTimeOption::kSecondsPerHour, 10, 30);
-  verify_offpeak_info(true, 19 * OffpeakTimeOption::kSecondsPerHour, 11, 30);
-  verify_offpeak_info(false, 17 * OffpeakTimeOption::kSecondsPerHour, 13, 30);
+  verify_is_now_offpeak(false, 5, 30);
+  verify_is_now_offpeak(true, 6, 30);
+  verify_is_now_offpeak(true, 10, 30);
+  verify_is_now_offpeak(true, 11, 30);
+  verify_is_now_offpeak(false, 13, 30);

  options.daily_offpeak_time_utc = "23:30-04:30";
-  verify_offpeak_info(false, 17 * OffpeakTimeOption::kSecondsPerHour, 6, 30);
-  verify_offpeak_info(true, 24 * OffpeakTimeOption::kSecondsPerHour, 23, 30);
-  verify_offpeak_info(true,
-                      23 * OffpeakTimeOption::kSecondsPerHour +
-                          30 * OffpeakTimeOption::kSecondsPerMinute,
-                      0, 0);
-  verify_offpeak_info(true,
-                      22 * OffpeakTimeOption::kSecondsPerHour +
-                          30 * OffpeakTimeOption::kSecondsPerMinute,
-                      1, 0);
-  verify_offpeak_info(true, 19 * OffpeakTimeOption::kSecondsPerHour, 4, 30);
-  verify_offpeak_info(false,
-                      18 * OffpeakTimeOption::kSecondsPerHour +
-                          59 * OffpeakTimeOption::kSecondsPerMinute,
-                      4, 31);
+  verify_is_now_offpeak(false, 6, 30);
+  verify_is_now_offpeak(true, 23, 30);
+  verify_is_now_offpeak(true, 0, 0);
+  verify_is_now_offpeak(true, 1, 0);
+  verify_is_now_offpeak(true, 4, 30);
+  verify_is_now_offpeak(false, 4, 31);

  // Entire day offpeak
  options.daily_offpeak_time_utc = "00:00-23:59";
-  verify_offpeak_info(true, 24 * OffpeakTimeOption::kSecondsPerHour, 0, 0);
-  verify_offpeak_info(true, 12 * OffpeakTimeOption::kSecondsPerHour, 12, 00);
-  verify_offpeak_info(true, 1 * OffpeakTimeOption::kSecondsPerMinute, 23, 59);
-  verify_offpeak_info(true, 59, 23, 59, 1);
-  verify_offpeak_info(true, 1, 23, 59, 59);
+  verify_is_now_offpeak(true, 0, 0);
+  verify_is_now_offpeak(true, 12, 00);
+  verify_is_now_offpeak(true, 23, 59);
+  verify_is_now_offpeak(true, 23, 59, 1);
+  verify_is_now_offpeak(true, 23, 59, 59);

-  // Start with a valid option
-  options.daily_offpeak_time_utc = "01:30-04:15";
+  // Open the db and test by Get/SetDBOptions
+  options.daily_offpeak_time_utc = "";
  DestroyAndReopen(options);
-  ASSERT_EQ("01:30-04:15", dbfull()->GetDBOptions().daily_offpeak_time_utc);
-
-  int may_schedule_compaction_called = 0;
-  SyncPoint::GetInstance()->SetCallBack(
-      "DBImpl::MaybeScheduleFlushOrCompaction:Start",
-      [&](void*) { may_schedule_compaction_called++; });
-  SyncPoint::GetInstance()->EnableProcessing();
-
-  // Make sure calling SetDBOptions with invalid option does not change the
-  // value nor call MaybeScheduleFlushOrCompaction()
+  ASSERT_EQ("", dbfull()->GetDBOptions().daily_offpeak_time_utc);
  for (std::string invalid_case : invalid_cases) {
    ASSERT_NOK(
        dbfull()->SetDBOptions({{"daily_offpeak_time_utc", invalid_case}}));
-    ASSERT_EQ("01:30-04:15", dbfull()
-                                 ->GetVersionSet()
-                                 ->offpeak_time_option()
-                                 .daily_offpeak_time_utc);
-    ASSERT_EQ(1 * kSecondInHour + 30 * kSecondInMinute,
-              dbfull()
-                  ->GetVersionSet()
-                  ->offpeak_time_option()
-                  .daily_offpeak_start_time_utc);
-    ASSERT_EQ(4 * kSecondInHour + 15 * kSecondInMinute,
-              dbfull()
-                  ->GetVersionSet()
-                  ->offpeak_time_option()
-                  .daily_offpeak_end_time_utc);
  }
-  ASSERT_EQ(0, may_schedule_compaction_called);
-
-  // Changing to new valid values should call MaybeScheduleFlushOrCompaction()
-  // and sets the offpeak_time_option in VersionSet
-  int expected_count = 0;
  for (std::string valid_case : valid_cases) {
-    if (dbfull()
-            ->GetVersionSet()
-            ->offpeak_time_option()
-            .daily_offpeak_time_utc != valid_case) {
-      expected_count++;
-    }
    ASSERT_OK(dbfull()->SetDBOptions({{"daily_offpeak_time_utc", valid_case}}));
    ASSERT_EQ(valid_case, dbfull()->GetDBOptions().daily_offpeak_time_utc);
-    ASSERT_EQ(valid_case, dbfull()
-                              ->GetVersionSet()
-                              ->offpeak_time_option()
-                              .daily_offpeak_time_utc);
  }
-  ASSERT_EQ(expected_count, may_schedule_compaction_called);
+  Close();

-  // Changing to the same value should not call MaybeScheduleFlushOrCompaction()
-  ASSERT_OK(
-      dbfull()->SetDBOptions({{"daily_offpeak_time_utc", "06:30-11:30"}}));
-  may_schedule_compaction_called = 0;
-  ASSERT_OK(
-      dbfull()->SetDBOptions({{"daily_offpeak_time_utc", "06:30-11:30"}}));
-  ASSERT_EQ(0, may_schedule_compaction_called);
+  // Sets off-peak time from 11:30PM to 4:30AM next day.
+  // Starting at 1:30PM, use mock sleep to make time pass
+  // and see if IsNowOffPeak() returns correctly per time changes
+  int now_hour = 13;
+  int now_minute = 30;
+  options.daily_offpeak_time_utc = "23:30-04:30";
+  auto mock_clock = std::make_shared<MockSystemClock>(env_->GetSystemClock());
+  auto mock_env = std::make_unique<CompositeEnvWrapper>(env_, mock_clock);
+  // Add some extra random days to current time
+  int days = rnd.Uniform(100);
+  mock_clock->SetCurrentTime(days * 86400 + now_hour * 3600 + now_minute * 60);
+  options.env = mock_env.get();
+
+  // Starting at 1:30PM. It's not off-peak
+  DestroyAndReopen(options);
+  ASSERT_FALSE(MutableDBOptions(dbfull()->GetDBOptions())
+                   .IsNowOffPeak(mock_clock.get()));
+
+  // Now it's at 4:30PM. Still not off-peak
+  mock_clock->MockSleepForSeconds(3 * 3600);
+  ASSERT_FALSE(MutableDBOptions(dbfull()->GetDBOptions())
+                   .IsNowOffPeak(mock_clock.get()));
+
+  // Now it's at 11:30PM. It's off-peak
+  mock_clock->MockSleepForSeconds(7 * 3600);
+  ASSERT_TRUE(MutableDBOptions(dbfull()->GetDBOptions())
+                  .IsNowOffPeak(mock_clock.get()));
+
+  // Now it's at 2:30AM next day. It's still off-peak
+  mock_clock->MockSleepForSeconds(3 * 3600);
+  ASSERT_TRUE(MutableDBOptions(dbfull()->GetDBOptions())
+                  .IsNowOffPeak(mock_clock.get()));
+
+  // Now it's at 4:30AM. It's still off-peak
+  mock_clock->MockSleepForSeconds(2 * 3600);
+  ASSERT_TRUE(MutableDBOptions(dbfull()->GetDBOptions())
+                  .IsNowOffPeak(mock_clock.get()));
+
+  // Sleep for one more minute. It's at 4:31AM It's no longer off-peak
+  mock_clock->MockSleepForSeconds(60);
+  ASSERT_FALSE(MutableDBOptions(dbfull()->GetDBOptions())
+                   .IsNowOffPeak(mock_clock.get()));
+  Close();
+
+  // Entire day offpeak
+  options.daily_offpeak_time_utc = "00:00-23:59";
+  DestroyAndReopen(options);
+  // It doesn't matter what time it is. It should be just offpeak.
+  ASSERT_TRUE(MutableDBOptions(dbfull()->GetDBOptions())
+                  .IsNowOffPeak(mock_clock.get()));
+
+  // Mock Sleep for 3 hours. It's still off-peak
+  mock_clock->MockSleepForSeconds(3 * 3600);
+  ASSERT_TRUE(MutableDBOptions(dbfull()->GetDBOptions())
+                  .IsNowOffPeak(mock_clock.get()));
+
+  // Mock Sleep for 20 hours. It's still off-peak
+  mock_clock->MockSleepForSeconds(20 * 3600);
+  ASSERT_TRUE(MutableDBOptions(dbfull()->GetDBOptions())
+                  .IsNowOffPeak(mock_clock.get()));
+
+  // Mock Sleep for 59 minutes. It's still off-peak
+  mock_clock->MockSleepForSeconds(59 * 60);
+  ASSERT_TRUE(MutableDBOptions(dbfull()->GetDBOptions())
+                  .IsNowOffPeak(mock_clock.get()));
+
+  // Mock Sleep for 59 seconds. It's still off-peak
+  mock_clock->MockSleepForSeconds(59);
+  ASSERT_TRUE(MutableDBOptions(dbfull()->GetDBOptions())
+                  .IsNowOffPeak(mock_clock.get()));
+
+  // Mock Sleep for 1 second (exactly 24h passed). It's still off-peak
+  mock_clock->MockSleepForSeconds(1);
+  ASSERT_TRUE(MutableDBOptions(dbfull()->GetDBOptions())
+                  .IsNowOffPeak(mock_clock.get()));
+  // Another second for sanity check
+  mock_clock->MockSleepForSeconds(1);
+  ASSERT_TRUE(MutableDBOptions(dbfull()->GetDBOptions())
+                  .IsNowOffPeak(mock_clock.get()));

-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->DisableProcessing();
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->ClearAllCallBacks();
  Close();
 }

@@ -107,12 +107,12 @@ TEST_F(DBPropertiesTest, Empty) {
        dbfull()->GetProperty("rocksdb.is-file-deletions-enabled", &num));
    ASSERT_EQ("0", num);

-    ASSERT_OK(db_->EnableFileDeletions(/*force=*/false));
+    ASSERT_OK(db_->EnableFileDeletions(false));
    ASSERT_TRUE(
        dbfull()->GetProperty("rocksdb.is-file-deletions-enabled", &num));
    ASSERT_EQ("0", num);

-    ASSERT_OK(db_->EnableFileDeletions(/*force=*/true));
+    ASSERT_OK(db_->EnableFileDeletions());
    ASSERT_TRUE(
        dbfull()->GetProperty("rocksdb.is-file-deletions-enabled", &num));
    ASSERT_EQ("1", num);
@@ -1084,14 +1084,12 @@ class CountingUserTblPropCollector : public TablePropertiesCollector {
  const char* Name() const override { return "CountingUserTblPropCollector"; }

  Status Finish(UserCollectedProperties* properties) override {
-    assert(!finish_called_);
    std::string encoded;
    PutVarint32(&encoded, count_);
    *properties = UserCollectedProperties{
        {"CountingUserTblPropCollector", message_},
        {"Count", encoded},
    };
-    finish_called_ = true;
    return Status::OK();
  }

@@ -1103,14 +1101,12 @@ class CountingUserTblPropCollector : public TablePropertiesCollector {
  }

  UserCollectedProperties GetReadableProperties() const override {
-    assert(finish_called_);
    return UserCollectedProperties{};
  }

 private:
  std::string message_ = "Rocksdb";
  uint32_t count_ = 0;
-  bool finish_called_ = false;
 };

 class CountingUserTblPropCollectorFactory
@@ -1744,7 +1740,7 @@ TEST_F(DBPropertiesTest, SstFilesSize) {
  ASSERT_EQ(obsolete_sst_size, sst_size);

  // Let the obsolete files be deleted.
-  ASSERT_OK(db_->EnableFileDeletions(/*force=*/false));
+  ASSERT_OK(db_->EnableFileDeletions());
  ASSERT_TRUE(db_->GetIntProperty(DB::Properties::kObsoleteSstFilesSize,
                                  &obsolete_sst_size));
  ASSERT_EQ(obsolete_sst_size, 0);
@@ -1538,11 +1538,6 @@ TEST_F(DBSSTTest, OpenDBWithInfiniteMaxOpenFilesSubjectToMemoryLimit) {
 }

 TEST_F(DBSSTTest, GetTotalSstFilesSize) {
-  // FIXME: L0 file and L1+ file also differ in size of `oldest_key_time`.
-  //  L0 file has non-zero `oldest_key_time` while L1+ files have 0.
-  //  The test passes since L1+ file uses current time instead of 0
-  //  as oldest_ancestor_time.
-  //
  // We don't propagate oldest-key-time table property on compaction and
  // just write 0 as default value. This affect the exact table size, since
  // we encode table properties as varint64. Force time to be 0 to work around
@@ -6,11 +6,9 @@
 #include <string>

 #include "db/db_test_util.h"
-#include "db/write_batch_internal.h"
 #include "monitoring/thread_status_util.h"
 #include "port/stack_trace.h"
 #include "rocksdb/statistics.h"
-#include "rocksdb/utilities/transaction_db.h"
 #include "util/random.h"

 namespace ROCKSDB_NAMESPACE {
@@ -285,78 +283,6 @@ TEST_F(DBStatisticsTest, BlockChecksumStats) {
            options.statistics->getTickerCount(BLOCK_CHECKSUM_MISMATCH_COUNT));
 }

-TEST_F(DBStatisticsTest, BytesWrittenStats) {
-  Options options = CurrentOptions();
-  options.statistics = ROCKSDB_NAMESPACE::CreateDBStatistics();
-  options.statistics->set_stats_level(StatsLevel::kExceptHistogramOrTimers);
-  Reopen(options);
-
-  EXPECT_EQ(0, options.statistics->getAndResetTickerCount(WAL_FILE_BYTES));
-  EXPECT_EQ(0, options.statistics->getAndResetTickerCount(BYTES_WRITTEN));
-
-  const int kNumKeysWritten = 100;
-
-  // Scenario 0: Not using transactions.
-  // This will write to WAL and memtable directly.
-  ASSERT_OK(options.statistics->Reset());
-
-  for (int i = 0; i < kNumKeysWritten; ++i) {
-    ASSERT_OK(Put(Key(i), "val"));
-  }
-
-  EXPECT_EQ(options.statistics->getAndResetTickerCount(WAL_FILE_BYTES),
-            options.statistics->getAndResetTickerCount(BYTES_WRITTEN));
-
-  // Scenario 1: Using transactions.
-  // This should not double count BYTES_WRITTEN (issue #12061).
-  for (bool enable_pipelined_write : {false, true}) {
-    ASSERT_OK(options.statistics->Reset());
-
-    // Destroy the DB to recreate as a TransactionDB.
-    Destroy(options, true);
-
-    // Create a TransactionDB.
-    TransactionDB* txn_db = nullptr;
-    TransactionDBOptions txn_db_opts;
-    txn_db_opts.write_policy = TxnDBWritePolicy::WRITE_COMMITTED;
-    options.enable_pipelined_write = enable_pipelined_write;
-    ASSERT_OK(TransactionDB::Open(options, txn_db_opts, dbname_, &txn_db));
-    ASSERT_NE(txn_db, nullptr);
-    db_ = txn_db->GetBaseDB();
-
-    WriteOptions wopts;
-    TransactionOptions txn_opts;
-    Transaction* txn = txn_db->BeginTransaction(wopts, txn_opts, nullptr);
-    ASSERT_NE(txn, nullptr);
-    ASSERT_OK(txn->SetName("txn1"));
-
-    for (int i = 0; i < kNumKeysWritten; ++i) {
-      ASSERT_OK(txn->Put(Key(i), "val"));
-    }
-
-    // Prepare() writes to WAL, but not to memtable. (WriteCommitted)
-    ASSERT_OK(txn->Prepare());
-    EXPECT_NE(0, options.statistics->getTickerCount(WAL_FILE_BYTES));
-    // BYTES_WRITTEN would have been non-zero previously (issue #12061).
-    EXPECT_EQ(0, options.statistics->getTickerCount(BYTES_WRITTEN));
-
-    // Commit() writes to memtable and also a commit marker to WAL.
-    ASSERT_OK(txn->Commit());
-    delete txn;
-
-    // The WAL has an extra header of size `kHeader` written to it,
-    // as we are writing twice to it (first during Prepare, second during
-    // Commit).
-    EXPECT_EQ(options.statistics->getAndResetTickerCount(WAL_FILE_BYTES),
-              options.statistics->getAndResetTickerCount(BYTES_WRITTEN) +
-                  WriteBatchInternal::kHeader);
-
-    // Cleanup
-    db_ = nullptr;
-    delete txn_db;
-  }
-}
-
 }  // namespace ROCKSDB_NAMESPACE

 int main(int argc, char** argv) {
@@ -22,7 +22,6 @@
 #include "table/table_properties_internal.h"
 #include "test_util/testharness.h"
 #include "test_util/testutil.h"
-#include "util/atomic.h"
 #include "util/random.h"


@@ -418,71 +417,6 @@ TEST_F(DBTablePropertiesTest, GetDbIdentifiersProperty) {
  }
 }

-TEST_F(DBTablePropertiesTest, FactoryReturnsNull) {
-  struct JunkTablePropertiesCollector : public TablePropertiesCollector {
-    const char* Name() const override { return "JunkTablePropertiesCollector"; }
-    Status Finish(UserCollectedProperties* properties) override {
-      properties->insert({"Junk", "Junk"});
-      return Status::OK();
-    }
-    UserCollectedProperties GetReadableProperties() const override {
-      return {};
-    }
-  };
-
-  // Alternates between putting a "Junk" property and using `nullptr` to
-  // opt out.
-  static RelaxedAtomic<int> count{0};
-  struct SometimesTablePropertiesCollectorFactory
-      : public TablePropertiesCollectorFactory {
-    const char* Name() const override {
-      return "SometimesTablePropertiesCollectorFactory";
-    }
-    TablePropertiesCollector* CreateTablePropertiesCollector(
-        TablePropertiesCollectorFactory::Context /*context*/) override {
-      if (count.FetchAddRelaxed(1) & 1) {
-        return nullptr;
-      } else {
-        return new JunkTablePropertiesCollector();
-      }
-    }
-  };
-
-  Options options = CurrentOptions();
-  options.table_properties_collector_factories.emplace_back(
-      std::make_shared<SometimesTablePropertiesCollectorFactory>());
-  // For plain table
-  options.prefix_extractor.reset(NewFixedPrefixTransform(4));
-  for (std::shared_ptr<TableFactory> tf :
-       {options.table_factory,
-        std::shared_ptr<TableFactory>(NewPlainTableFactory({}))}) {
-    SCOPED_TRACE("Table factory = " + std::string(tf->Name()));
-    options.table_factory = tf;
-
-    DestroyAndReopen(options);
-
-    ASSERT_OK(Put("key0", "value1"));
-    ASSERT_OK(Flush());
-    ASSERT_OK(Put("key0", "value2"));
-    ASSERT_OK(Flush());
-
-    TablePropertiesCollection props;
-    ASSERT_OK(db_->GetPropertiesOfAllTables(&props));
-    int no_junk_count = 0;
-    int junk_count = 0;
-    for (const auto& item : props) {
-      if (item.second->user_collected_properties.find("Junk") !=
-          item.second->user_collected_properties.end()) {
-        junk_count++;
-      } else {
-        no_junk_count++;
-      }
-    }
-    EXPECT_EQ(1, no_junk_count);
-    EXPECT_EQ(1, junk_count);
-  }
-}
-
 class DBTableHostnamePropertyTest
    : public DBTestBase,
      public ::testing::WithParamInterface<std::tuple<int, std::string>> {
@@ -3882,26 +3882,16 @@ TEST_F(DBTest2, LowPriWrite) {
  ASSERT_OK(Put("", "", wo));
  ASSERT_EQ(1, rate_limit_count.load());

-  wo.low_pri = true;
-  std::string big_value = std::string(1 * 1024 * 1024, 'x');
-  ASSERT_OK(Put("", big_value, wo));
-  ASSERT_LT(1, rate_limit_count.load());
-  // Reset
-  rate_limit_count = 0;
-  wo.low_pri = false;
-  ASSERT_OK(Put("", big_value, wo));
-  ASSERT_EQ(0, rate_limit_count.load());
-
  TEST_SYNC_POINT("DBTest.LowPriWrite:0");
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->DisableProcessing();

  ASSERT_OK(dbfull()->TEST_WaitForCompact());
  wo.low_pri = true;
  ASSERT_OK(Put("", "", wo));
-  ASSERT_EQ(0, rate_limit_count.load());
+  ASSERT_EQ(1, rate_limit_count.load());
  wo.low_pri = false;
  ASSERT_OK(Put("", "", wo));
-  ASSERT_EQ(0, rate_limit_count.load());
+  ASSERT_EQ(1, rate_limit_count.load());
 }

 TEST_F(DBTest2, RateLimitedCompactionReads) {
@@ -4135,7 +4125,7 @@ TEST_F(DBTest2, LiveFilesOmitObsoleteFiles) {
    ASSERT_OK(env_->FileExists(LogFileName(dbname_, log_file->LogNumber())));
  }

-  ASSERT_OK(db_->EnableFileDeletions(/*force=*/false));
+  ASSERT_OK(db_->EnableFileDeletions());
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->DisableProcessing();
 }

@@ -7,12 +7,9 @@
 // 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 <string>
-
 #include "db/db_test_util.h"
 #include "port/stack_trace.h"
 #include "rocksdb/utilities/table_properties_collectors.h"
-#include "test_util/mock_time_env.h"
 #include "test_util/sync_point.h"
 #include "test_util/testutil.h"
 #include "util/random.h"
@@ -2233,141 +2230,6 @@ TEST_F(DBTestUniversalCompaction2, PeriodicCompaction) {
  ASSERT_EQ(4, output_level);
 }

-TEST_F(DBTestUniversalCompaction2, PeriodicCompactionOffpeak) {
-  constexpr int kSecondsPerDay = 86400;
-  constexpr int kSecondsPerHour = 3600;
-  constexpr int kSecondsPerMinute = 60;
-
-  Options opts = CurrentOptions();
-  opts.compaction_style = kCompactionStyleUniversal;
-  opts.level0_file_num_compaction_trigger = 10;
-  opts.max_open_files = -1;
-  opts.compaction_options_universal.size_ratio = 10;
-  opts.compaction_options_universal.min_merge_width = 2;
-  opts.compaction_options_universal.max_size_amplification_percent = 200;
-  opts.periodic_compaction_seconds = 5 * kSecondsPerDay;  // 5 days
-  opts.num_levels = 5;
-
-  // Just to add some extra random days to current time
-  Random rnd(test::RandomSeed());
-  int days = rnd.Uniform(100);
-
-  int periodic_compactions = 0;
-  int start_level = -1;
-  int output_level = -1;
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
-      "UniversalCompactionPicker::PickPeriodicCompaction:Return",
-      [&](void* arg) {
-        Compaction* compaction = reinterpret_cast<Compaction*>(arg);
-        ASSERT_TRUE(arg != nullptr);
-        ASSERT_TRUE(compaction->compaction_reason() ==
-                    CompactionReason::kPeriodicCompaction);
-        start_level = compaction->start_level();
-        output_level = compaction->output_level();
-        periodic_compactions++;
-      });
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->EnableProcessing();
-
-  for (std::string preset_offpeak_time : {"", "00:30-04:30", "10:30-02:30"}) {
-    SCOPED_TRACE("preset_offpeak_time=" + preset_offpeak_time);
-    for (std::string new_offpeak_time : {"", "23:30-02:30"}) {
-      SCOPED_TRACE("new_offpeak_time=" + new_offpeak_time);
-      std::vector<std::pair<int, int>> times_to_test = {
-          {0, 0}, {2, 30}, {3, 15}, {5, 10}, {13, 30}, {23, 30}};
-      for (std::pair<int, int> now : times_to_test) {
-        int now_hour = now.first;
-        int now_minute = now.second;
-        SCOPED_TRACE("now=" + std::to_string(now_hour) + ":" +
-                     std::to_string(now_minute));
-
-        auto mock_clock =
-            std::make_shared<MockSystemClock>(env_->GetSystemClock());
-        auto mock_env = std::make_unique<CompositeEnvWrapper>(env_, mock_clock);
-        opts.env = mock_env.get();
-        mock_clock->SetCurrentTime(days * kSecondsPerDay +
-                                   now_hour * kSecondsPerHour +
-                                   now_minute * kSecondsPerMinute);
-        opts.daily_offpeak_time_utc = preset_offpeak_time;
-        Reopen(opts);
-
-        ASSERT_OK(Put("foo", "bar1"));
-        ASSERT_OK(Flush());
-        ASSERT_EQ(0, periodic_compactions);
-
-        // Move clock forward by 8 hours. There should be no periodic
-        // compaction, yet.
-        mock_clock->MockSleepForSeconds(8 * kSecondsPerHour);
-        ASSERT_OK(Put("foo", "bar2"));
-        ASSERT_OK(Flush());
-        ASSERT_OK(dbfull()->TEST_WaitForCompact());
-        ASSERT_EQ(0, periodic_compactions);
-
-        // Move clock forward by 4 days
-        mock_clock->MockSleepForSeconds(4 * kSecondsPerDay);
-        ASSERT_OK(Put("foo", "bar3"));
-        ASSERT_OK(Flush());
-        ASSERT_OK(dbfull()->TEST_WaitForCompact());
-
-        int64_t mock_now;
-        ASSERT_OK(mock_clock->GetCurrentTime(&mock_now));
-
-        auto offpeak_time_info =
-            dbfull()->GetVersionSet()->offpeak_time_option().GetOffpeakTimeInfo(
-                mock_now);
-        // At this point, the first file is 4 days and 8 hours old.
-        // If it's offpeak now and the file is expected to expire before the
-        // next offpeak starts
-        if (offpeak_time_info.is_now_offpeak &&
-            offpeak_time_info.seconds_till_next_offpeak_start /
-                    kSecondsPerHour >
-                16) {
-          ASSERT_EQ(1, periodic_compactions);
-        } else {
-          ASSERT_EQ(0, periodic_compactions);
-          // Change offpeak option by SetDBOption()
-          if (preset_offpeak_time != new_offpeak_time) {
-            ASSERT_OK(dbfull()->SetDBOptions(
-                {{"daily_offpeak_time_utc", new_offpeak_time}}));
-            ASSERT_OK(Put("foo", "bar4"));
-            ASSERT_OK(Flush());
-            ASSERT_OK(dbfull()->TEST_WaitForCompact());
-            offpeak_time_info = dbfull()
-                                    ->GetVersionSet()
-                                    ->offpeak_time_option()
-                                    .GetOffpeakTimeInfo(mock_now);
-            // if the first file is now eligible to be picked up
-            if (offpeak_time_info.is_now_offpeak &&
-                offpeak_time_info.seconds_till_next_offpeak_start /
-                        kSecondsPerHour >
-                    16) {
-              ASSERT_OK(Put("foo", "bar5"));
-              ASSERT_OK(Flush());
-              ASSERT_OK(dbfull()->TEST_WaitForCompact());
-              ASSERT_EQ(1, periodic_compactions);
-            }
-          }
-
-          // If the file has not been picked up yet (no offpeak set, or offpeak
-          // set but then unset before the file becomes eligible)
-          if (periodic_compactions == 0) {
-            // move clock forward by one more day
-            mock_clock->MockSleepForSeconds(1 * kSecondsPerDay);
-            ASSERT_OK(Put("foo", "bar6"));
-            ASSERT_OK(Flush());
-            ASSERT_OK(dbfull()->TEST_WaitForCompact());
-          }
-        }
-        ASSERT_EQ(1, periodic_compactions);
-        ASSERT_EQ(0, start_level);
-        ASSERT_EQ(4, output_level);
-        Destroy(opts);
-
-        periodic_compactions = 0;
-      }
-    }
-  }
-}
-
 }  // namespace ROCKSDB_NAMESPACE


@@ -1195,7 +1195,7 @@ TEST_F(DBWALTest, DISABLED_FullPurgePreservesLogPendingReuse) {
    ROCKSDB_NAMESPACE::port::Thread thread([&]() {
      TEST_SYNC_POINT(
          "DBWALTest::FullPurgePreservesLogPendingReuse:PreFullPurge");
-      ASSERT_OK(db_->EnableFileDeletions(/*force=*/true));
+      ASSERT_OK(db_->EnableFileDeletions(true));
      TEST_SYNC_POINT(
          "DBWALTest::FullPurgePreservesLogPendingReuse:PostFullPurge");
    });
@@ -1541,9 +1541,7 @@ class RecoveryTestHelper {
        test->dbname_, &db_options, file_options, table_cache.get(),
        &write_buffer_manager, &write_controller,
        /*block_cache_tracer=*/nullptr,
-        /*io_tracer=*/nullptr, /*db_id=*/"", /*db_session_id=*/"",
-        options.daily_offpeak_time_utc,
-        /*error_handler=*/nullptr));
+        /*io_tracer=*/nullptr, /*db_id*/ "", /*db_session_id*/ ""));

    wal_manager.reset(
        new WalManager(db_options, file_options, /*io_tracer=*/nullptr));
@@ -1646,88 +1646,35 @@ TEST_F(DBBasicTestWithTimestamp, GetWithRowCache) {

  const Snapshot* snap_with_nothing = db_->GetSnapshot();
  ASSERT_OK(db_->Put(write_opts, "foo", ts_early, "bar"));
-  ASSERT_OK(db_->Put(write_opts, "foo2", ts_early, "bar2"));
-  ASSERT_OK(db_->Put(write_opts, "foo3", ts_early, "bar3"));
-
  const Snapshot* snap_with_foo = db_->GetSnapshot();
+
+  // Ensure file has sequence number greater than snapshot_with_foo
+  for (int i = 0; i < 10; i++) {
+    std::string numStr = std::to_string(i);
+    ASSERT_OK(db_->Put(write_opts, numStr, ts_later, numStr));
+  }
  ASSERT_OK(Flush());
+  ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_HIT), 0);
+  ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_MISS), 0);

  ReadOptions read_opts;
  read_opts.timestamp = &ts_later_slice;

  std::string read_value;
  std::string read_ts;
-  Status s;
+  Status s = db_->Get(read_opts, "foo", &read_value, &read_ts);
+  ASSERT_OK(s);
+  ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_HIT), 0);
+  ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_MISS), 1);
+  ASSERT_EQ(read_ts, ts_early);

-  int expected_hit_count = 0;
-  int expected_miss_count = 0;
-  ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_HIT), expected_hit_count);
-  ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_MISS), expected_miss_count);
-
-  {
-    read_opts.timestamp = nullptr;
-    s = db_->Get(read_opts, "foo", &read_value);
-    ASSERT_NOK(s);
-    ASSERT_TRUE(s.IsInvalidArgument());
-  }
-
-  // Mix use of Get
-  {
-    read_opts.timestamp = &ts_later_slice;
-
-    // Use Get without ts first, expect cache entry to store the correct ts
-    s = db_->Get(read_opts, "foo2", &read_value);
-    ASSERT_OK(s);
-    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_HIT), expected_hit_count);
-    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_MISS),
-              ++expected_miss_count);
-    ASSERT_EQ(read_value, "bar2");
-
-    s = db_->Get(read_opts, "foo2", &read_value, &read_ts);
-    ASSERT_OK(s);
-    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_HIT), ++expected_hit_count);
-    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_MISS), expected_miss_count);
-    ASSERT_EQ(read_ts, ts_early);
-    ASSERT_EQ(read_value, "bar2");
-
-    // Use Get with ts first, expect the Get without ts can get correct record
-    s = db_->Get(read_opts, "foo3", &read_value, &read_ts);
-    ASSERT_OK(s);
-    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_HIT), expected_hit_count);
-    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_MISS),
-              ++expected_miss_count);
-    ASSERT_EQ(read_ts, ts_early);
-    ASSERT_EQ(read_value, "bar3");
-
-    s = db_->Get(read_opts, "foo3", &read_value);
-    ASSERT_OK(s);
-    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_HIT), ++expected_hit_count);
-    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_MISS), expected_miss_count);
-    ASSERT_EQ(read_value, "bar3");
-  }
-
-  {
-    // Test with consecutive calls of Get with ts.
-    s = db_->Get(read_opts, "foo", &read_value, &read_ts);
-    ASSERT_OK(s);
-    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_HIT), expected_hit_count);
-    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_MISS),
-              ++expected_miss_count);
-    ASSERT_EQ(read_ts, ts_early);
-    ASSERT_EQ(read_value, "bar");
-
-    // Test repeated get on cache entry
-    for (int i = 0; i < 3; i++) {
-      s = db_->Get(read_opts, "foo", &read_value, &read_ts);
-      ASSERT_OK(s);
-      ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_HIT),
-                ++expected_hit_count);
-      ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_MISS),
-                expected_miss_count);
-      ASSERT_EQ(read_ts, ts_early);
-      ASSERT_EQ(read_value, "bar");
-    }
-  }
+  s = db_->Get(read_opts, "foo", &read_value, &read_ts);
+  ASSERT_OK(s);
+  ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_HIT), 1);
+  ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_MISS), 1);
+  // Row cache is not storing the ts when record is inserted/updated.
+  // To be fixed after enabling ROW_CACHE with timestamp.
+  // ASSERT_EQ(read_ts, ts_early);

  {
    std::string ts_nothing = Timestamp(0, 0);
@@ -1735,43 +1682,41 @@ TEST_F(DBBasicTestWithTimestamp, GetWithRowCache) {
    read_opts.timestamp = &ts_nothing_slice;
    s = db_->Get(read_opts, "foo", &read_value, &read_ts);
    ASSERT_TRUE(s.IsNotFound());
-    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_HIT), expected_hit_count);
-    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_MISS),
-              ++expected_miss_count);
+    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_HIT), 1);
+    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_MISS), 2);
+
+    read_opts.timestamp = &ts_later_slice;
+    s = db_->Get(read_opts, "foo", &read_value, &read_ts);
+    ASSERT_OK(s);
+    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_HIT), 2);
+    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_MISS), 2);
  }

  {
    read_opts.snapshot = snap_with_foo;
-    read_opts.timestamp = &ts_later_slice;
-    s = db_->Get(read_opts, "foo", &read_value, &read_ts);
-    ASSERT_OK(s);
-    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_HIT), expected_hit_count);
-    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_MISS),
-              ++expected_miss_count);
-    ASSERT_EQ(read_ts, ts_early);
-    ASSERT_EQ(read_value, "bar");

    s = db_->Get(read_opts, "foo", &read_value, &read_ts);
    ASSERT_OK(s);
-    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_HIT), ++expected_hit_count);
-    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_MISS), expected_miss_count);
-    ASSERT_EQ(read_ts, ts_early);
-    ASSERT_EQ(read_value, "bar");
+    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_HIT), 2);
+    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_MISS), 3);
+
+    s = db_->Get(read_opts, "foo", &read_value, &read_ts);
+    ASSERT_OK(s);
+    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_HIT), 3);
+    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_MISS), 3);
  }

  {
    read_opts.snapshot = snap_with_nothing;
    s = db_->Get(read_opts, "foo", &read_value, &read_ts);
    ASSERT_TRUE(s.IsNotFound());
-    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_HIT), expected_hit_count);
-    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_MISS),
-              ++expected_miss_count);
+    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_HIT), 3);
+    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_MISS), 4);

    s = db_->Get(read_opts, "foo", &read_value, &read_ts);
    ASSERT_TRUE(s.IsNotFound());
-    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_HIT), expected_hit_count);
-    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_MISS),
-              ++expected_miss_count);
+    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_HIT), 3);
+    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_MISS), 5);
  }

  db_->ReleaseSnapshot(snap_with_nothing);
@@ -1779,65 +1724,6 @@ TEST_F(DBBasicTestWithTimestamp, GetWithRowCache) {
  Close();
 }

-TEST_F(DBBasicTestWithTimestamp, GetWithRowCacheMultiSST) {
-  BlockBasedTableOptions table_options;
-  table_options.block_size = 1;
-  Options options = CurrentOptions();
-  options.env = env_;
-  options.create_if_missing = true;
-  options.statistics = ROCKSDB_NAMESPACE::CreateDBStatistics();
-  LRUCacheOptions cache_options;
-  cache_options.capacity = 8192;
-  options.row_cache = cache_options.MakeSharedRowCache();
-
-  const size_t kTimestampSize = Timestamp(0, 0).size();
-  TestComparator test_cmp(kTimestampSize);
-  options.comparator = &test_cmp;
-  options.table_factory.reset(NewBlockBasedTableFactory(table_options));
-  options.merge_operator = MergeOperators::CreateStringAppendTESTOperator();
-  options.disable_auto_compactions = true;
-
-  DestroyAndReopen(options);
-
-  std::string ts_early = Timestamp(1, 0);
-  std::string ts_later = Timestamp(10, 0);
-  Slice ts_later_slice = ts_later;
-
-  ASSERT_OK(db_->Put(WriteOptions(), "foo", ts_early, "v1"));
-  ASSERT_OK(Flush());
-
-  ColumnFamilyHandle* default_cf = db_->DefaultColumnFamily();
-  ASSERT_OK(
-      db_->Merge(WriteOptions(), default_cf, "foo", Timestamp(2, 0), "v2"));
-  ASSERT_OK(
-      db_->Merge(WriteOptions(), default_cf, "foo", Timestamp(3, 0), "v3"));
-  ASSERT_OK(Flush());
-
-  ReadOptions read_opts;
-  read_opts.timestamp = &ts_later_slice;
-
-  std::string read_value;
-  std::string read_ts;
-  Status s;
-
-  {
-    // Since there are two SST files, will trigger the table lookup twice.
-    s = db_->Get(read_opts, "foo", &read_value, &read_ts);
-    ASSERT_OK(s);
-    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_HIT), 0);
-    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_MISS), 2);
-    ASSERT_EQ(read_ts, Timestamp(3, 0));
-    ASSERT_EQ(read_value, "v1,v2,v3");
-
-    s = db_->Get(read_opts, "foo", &read_value, &read_ts);
-    ASSERT_OK(s);
-    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_HIT), 2);
-    ASSERT_EQ(TestGetTickerCount(options, ROW_CACHE_MISS), 2);
-    ASSERT_EQ(read_ts, Timestamp(3, 0));
-    ASSERT_EQ(read_value, "v1,v2,v3");
-  }
-}
-
 TEST_P(DBBasicTestWithTimestampTableOptions, MultiGetPrefixFilter) {
  Options options = CurrentOptions();
  options.env = env_;
@@ -355,7 +355,6 @@ class InternalKeyComparator

  // Same as Compare except that it excludes the value type from comparison
  int CompareKeySeq(const Slice& a, const Slice& b) const;
-  int CompareKeySeq(const ParsedInternalKey& a, const Slice& b) const;

  const Comparator* user_comparator() const {
    return user_comparator_.user_comparator();
@@ -977,26 +976,6 @@ inline int InternalKeyComparator::CompareKeySeq(const Slice& akey,
  return r;
 }

-inline int InternalKeyComparator::CompareKeySeq(const ParsedInternalKey& a,
-                                                const Slice& b) const {
-  // Order by:
-  //    increasing user key (according to user-supplied comparator)
-  //    decreasing sequence number
-  int r = user_comparator_.Compare(a.user_key, ExtractUserKey(b));
-  if (r == 0) {
-    // Shift the number to exclude the last byte which contains the value type
-    const uint64_t anum = a.sequence;
-    const uint64_t bnum =
-        DecodeFixed64(b.data() + b.size() - kNumInternalBytes) >> 8;
-    if (anum > bnum) {
-      r = -1;
-    } else if (anum < bnum) {
-      r = +1;
-    }
-  }
-  return r;
-}
-
 inline int InternalKeyComparator::Compare(const Slice& a,
                                          SequenceNumber a_global_seqno,
                                          const Slice& b,
@@ -396,6 +396,15 @@ const Status& ErrorHandler::SetBGError(const Status& bg_status,
  ROCKS_LOG_WARN(db_options_.info_log, "Background IO error %s",
                 bg_io_err.ToString().c_str());

+  if (!recovery_disabled_file_deletion_ &&
+      (BackgroundErrorReason::kManifestWrite == reason ||
+       BackgroundErrorReason::kManifestWriteNoWAL == reason)) {
+    // Always returns ok
+    ROCKS_LOG_INFO(db_options_.info_log, "Disabling File Deletions");
+    db_->DisableFileDeletionsWithLock().PermitUncheckedError();
+    recovery_disabled_file_deletion_ = true;
+  }
+
  Status new_bg_io_err = bg_io_err;
  DBRecoverContext context;
  if (bg_io_err.GetScope() != IOStatus::IOErrorScope::kIOErrorScopeFile &&
@@ -496,31 +505,6 @@ const Status& ErrorHandler::SetBGError(const Status& bg_status,
  }
 }

-void ErrorHandler::AddFilesToQuarantine(
-    autovector<const autovector<uint64_t>*> files_to_quarantine) {
-  db_mutex_->AssertHeld();
-  std::ostringstream quarantine_files_oss;
-  bool is_first_one = true;
-  for (const auto* files : files_to_quarantine) {
-    assert(files);
-    for (uint64_t file_number : *files) {
-      files_to_quarantine_.push_back(file_number);
-      quarantine_files_oss << (is_first_one ? "" : ", ") << file_number;
-      is_first_one = false;
-    }
-  }
-  ROCKS_LOG_INFO(db_options_.info_log,
-                 "ErrorHandler: added file numbers %s to quarantine.\n",
-                 quarantine_files_oss.str().c_str());
-}
-
-void ErrorHandler::ClearFilesToQuarantine() {
-  db_mutex_->AssertHeld();
-  files_to_quarantine_.clear();
-  ROCKS_LOG_INFO(db_options_.info_log,
-                 "ErrorHandler: cleared files in quarantine.\n");
-}
-
 Status ErrorHandler::OverrideNoSpaceError(const Status& bg_error,
                                          bool* auto_recovery) {
  if (bg_error.severity() >= Status::Severity::kFatalError) {
@@ -568,18 +552,28 @@ Status ErrorHandler::ClearBGError() {

  // Signal that recovery succeeded
  if (recovery_error_.ok()) {
-    assert(files_to_quarantine_.empty());
    Status old_bg_error = bg_error_;
    // old_bg_error is only for notifying listeners, so may not be checked
    old_bg_error.PermitUncheckedError();
    // Clear and check the recovery IO and BG error
-    is_db_stopped_.store(false, std::memory_order_release);
    bg_error_ = Status::OK();
    recovery_error_ = IOStatus::OK();
    bg_error_.PermitUncheckedError();
    recovery_error_.PermitUncheckedError();
    recovery_in_prog_ = false;
    soft_error_no_bg_work_ = false;
+    if (recovery_disabled_file_deletion_) {
+      recovery_disabled_file_deletion_ = false;
+      int remain_counter = db_->EnableFileDeletionsWithLock();
+      if (remain_counter == 0) {
+        ROCKS_LOG_INFO(db_options_.info_log, "File Deletions Enabled");
+      } else {
+        ROCKS_LOG_WARN(
+            db_options_.info_log,
+            "File Deletions Enable, but not really enabled. Counter: %d",
+            remain_counter);
+      }
+    }
    EventHelpers::NotifyOnErrorRecoveryEnd(db_options_.listeners, old_bg_error,
                                           bg_error_, db_mutex_);
  }
@@ -651,13 +645,6 @@ const Status& ErrorHandler::StartRecoverFromRetryableBGIOError(
  } else if (db_options_.max_bgerror_resume_count <= 0 || recovery_in_prog_) {
    // Auto resume BG error is not enabled, directly return bg_error_.
    return bg_error_;
-  } else if (end_recovery_) {
-    // Can temporarily release db mutex
-    EventHelpers::NotifyOnErrorRecoveryEnd(db_options_.listeners, bg_error_,
-                                           Status::ShutdownInProgress(),
-                                           db_mutex_);
-    db_mutex_->AssertHeld();
-    return bg_error_;
  }
  if (bg_error_stats_ != nullptr) {
    RecordTick(bg_error_stats_.get(), ERROR_HANDLER_AUTORESUME_COUNT);
@@ -677,14 +664,11 @@ const Status& ErrorHandler::StartRecoverFromRetryableBGIOError(
    // wait the previous recover thread to finish and create a new thread
    // to recover from the bg error.
    db_mutex_->Unlock();
-    TEST_SYNC_POINT(
-        "StartRecoverFromRetryableBGIOError:BeforeWaitingForOtherThread");
    old_recovery_thread->join();
-    TEST_SYNC_POINT(
-        "StartRecoverFromRetryableBGIOError:AfterWaitingForOtherThread");
    db_mutex_->Lock();
  }

+  TEST_SYNC_POINT("StartRecoverFromRetryableBGIOError::in_progress");
  recovery_thread_.reset(
      new port::Thread(&ErrorHandler::RecoverFromRetryableBGIOError, this));

@@ -698,7 +682,6 @@ const Status& ErrorHandler::StartRecoverFromRetryableBGIOError(
 // Automatic recover from Retryable BG IO error. Must be called after db
 // mutex is released.
 void ErrorHandler::RecoverFromRetryableBGIOError() {
-  assert(recovery_in_prog_);
  TEST_SYNC_POINT("RecoverFromRetryableBGIOError:BeforeStart");
  TEST_SYNC_POINT("RecoverFromRetryableBGIOError:BeforeStart2");
  InstrumentedMutexLock l(db_mutex_);
@@ -764,12 +747,22 @@ void ErrorHandler::RecoverFromRetryableBGIOError() {
        // recover from the retryable IO error and no other BG errors. Clean
        // the bg_error and notify user.
        TEST_SYNC_POINT("RecoverFromRetryableBGIOError:RecoverSuccess");
+        Status old_bg_error = bg_error_;
+        is_db_stopped_.store(false, std::memory_order_release);
+        bg_error_ = Status::OK();
+        bg_error_.PermitUncheckedError();
+        EventHelpers::NotifyOnErrorRecoveryEnd(
+            db_options_.listeners, old_bg_error, bg_error_, db_mutex_);
        if (bg_error_stats_ != nullptr) {
          RecordTick(bg_error_stats_.get(),
                     ERROR_HANDLER_AUTORESUME_SUCCESS_COUNT);
          RecordInHistogram(bg_error_stats_.get(),
                            ERROR_HANDLER_AUTORESUME_RETRY_COUNT, retry_count);
        }
+        recovery_in_prog_ = false;
+        if (soft_error_no_bg_work_) {
+          soft_error_no_bg_work_ = false;
+        }
        return;
      } else {
        // In this case: 1) recovery_error_ is more serious or not retryable
@@ -826,7 +819,6 @@ void ErrorHandler::EndAutoRecovery() {
    old_recovery_thread->join();
    db_mutex_->Lock();
  }
-  TEST_SYNC_POINT("PostEndAutoRecovery");
  return;
 }

@@ -4,14 +4,11 @@
 //  (found in the LICENSE.Apache file in the root directory).
 #pragma once

-#include <sstream>
-
 #include "monitoring/instrumented_mutex.h"
 #include "options/db_options.h"
 #include "rocksdb/io_status.h"
 #include "rocksdb/listener.h"
 #include "rocksdb/status.h"
-#include "util/autovector.h"

 namespace ROCKSDB_NAMESPACE {

@@ -45,7 +42,8 @@ class ErrorHandler {
        recovery_in_prog_(false),
        soft_error_no_bg_work_(false),
        is_db_stopped_(false),
-        bg_error_stats_(db_options.statistics) {
+        bg_error_stats_(db_options.statistics),
+        recovery_disabled_file_deletion_(false) {
    // Clear the checked flag for uninitialized errors
    bg_error_.PermitUncheckedError();
    recovery_error_.PermitUncheckedError();
@@ -83,16 +81,6 @@ class ErrorHandler {

  void EndAutoRecovery();

-  void AddFilesToQuarantine(
-      autovector<const autovector<uint64_t>*> files_to_quarantine);
-
-  const autovector<uint64_t>& GetFilesToQuarantine() const {
-    db_mutex_->AssertHeld();
-    return files_to_quarantine_;
-  }
-
-  void ClearFilesToQuarantine();
-
 private:
  DBImpl* db_;
  const ImmutableDBOptions& db_options_;
@@ -121,12 +109,9 @@ class ErrorHandler {
  // The pointer of DB statistics.
  std::shared_ptr<Statistics> bg_error_stats_;

-  // During recovery from manifest IO errors, files whose VersionEdits entries
-  // could be in an ambiguous state are quarantined and file deletion refrain
-  // from deleting them. Successful recovery will clear this vector. Files are
-  // added to this vector while DB mutex was locked, this data structure is
-  // unsorted.
-  autovector<uint64_t> files_to_quarantine_;
+  // Tracks whether the recovery has disabled file deletion. This boolean flag
+  // is updated while holding db mutex.
+  bool recovery_disabled_file_deletion_;

  const Status& HandleKnownErrors(const Status& bg_err,
                                  BackgroundErrorReason reason);
@@ -7,15 +7,12 @@
 // 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 <memory>
-
 #include "db/db_test_util.h"
 #include "file/sst_file_manager_impl.h"
 #include "port/stack_trace.h"
 #include "rocksdb/io_status.h"
 #include "rocksdb/sst_file_manager.h"
 #include "test_util/sync_point.h"
-#include "test_util/testharness.h"
 #include "util/random.h"
 #include "utilities/fault_injection_env.h"
 #include "utilities/fault_injection_fs.h"
@@ -155,9 +152,9 @@ class ErrorHandlerFSListener : public EventListener {
  FaultInjectionTestFS* fault_fs_;
 };

-TEST_F(DBErrorHandlingFSTest, FlushWriteError) {
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+TEST_F(DBErrorHandlingFSTest, FLushWriteError) {
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -200,9 +197,9 @@ TEST_F(DBErrorHandlingFSTest, FlushWriteError) {
 // All the NoSpace IOError will be handled as the regular BG Error no matter the
 // retryable flag is set of not. So the auto resume for retryable IO Error will
 // not be triggered. Also, it is mapped as hard error.
-TEST_F(DBErrorHandlingFSTest, FlushWriteNoSpaceError) {
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+TEST_F(DBErrorHandlingFSTest, FLushWriteNoSpaceError) {
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -244,9 +241,9 @@ TEST_F(DBErrorHandlingFSTest, FlushWriteNoSpaceError) {
  Destroy(options);
 }

-TEST_F(DBErrorHandlingFSTest, FlushWriteRetryableError) {
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+TEST_F(DBErrorHandlingFSTest, FLushWriteRetryableError) {
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -318,9 +315,9 @@ TEST_F(DBErrorHandlingFSTest, FlushWriteRetryableError) {
  Destroy(options);
 }

-TEST_F(DBErrorHandlingFSTest, FlushWriteFileScopeError) {
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+TEST_F(DBErrorHandlingFSTest, FLushWriteFileScopeError) {
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -402,9 +399,9 @@ TEST_F(DBErrorHandlingFSTest, FlushWriteFileScopeError) {
  Destroy(options);
 }

-TEST_F(DBErrorHandlingFSTest, FlushWALWriteRetryableError) {
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+TEST_F(DBErrorHandlingFSTest, FLushWALWriteRetryableError) {
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -446,9 +443,9 @@ TEST_F(DBErrorHandlingFSTest, FlushWALWriteRetryableError) {
  Destroy(options);
 }

-TEST_F(DBErrorHandlingFSTest, FlushWALAtomicWriteRetryableError) {
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+TEST_F(DBErrorHandlingFSTest, FLushWALAtomicWriteRetryableError) {
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -492,9 +489,9 @@ TEST_F(DBErrorHandlingFSTest, FlushWALAtomicWriteRetryableError) {
 }

 // The flush error is injected before we finish the table build
-TEST_F(DBErrorHandlingFSTest, FlushWritNoWALRetryableError1) {
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+TEST_F(DBErrorHandlingFSTest, FLushWritNoWALRetryableError1) {
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -548,9 +545,9 @@ TEST_F(DBErrorHandlingFSTest, FlushWritNoWALRetryableError1) {
 }

 // The retryable IO error is injected before we sync table
-TEST_F(DBErrorHandlingFSTest, FlushWriteNoWALRetryableError2) {
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+TEST_F(DBErrorHandlingFSTest, FLushWriteNoWALRetryableError2) {
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -592,9 +589,9 @@ TEST_F(DBErrorHandlingFSTest, FlushWriteNoWALRetryableError2) {
 }

 // The retryable IO error is injected before we close the table file
-TEST_F(DBErrorHandlingFSTest, FlushWriteNoWALRetryableError3) {
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+TEST_F(DBErrorHandlingFSTest, FLushWriteNoWALRetryableError3) {
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -636,8 +633,8 @@ TEST_F(DBErrorHandlingFSTest, FlushWriteNoWALRetryableError3) {
 }

 TEST_F(DBErrorHandlingFSTest, ManifestWriteError) {
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -661,7 +658,6 @@ TEST_F(DBErrorHandlingFSTest, ManifestWriteError) {
  SyncPoint::GetInstance()->EnableProcessing();
  s = Flush();
  ASSERT_EQ(s.severity(), ROCKSDB_NAMESPACE::Status::Severity::kHardError);
-  ASSERT_FALSE(dbfull()->TEST_GetFilesToQuarantine().empty());
  SyncPoint::GetInstance()->ClearAllCallBacks();
  SyncPoint::GetInstance()->DisableProcessing();
  fault_fs_->SetFilesystemActive(true);
@@ -670,7 +666,6 @@ TEST_F(DBErrorHandlingFSTest, ManifestWriteError) {

  new_manifest = GetManifestNameFromLiveFiles();
  ASSERT_NE(new_manifest, old_manifest);
-  ASSERT_TRUE(dbfull()->TEST_GetFilesToQuarantine().empty());

  Reopen(options);
  ASSERT_EQ("val", Get(Key(0)));
@@ -679,8 +674,8 @@ TEST_F(DBErrorHandlingFSTest, ManifestWriteError) {
 }

 TEST_F(DBErrorHandlingFSTest, ManifestWriteRetryableError) {
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -706,7 +701,6 @@ TEST_F(DBErrorHandlingFSTest, ManifestWriteRetryableError) {
  SyncPoint::GetInstance()->EnableProcessing();
  s = Flush();
  ASSERT_EQ(s.severity(), ROCKSDB_NAMESPACE::Status::Severity::kSoftError);
-  ASSERT_FALSE(dbfull()->TEST_GetFilesToQuarantine().empty());
  SyncPoint::GetInstance()->ClearAllCallBacks();
  SyncPoint::GetInstance()->DisableProcessing();
  fault_fs_->SetFilesystemActive(true);
@@ -715,7 +709,6 @@ TEST_F(DBErrorHandlingFSTest, ManifestWriteRetryableError) {

  new_manifest = GetManifestNameFromLiveFiles();
  ASSERT_NE(new_manifest, old_manifest);
-  ASSERT_TRUE(dbfull()->TEST_GetFilesToQuarantine().empty());

  Reopen(options);
  ASSERT_EQ("val", Get(Key(0)));
@@ -724,8 +717,8 @@ TEST_F(DBErrorHandlingFSTest, ManifestWriteRetryableError) {
 }

 TEST_F(DBErrorHandlingFSTest, ManifestWriteFileScopeError) {
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -753,7 +746,6 @@ TEST_F(DBErrorHandlingFSTest, ManifestWriteFileScopeError) {
      [&](void*) { fault_fs_->SetFilesystemActive(false, error_msg); });
  SyncPoint::GetInstance()->EnableProcessing();
  s = Flush();
-  ASSERT_FALSE(dbfull()->TEST_GetFilesToQuarantine().empty());
  ASSERT_EQ(s.severity(), ROCKSDB_NAMESPACE::Status::Severity::kSoftError);
  SyncPoint::GetInstance()->ClearAllCallBacks();
  SyncPoint::GetInstance()->DisableProcessing();
@@ -763,7 +755,6 @@ TEST_F(DBErrorHandlingFSTest, ManifestWriteFileScopeError) {

  new_manifest = GetManifestNameFromLiveFiles();
  ASSERT_NE(new_manifest, old_manifest);
-  ASSERT_TRUE(dbfull()->TEST_GetFilesToQuarantine().empty());

  Reopen(options);
  ASSERT_EQ("val", Get(Key(0)));
@@ -772,8 +763,8 @@ TEST_F(DBErrorHandlingFSTest, ManifestWriteFileScopeError) {
 }

 TEST_F(DBErrorHandlingFSTest, ManifestWriteNoWALRetryableError) {
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -801,7 +792,6 @@ TEST_F(DBErrorHandlingFSTest, ManifestWriteNoWALRetryableError) {
  SyncPoint::GetInstance()->EnableProcessing();
  s = Flush();
  ASSERT_EQ(s.severity(), ROCKSDB_NAMESPACE::Status::Severity::kSoftError);
-  ASSERT_FALSE(dbfull()->TEST_GetFilesToQuarantine().empty());
  SyncPoint::GetInstance()->ClearAllCallBacks();
  SyncPoint::GetInstance()->DisableProcessing();
  fault_fs_->SetFilesystemActive(true);
@@ -810,7 +800,6 @@ TEST_F(DBErrorHandlingFSTest, ManifestWriteNoWALRetryableError) {

  new_manifest = GetManifestNameFromLiveFiles();
  ASSERT_NE(new_manifest, old_manifest);
-  ASSERT_TRUE(dbfull()->TEST_GetFilesToQuarantine().empty());

  Reopen(options);
  ASSERT_EQ("val", Get(Key(0)));
@@ -819,8 +808,8 @@ TEST_F(DBErrorHandlingFSTest, ManifestWriteNoWALRetryableError) {
 }

 TEST_F(DBErrorHandlingFSTest, DoubleManifestWriteError) {
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -844,13 +833,11 @@ TEST_F(DBErrorHandlingFSTest, DoubleManifestWriteError) {
  SyncPoint::GetInstance()->EnableProcessing();
  s = Flush();
  ASSERT_EQ(s.severity(), ROCKSDB_NAMESPACE::Status::Severity::kHardError);
-  ASSERT_FALSE(dbfull()->TEST_GetFilesToQuarantine().empty());
  fault_fs_->SetFilesystemActive(true);

  // This Resume() will attempt to create a new manifest file and fail again
  s = dbfull()->Resume();
  ASSERT_EQ(s.severity(), ROCKSDB_NAMESPACE::Status::Severity::kHardError);
-  ASSERT_FALSE(dbfull()->TEST_GetFilesToQuarantine().empty());
  fault_fs_->SetFilesystemActive(true);
  SyncPoint::GetInstance()->ClearAllCallBacks();
  SyncPoint::GetInstance()->DisableProcessing();
@@ -861,7 +848,6 @@ TEST_F(DBErrorHandlingFSTest, DoubleManifestWriteError) {

  new_manifest = GetManifestNameFromLiveFiles();
  ASSERT_NE(new_manifest, old_manifest);
-  ASSERT_TRUE(dbfull()->TEST_GetFilesToQuarantine().empty());

  Reopen(options);
  ASSERT_EQ("val", Get(Key(0)));
@@ -874,8 +860,8 @@ TEST_F(DBErrorHandlingFSTest, CompactionManifestWriteError) {
    ROCKSDB_GTEST_SKIP("Test requires non-mock environment");
    return;
  }
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -928,7 +914,6 @@ TEST_F(DBErrorHandlingFSTest, CompactionManifestWriteError) {
  fault_fs_->SetFilesystemActive(true);
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->ClearAllCallBacks();
  TEST_SYNC_POINT("CompactionManifestWriteError:1");
-  ASSERT_FALSE(dbfull()->TEST_GetFilesToQuarantine().empty());
  TEST_SYNC_POINT("CompactionManifestWriteError:2");

  s = dbfull()->TEST_WaitForCompact();
@@ -937,7 +922,6 @@ TEST_F(DBErrorHandlingFSTest, CompactionManifestWriteError) {

  new_manifest = GetManifestNameFromLiveFiles();
  ASSERT_NE(new_manifest, old_manifest);
-  ASSERT_TRUE(dbfull()->TEST_GetFilesToQuarantine().empty());
  Reopen(options);
  ASSERT_EQ("val", Get(Key(0)));
  ASSERT_EQ("val", Get(Key(1)));
@@ -946,8 +930,8 @@ TEST_F(DBErrorHandlingFSTest, CompactionManifestWriteError) {
 }

 TEST_F(DBErrorHandlingFSTest, CompactionManifestWriteRetryableError) {
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -996,7 +980,6 @@ TEST_F(DBErrorHandlingFSTest, CompactionManifestWriteRetryableError) {
  ASSERT_OK(s);

  TEST_SYNC_POINT("CompactionManifestWriteError:0");
-  ASSERT_FALSE(dbfull()->TEST_GetFilesToQuarantine().empty());
  TEST_SYNC_POINT("CompactionManifestWriteError:1");

  s = dbfull()->TEST_WaitForCompact();
@@ -1010,7 +993,6 @@ TEST_F(DBErrorHandlingFSTest, CompactionManifestWriteRetryableError) {

  new_manifest = GetManifestNameFromLiveFiles();
  ASSERT_NE(new_manifest, old_manifest);
-  ASSERT_TRUE(dbfull()->TEST_GetFilesToQuarantine().empty());

  Reopen(options);
  ASSERT_EQ("val", Get(Key(0)));
@@ -1020,8 +1002,8 @@ TEST_F(DBErrorHandlingFSTest, CompactionManifestWriteRetryableError) {
 }

 TEST_F(DBErrorHandlingFSTest, CompactionWriteError) {
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -1062,8 +1044,8 @@ TEST_F(DBErrorHandlingFSTest, CompactionWriteError) {
 }

 TEST_F(DBErrorHandlingFSTest, DISABLED_CompactionWriteRetryableError) {
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -1109,8 +1091,8 @@ TEST_F(DBErrorHandlingFSTest, DISABLED_CompactionWriteRetryableError) {
 }

 TEST_F(DBErrorHandlingFSTest, DISABLED_CompactionWriteFileScopeError) {
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -1201,8 +1183,8 @@ TEST_F(DBErrorHandlingFSTest, AutoRecoverFlushError) {
    ROCKSDB_GTEST_SKIP("Test requires non-mock environment");
    return;
  }
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -1246,8 +1228,8 @@ TEST_F(DBErrorHandlingFSTest, AutoRecoverFlushError) {
 }

 TEST_F(DBErrorHandlingFSTest, FailRecoverFlushError) {
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -1275,8 +1257,8 @@ TEST_F(DBErrorHandlingFSTest, WALWriteError) {
    ROCKSDB_GTEST_SKIP("Test requires non-mock environment");
    return;
  }
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -1348,8 +1330,8 @@ TEST_F(DBErrorHandlingFSTest, WALWriteError) {
 }

 TEST_F(DBErrorHandlingFSTest, WALWriteRetryableError) {
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -1443,8 +1425,8 @@ TEST_F(DBErrorHandlingFSTest, MultiCFWALWriteError) {
    ROCKSDB_GTEST_SKIP("Test requires non-mock environment");
    return;
  }
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -1775,10 +1757,10 @@ TEST_F(DBErrorHandlingFSTest, MultiDBVariousErrors) {
 // to soft error and trigger auto resume. During auto resume, SwitchMemtable
 // is disabled to avoid small SST tables. Write can still be applied before
 // the bg error is cleaned unless the memtable is full.
-TEST_F(DBErrorHandlingFSTest, FlushWritNoWALRetryableErrorAutoRecover1) {
+TEST_F(DBErrorHandlingFSTest, FLushWritNoWALRetryableErrorAutoRecover1) {
  // Activate the FS before the first resume
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -1799,7 +1781,7 @@ TEST_F(DBErrorHandlingFSTest, FlushWritNoWALRetryableErrorAutoRecover1) {
  ASSERT_OK(Put(Key(1), "val1", wo));
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->LoadDependency(
      {{"RecoverFromRetryableBGIOError:LoopOut",
-        "FlushWritNoWALRetryableeErrorAutoRecover1:1"}});
+        "FLushWritNoWALRetryableeErrorAutoRecover1:1"}});
  SyncPoint::GetInstance()->SetCallBack(
      "BuildTable:BeforeFinishBuildTable",
      [&](void*) { fault_fs_->SetFilesystemActive(false, error_msg); });
@@ -1808,7 +1790,7 @@ TEST_F(DBErrorHandlingFSTest, FlushWritNoWALRetryableErrorAutoRecover1) {
  s = Flush();
  ASSERT_EQ("val1", Get(Key(1)));
  ASSERT_EQ(s.severity(), ROCKSDB_NAMESPACE::Status::Severity::kSoftError);
-  TEST_SYNC_POINT("FlushWritNoWALRetryableeErrorAutoRecover1:1");
+  TEST_SYNC_POINT("FLushWritNoWALRetryableeErrorAutoRecover1:1");
  ASSERT_EQ("val1", Get(Key(1)));
  ASSERT_EQ("val1", Get(Key(1)));
  SyncPoint::GetInstance()->DisableProcessing();
@@ -1845,94 +1827,10 @@ TEST_F(DBErrorHandlingFSTest, FlushWritNoWALRetryableErrorAutoRecover1) {
  Destroy(options);
 }

-TEST_F(DBErrorHandlingFSTest, MultipleRecoveryThreads) {
-  // This test creates a scenario where second write's recovery can get started
-  // while mutex is released for a short period during
-  // NotifyOnErrorRecoveryEnd() from the first write's recovery. This is to make
-  // sure RecoverFromRetryableBGIOError() from the second write's recovery
-  // thread does not start with recovery_in_prog_ = false;
-
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
-  Options options = GetDefaultOptions();
-  options.env = fault_env_.get();
-  options.create_if_missing = true;
-  options.listeners.emplace_back(listener);
-  options.max_bgerror_resume_count = 100;
-  options.bgerror_resume_retry_interval = 1000000;  // 1 second
-  options.statistics = CreateDBStatistics();
-
-  listener->EnableAutoRecovery(false);
-  DestroyAndReopen(options);
-
-  IOStatus error_msg = IOStatus::IOError("Retryable IO Error");
-  error_msg.SetRetryable(true);
-
-  WriteOptions wo = WriteOptions();
-  wo.disableWAL = true;
-  fault_fs_->SetFilesystemActive(false, error_msg);
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->LoadDependency(
-      {{"NotifyOnErrorRecoveryEnd:MutexUnlocked:1",
-        "MultipleRecoveryThreads:1"},
-       {"MultipleRecoveryThreads:2",
-        "NotifyOnErrorRecoveryEnd:MutexUnlocked:2"},
-       {"StartRecoverFromRetryableBGIOError:BeforeWaitingForOtherThread",
-        "MultipleRecoveryThreads:3"},
-       {"RecoverFromRetryableBGIOError:RecoverSuccess",
-        "MultipleRecoveryThreads:4"},
-       {"MultipleRecoveryThreads:4",
-        "StartRecoverFromRetryableBGIOError:AfterWaitingForOtherThread"}});
-  SyncPoint::GetInstance()->EnableProcessing();
-
-  // First write with read fault injected and recovery will start
-  {
-    ASSERT_OK(Put(Key(1), "val1", wo));
-    Status s = Flush();
-    ASSERT_NOK(s);
-  }
-  // Remove read fault injection so that first recovery can go through
-  fault_fs_->SetFilesystemActive(true);
-
-  // At this point, first recovery is now at NotifyOnErrorRecoveryEnd. Mutex is
-  // released.
-  TEST_SYNC_POINT("MultipleRecoveryThreads:1");
-
-  ROCKSDB_NAMESPACE::port::Thread second_write([&] {
-    // Second write with read fault injected
-    fault_fs_->SetFilesystemActive(false, error_msg);
-    ASSERT_OK(Put(Key(2), "val2", wo));
-    Status s = Flush();
-    ASSERT_NOK(s);
-  });
-  // Second bg thread before waiting for the first thread's recovery thread
-  TEST_SYNC_POINT("MultipleRecoveryThreads:3");
-  // First thread's recovery thread continues
-  TEST_SYNC_POINT("MultipleRecoveryThreads:2");
-  // Wait for the first thread's recovery to finish
-  // (this sets recovery_in_prog_ = false)
-  // And second thread continues and starts recovery thread
-  TEST_SYNC_POINT("MultipleRecoveryThreads:4");
-  second_write.join();
-  // Remove error injection so that second thread recovery can go through
-  fault_fs_->SetFilesystemActive(true);
-
-  // Set up sync point so that we can wait for the recovery thread to finish
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->LoadDependency(
-      {{"RecoverFromRetryableBGIOError:RecoverSuccess",
-        "MultipleRecoveryThreads:6"}});
-
-  // Wait for the second thread's recovery to be done
-  TEST_SYNC_POINT("MultipleRecoveryThreads:6");
-
-  SyncPoint::GetInstance()->DisableProcessing();
-  SyncPoint::GetInstance()->ClearAllCallBacks();
-  Destroy(options);
-}
-
-TEST_F(DBErrorHandlingFSTest, FlushWritNoWALRetryableErrorAutoRecover2) {
+TEST_F(DBErrorHandlingFSTest, FLushWritNoWALRetryableErrorAutoRecover2) {
  // Activate the FS before the first resume
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -1990,10 +1888,10 @@ TEST_F(DBErrorHandlingFSTest, FlushWritNoWALRetryableErrorAutoRecover2) {

 // Auto resume fromt the flush retryable IO error. Activate the FS before the
 // first resume. Resume is successful
-TEST_F(DBErrorHandlingFSTest, FlushWritRetryableErrorAutoRecover1) {
+TEST_F(DBErrorHandlingFSTest, FLushWritRetryableErrorAutoRecover1) {
  // Activate the FS before the first resume
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -2032,10 +1930,10 @@ TEST_F(DBErrorHandlingFSTest, FlushWritRetryableErrorAutoRecover1) {

 // Auto resume fromt the flush retryable IO error and set the retry limit count.
 // Never activate the FS and auto resume should fail at the end
-TEST_F(DBErrorHandlingFSTest, FlushWritRetryableErrorAutoRecover2) {
+TEST_F(DBErrorHandlingFSTest, FLushWritRetryableErrorAutoRecover2) {
  // Fail all the resume and let user to resume
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -2052,18 +1950,18 @@ TEST_F(DBErrorHandlingFSTest, FlushWritRetryableErrorAutoRecover2) {

  ASSERT_OK(Put(Key(1), "val1"));
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->LoadDependency(
-      {{"FlushWritRetryableeErrorAutoRecover2:0",
+      {{"FLushWritRetryableeErrorAutoRecover2:0",
        "RecoverFromRetryableBGIOError:BeforeStart"},
       {"RecoverFromRetryableBGIOError:LoopOut",
-        "FlushWritRetryableeErrorAutoRecover2:1"}});
+        "FLushWritRetryableeErrorAutoRecover2:1"}});
  SyncPoint::GetInstance()->SetCallBack(
      "BuildTable:BeforeFinishBuildTable",
      [&](void*) { fault_fs_->SetFilesystemActive(false, error_msg); });
  SyncPoint::GetInstance()->EnableProcessing();
  s = Flush();
  ASSERT_EQ(s.severity(), ROCKSDB_NAMESPACE::Status::Severity::kSoftError);
-  TEST_SYNC_POINT("FlushWritRetryableeErrorAutoRecover2:0");
-  TEST_SYNC_POINT("FlushWritRetryableeErrorAutoRecover2:1");
+  TEST_SYNC_POINT("FLushWritRetryableeErrorAutoRecover2:0");
+  TEST_SYNC_POINT("FLushWritRetryableeErrorAutoRecover2:1");
  fault_fs_->SetFilesystemActive(true);
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->ClearAllCallBacks();
  SyncPoint::GetInstance()->DisableProcessing();
@@ -2085,8 +1983,8 @@ TEST_F(DBErrorHandlingFSTest, FlushWritRetryableErrorAutoRecover2) {
 // Fail the first resume and let the second resume be successful.
 TEST_F(DBErrorHandlingFSTest, ManifestWriteRetryableErrorAutoRecover) {
  // Fail the first resume and let the second resume be successful
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -2138,8 +2036,8 @@ TEST_F(DBErrorHandlingFSTest, ManifestWriteRetryableErrorAutoRecover) {

 TEST_F(DBErrorHandlingFSTest, ManifestWriteNoWALRetryableErrorAutoRecover) {
  // Fail the first resume and let the second resume be successful
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -2193,8 +2091,8 @@ TEST_F(DBErrorHandlingFSTest, ManifestWriteNoWALRetryableErrorAutoRecover) {

 TEST_F(DBErrorHandlingFSTest,
       CompactionManifestWriteRetryableErrorAutoRecover) {
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -2283,8 +2181,8 @@ TEST_F(DBErrorHandlingFSTest, CompactionWriteRetryableErrorAutoRecover) {
  // compaction, the FS is set to active and compaction is successful, so
  // the test will hit the CompactionJob::FinishCompactionOutputFile1 sync
  // point.
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -2337,8 +2235,8 @@ TEST_F(DBErrorHandlingFSTest, CompactionWriteRetryableErrorAutoRecover) {
 }

 TEST_F(DBErrorHandlingFSTest, WALWriteRetryableErrorAutoRecover1) {
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -2440,8 +2338,8 @@ TEST_F(DBErrorHandlingFSTest, WALWriteRetryableErrorAutoRecover1) {

 TEST_F(DBErrorHandlingFSTest, WALWriteRetryableErrorAutoRecover2) {
  // Fail the first recover and try second time.
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -2541,10 +2439,10 @@ TEST_F(DBErrorHandlingFSTest, WALWriteRetryableErrorAutoRecover2) {

 // Fail auto resume from a flush retryable error and verify that
 // OnErrorRecoveryEnd listener callback is called
-TEST_F(DBErrorHandlingFSTest, FlushWritRetryableErrorAbortRecovery) {
+TEST_F(DBErrorHandlingFSTest, FLushWritRetryableErrorAbortRecovery) {
  // Activate the FS before the first resume
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -2575,59 +2473,6 @@ TEST_F(DBErrorHandlingFSTest, FlushWritRetryableErrorAbortRecovery) {
  Destroy(options);
 }

-TEST_F(DBErrorHandlingFSTest, FlushErrorRecoveryRaceWithDBDestruction) {
-  Options options = GetDefaultOptions();
-  options.env = fault_env_.get();
-  options.create_if_missing = true;
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
-  options.listeners.emplace_back(listener);
-  DestroyAndReopen(options);
-  ASSERT_OK(Put("k1", "val"));
-
-  // Inject retryable flush error
-  bool error_set = false;
-  SyncPoint::GetInstance()->SetCallBack(
-      "BuildTable:BeforeOutputValidation", [&](void*) {
-        if (error_set) {
-          return;
-        }
-        IOStatus st = IOStatus::IOError("Injected");
-        st.SetRetryable(true);
-        fault_fs_->SetFilesystemActive(false, st);
-        error_set = true;
-      });
-
-  port::Thread db_close_thread;
-  SyncPoint::GetInstance()->SetCallBack(
-      "BuildTable:BeforeDeleteFile", [&](void*) {
-        // Clear retryable flush error injection
-        fault_fs_->SetFilesystemActive(true);
-
-        // Coerce race between ending auto recovery in db destruction and flush
-        // error recovery
-        ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->LoadDependency(
-            {{"PostEndAutoRecovery", "FlushJob::WriteLevel0Table"}});
-        db_close_thread = port::Thread([&] { Close(); });
-      });
-  SyncPoint::GetInstance()->EnableProcessing();
-
-  Status s = Flush();
-  ASSERT_NOK(s);
-
-  int placeholder = 1;
-  listener->WaitForRecovery(placeholder);
-  ASSERT_TRUE(listener->new_bg_error().IsShutdownInProgress());
-
-  // Prior to the fix, the db close will crash due to the recovery thread for
-  // flush error is not joined by the time of destruction.
-  db_close_thread.join();
-
-  SyncPoint::GetInstance()->DisableProcessing();
-  SyncPoint::GetInstance()->ClearAllCallBacks();
-  Destroy(options);
-}
-
 TEST_F(DBErrorHandlingFSTest, FlushReadError) {
  std::shared_ptr<ErrorHandlerFSListener> listener =
      std::make_shared<ErrorHandlerFSListener>();
@@ -2835,9 +2680,9 @@ TEST_F(DBErrorHandlingFSTest, CompactionReadRetryableErrorAutoRecover) {
 class DBErrorHandlingFencingTest : public DBErrorHandlingFSTest,
                                   public testing::WithParamInterface<bool> {};

-TEST_P(DBErrorHandlingFencingTest, FlushWriteFenced) {
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+TEST_P(DBErrorHandlingFencingTest, FLushWriteFenced) {
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -2864,8 +2709,8 @@ TEST_P(DBErrorHandlingFencingTest, FlushWriteFenced) {
 }

 TEST_P(DBErrorHandlingFencingTest, ManifestWriteFenced) {
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -2899,8 +2744,8 @@ TEST_P(DBErrorHandlingFencingTest, ManifestWriteFenced) {
 }

 TEST_P(DBErrorHandlingFencingTest, CompactionWriteFenced) {
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -2940,8 +2785,8 @@ TEST_P(DBErrorHandlingFencingTest, CompactionWriteFenced) {
 }

 TEST_P(DBErrorHandlingFencingTest, WALWriteFenced) {
-  std::shared_ptr<ErrorHandlerFSListener> listener =
-      std::make_shared<ErrorHandlerFSListener>();
+  std::shared_ptr<ErrorHandlerFSListener> listener(
+      new ErrorHandlerFSListener());
  Options options = GetDefaultOptions();
  options.env = fault_env_.get();
  options.create_if_missing = true;
@@ -230,8 +230,6 @@ void EventHelpers::NotifyOnErrorRecoveryEnd(
    db_mutex->AssertHeld();
    // release lock while notifying events
    db_mutex->Unlock();
-    TEST_SYNC_POINT("NotifyOnErrorRecoveryEnd:MutexUnlocked:1");
-    TEST_SYNC_POINT("NotifyOnErrorRecoveryEnd:MutexUnlocked:2");
    for (auto& listener : listeners) {
      BackgroundErrorRecoveryInfo info;
      info.old_bg_error = old_bg_error;
@@ -1548,11 +1548,6 @@ TEST_F(ExternalSSTFileBasicTest, RangeDeletionEndComesBeforeStart) {
 }

 TEST_P(ExternalSSTFileBasicTest, IngestFileWithBadBlockChecksum) {
-  bool verify_checksums_before_ingest = std::get<1>(GetParam());
-  if (!verify_checksums_before_ingest) {
-    ROCKSDB_GTEST_BYPASS("Bypassing test when !verify_checksums_before_ingest");
-    return;
-  }
  bool change_checksum_called = false;
  const auto& change_checksum = [&](void* arg) {
    if (!change_checksum_called) {
@@ -1570,20 +1565,24 @@ TEST_P(ExternalSSTFileBasicTest, IngestFileWithBadBlockChecksum) {
  SyncPoint::GetInstance()->EnableProcessing();
  int file_id = 0;
  bool write_global_seqno = std::get<0>(GetParam());
+  bool verify_checksums_before_ingest = std::get<1>(GetParam());
  do {
    Options options = CurrentOptions();
    DestroyAndReopen(options);
    std::map<std::string, std::string> true_data;
    Status s = GenerateAndAddExternalFile(
        options, {1, 2, 3, 4, 5, 6}, ValueType::kTypeValue, file_id++,
-        write_global_seqno, /*verify_checksums_before_ingest=*/true,
-        &true_data);
-    ASSERT_NOK(s);
+        write_global_seqno, verify_checksums_before_ingest, &true_data);
+    if (verify_checksums_before_ingest) {
+      ASSERT_NOK(s);
+    } else {
+      ASSERT_OK(s);
+    }
    change_checksum_called = false;
  } while (ChangeOptionsForFileIngestionTest());
 }

-TEST_P(ExternalSSTFileBasicTest, IngestFileWithCorruptedDataBlock) {
+TEST_P(ExternalSSTFileBasicTest, IngestFileWithFirstByteTampered) {
  if (!random_rwfile_supported_) {
    ROCKSDB_GTEST_SKIP("Test requires NewRandomRWFile support");
    return;
@@ -1591,21 +1590,15 @@ TEST_P(ExternalSSTFileBasicTest, IngestFileWithCorruptedDataBlock) {
  SyncPoint::GetInstance()->DisableProcessing();
  int file_id = 0;
  EnvOptions env_options;
-  Random rnd(301);
  do {
    Options options = CurrentOptions();
-    options.compression = kNoCompression;
-    BlockBasedTableOptions table_options;
-    table_options.block_size = 4 * 1024;
-    options.table_factory.reset(NewBlockBasedTableFactory(table_options));
    std::string file_path = sst_files_dir_ + std::to_string(file_id++);
    SstFileWriter sst_file_writer(env_options, options);
    Status s = sst_file_writer.Open(file_path);
    ASSERT_OK(s);
-    // This should write more than 2 data blocks.
    for (int i = 0; i != 100; ++i) {
      std::string key = Key(i);
-      std::string value = rnd.RandomString(200);
+      std::string value = Key(i) + std::to_string(0);
      ASSERT_OK(sst_file_writer.Put(key, value));
    }
    ASSERT_OK(sst_file_writer.Finish());
@@ -1616,11 +1609,11 @@ TEST_P(ExternalSSTFileBasicTest, IngestFileWithCorruptedDataBlock) {
      ASSERT_GT(file_size, 8);
      std::unique_ptr<RandomRWFile> rwfile;
      ASSERT_OK(env_->NewRandomRWFile(file_path, &rwfile, EnvOptions()));
-      // Corrupt the second data block.
-      // We need to corrupt a non-first and non-last data block
-      // since we access them to get smallest and largest internal
-      // key in the file in GetIngestedFileInfo().
-      const uint64_t offset = 5000;
+      // Manually corrupt the file
+      // We deterministically corrupt the first byte because we currently
+      // cannot choose a random offset. The reason for this limitation is that
+      // we do not checksum property block at present.
+      const uint64_t offset = 0;
      char scratch[8] = {0};
      Slice buf;
      ASSERT_OK(rwfile->Read(offset, sizeof(scratch), &buf, scratch));
@@ -769,6 +769,8 @@ Status ExternalSstFileIngestionJob::GetIngestedFileInfo(
  std::unique_ptr<InternalIterator> iter(table_reader->NewIterator(
      ro, sv->mutable_cf_options.prefix_extractor.get(), /*arena=*/nullptr,
      /*skip_filters=*/false, TableReaderCaller::kExternalSSTIngestion));
+  std::unique_ptr<InternalIterator> range_del_iter(
+      table_reader->NewRangeTombstoneIterator(ro));

  // Get first (smallest) and last (largest) key from file.
  file_to_ingest->smallest_internal_key =
@@ -790,33 +792,8 @@ Status ExternalSstFileIngestionJob::GetIngestedFileInfo(
    }
    file_to_ingest->smallest_internal_key.SetFrom(key);

-    Slice largest;
-    if (strcmp(cfd_->ioptions()->table_factory->Name(), "PlainTable") == 0) {
-      // PlainTable iterator does not support SeekToLast().
-      largest = iter->key();
-      for (; iter->Valid(); iter->Next()) {
-        if (cfd_->internal_comparator().Compare(iter->key(), largest) > 0) {
-          largest = iter->key();
-        }
-      }
-      if (!iter->status().ok()) {
-        return iter->status();
-      }
-    } else {
-      iter->SeekToLast();
-      if (!iter->Valid()) {
-        if (iter->status().ok()) {
-          // The file contains at least 1 key since iter is valid after
-          // SeekToFirst().
-          return Status::Corruption("Can not find largest key in sst file");
-        } else {
-          return iter->status();
-        }
-      }
-      largest = iter->key();
-    }
-
-    pik_status = ParseInternalKey(largest, &key, allow_data_in_errors);
+    iter->SeekToLast();
+    pik_status = ParseInternalKey(iter->key(), &key, allow_data_in_errors);
    if (!pik_status.ok()) {
      return Status::Corruption("Corrupted key in external file. ",
                                pik_status.getState());
@@ -827,12 +804,8 @@ Status ExternalSstFileIngestionJob::GetIngestedFileInfo(
    file_to_ingest->largest_internal_key.SetFrom(key);

    bounds_set = true;
-  } else if (!iter->status().ok()) {
-    return iter->status();
  }

-  std::unique_ptr<InternalIterator> range_del_iter(
-      table_reader->NewRangeTombstoneIterator(ro));
  // We may need to adjust these key bounds, depending on whether any range
  // deletion tombstones extend past them.
  const Comparator* ucmp = cfd_->internal_comparator().user_comparator();
@@ -127,12 +127,11 @@ class FlushJobTestBase : public testing::Test {
      column_families.emplace_back(cf_name, cf_options_);
    }

-    versions_.reset(new VersionSet(
-        dbname_, &db_options_, env_options_, table_cache_.get(),
-        &write_buffer_manager_, &write_controller_,
-        /*block_cache_tracer=*/nullptr, /*io_tracer=*/nullptr,
-        /*db_id=*/"", /*db_session_id=*/"", /*daily_offpeak_time_utc=*/"",
-        /*error_handler=*/nullptr));
+    versions_.reset(
+        new VersionSet(dbname_, &db_options_, env_options_, table_cache_.get(),
+                       &write_buffer_manager_, &write_controller_,
+                       /*block_cache_tracer=*/nullptr, /*io_tracer=*/nullptr,
+                       /*db_id*/ "", /*db_session_id*/ ""));
    EXPECT_OK(versions_->Recover(column_families, false));
  }

@@ -186,8 +186,7 @@ Status ImportColumnFamilyJob::Run() {
      cfd_->NumberLevels(), cfd_->ioptions()->compaction_style,
      nullptr /* src_vstorage */, cfd_->ioptions()->force_consistency_checks,
      EpochNumberRequirement::kMightMissing, cfd_->ioptions()->clock,
-      cfd_->GetLatestMutableCFOptions()->bottommost_file_compaction_delay,
-      cfd_->current()->version_set()->offpeak_time_option());
+      cfd_->GetLatestMutableCFOptions()->bottommost_file_compaction_delay);
  Status s;

  for (size_t i = 0; s.ok() && i < files_to_import_.size(); ++i) {
@@ -366,35 +365,9 @@ Status ImportColumnFamilyJob::GetIngestedFileInfo(
    bool bound_set = false;
    if (iter->Valid()) {
      file_to_import->smallest_internal_key.DecodeFrom(iter->key());
-      Slice largest;
-      if (strcmp(cfd_->ioptions()->table_factory->Name(), "PlainTable") == 0) {
-        // PlainTable iterator does not support SeekToLast().
-        largest = iter->key();
-        for (; iter->Valid(); iter->Next()) {
-          if (cfd_->internal_comparator().Compare(iter->key(), largest) > 0) {
-            largest = iter->key();
-          }
-        }
-        if (!iter->status().ok()) {
-          return iter->status();
-        }
-      } else {
-        iter->SeekToLast();
-        if (!iter->Valid()) {
-          if (iter->status().ok()) {
-            // The file contains at least 1 key since iter is valid after
-            // SeekToFirst().
-            return Status::Corruption("Can not find largest key in sst file");
-          } else {
-            return iter->status();
-          }
-        }
-        largest = iter->key();
-      }
-      file_to_import->largest_internal_key.DecodeFrom(largest);
+      iter->SeekToLast();
+      file_to_import->largest_internal_key.DecodeFrom(iter->key());
      bound_set = true;
-    } else if (!iter->status().ok()) {
-      return iter->status();
    }

    std::unique_ptr<InternalIterator> range_del_iter{
@@ -456,4 +429,4 @@ Status ImportColumnFamilyJob::GetIngestedFileInfo(

  return status;
 }
-}  // namespace ROCKSDB_NAMESPACE
+}  // namespace ROCKSDB_NAMESPACE
@@ -326,7 +326,7 @@ TEST_F(ImportColumnFamilyTest, ImportSSTFileWriterFilesWithRangeTombstone) {
  const SstFileMetaData* file_meta = nullptr;
  for (const auto& level_meta : import_cf_meta.levels) {
    if (!level_meta.files.empty()) {
-      file_meta = level_meta.files.data();
+      file_meta = &(level_meta.files[0]);
      break;
    }
  }
@@ -389,7 +389,7 @@ TEST_F(ImportColumnFamilyTest, ImportExportedSSTFromAnotherCF) {
                                              *metadata_ptr_, &import_cfh2_));
  ASSERT_NE(import_cfh2_, nullptr);
  delete metadata_ptr_;
-  metadata_ptr_ = nullptr;
+  metadata_ptr_ = NULL;

  std::string value1, value2;

@@ -15,7 +15,6 @@
 #include "db/column_family.h"
 #include "db/log_writer.h"
 #include "db/version_set.h"
-#include "util/autovector.h"

 namespace ROCKSDB_NAMESPACE {

@@ -171,16 +170,6 @@ struct JobContext {
  // will be reused later
  std::vector<uint64_t> log_recycle_files;

-  // Files quarantined from deletion. This list contains file numbers for files
-  // that are in an ambiguous states. This includes newly generated SST files
-  // and blob files from flush and compaction job whose VersionEdits' persist
-  // state in Manifest are unclear. An old manifest file whose immediately
-  // following new manifest file's CURRENT file creation is in an unclear state.
-  // WAL logs don't have this premature deletion risk since
-  // min_log_number_to_keep is only updated after successful manifest commits.
-  // So this data structure doesn't track log files.
-  autovector<uint64_t> files_to_quarantine;
-
  // a list of manifest files that we need to delete
  std::vector<std::string> manifest_delete_files;

@@ -132,8 +132,8 @@ class TestCompactionListener : public EventListener {
    ASSERT_EQ(db->GetEnv()->GetThreadID(), ci.thread_id);
    ASSERT_GT(ci.thread_id, 0U);

-    for (const auto& fl : {ci.input_files, ci.output_files}) {
-      for (const auto& fn : fl) {
+    for (auto fl : {ci.input_files, ci.output_files}) {
+      for (auto fn : fl) {
        auto it = ci.table_properties.find(fn);
        ASSERT_NE(it, ci.table_properties.end());
        auto tp = it->second;
@@ -237,7 +237,7 @@ class TestFlushListener : public EventListener {
    std::vector<ThreadStatus> thread_list;
    ASSERT_OK(env_->GetThreadList(&thread_list));
    bool found_match = false;
-    for (const auto& thread_status : thread_list) {
+    for (auto thread_status : thread_list) {
      if (thread_status.operation_type == ThreadStatus::OP_FLUSH ||
          thread_status.operation_type == ThreadStatus::OP_COMPACTION) {
        if (thread_id == thread_status.thread_id) {
@@ -893,7 +893,7 @@ class MemTableSealedListener : public EventListener {
  SequenceNumber latest_seq_number_;

 public:
-  MemTableSealedListener() = default;
+  MemTableSealedListener() {}
  void OnMemTableSealed(const MemTableInfo& info) override {
    latest_seq_number_ = info.first_seqno;
  }
@@ -9,7 +9,7 @@

 #include "db/log_reader.h"

-#include <cstdio>
+#include <stdio.h>

 #include "file/sequence_file_reader.h"
 #include "port/lang.h"
@@ -21,7 +21,7 @@
 namespace ROCKSDB_NAMESPACE {
 namespace log {

-Reader::Reporter::~Reporter() = default;
+Reader::Reporter::~Reporter() {}

 Reader::Reader(std::shared_ptr<Logger> info_log,
               std::unique_ptr<SequentialFileReader>&& _file,
@@ -469,14 +469,12 @@ unsigned int Reader::ReadPhysicalRecord(Slice* result, size_t* drop_size,
    const unsigned int type = header[6];
    const uint32_t length = a | (b << 8);
    int header_size = kHeaderSize;
-    const bool is_recyclable_type =
-        ((type >= kRecyclableFullType && type <= kRecyclableLastType) ||
-         type == kRecyclableUserDefinedTimestampSizeType);
-    if (is_recyclable_type) {
-      header_size = kRecyclableHeaderSize;
+    if ((type >= kRecyclableFullType && type <= kRecyclableLastType) ||
+        type == kRecyclableUserDefinedTimestampSizeType) {
      if (end_of_buffer_offset_ - buffer_.size() == 0) {
        recycled_ = true;
      }
+      header_size = kRecyclableHeaderSize;
      // We need enough for the larger header
      if (buffer_.size() < static_cast<size_t>(kRecyclableHeaderSize)) {
        int r = kEof;
@@ -485,8 +483,11 @@ unsigned int Reader::ReadPhysicalRecord(Slice* result, size_t* drop_size,
        }
        continue;
      }
+      const uint32_t log_num = DecodeFixed32(header + 7);
+      if (log_num != log_number_) {
+        return kOldRecord;
+      }
    }
-
    if (header_size + length > buffer_.size()) {
      assert(buffer_.size() >= static_cast<size_t>(header_size));
      *drop_size = buffer_.size();
@@ -498,14 +499,6 @@ unsigned int Reader::ReadPhysicalRecord(Slice* result, size_t* drop_size,
      return kBadRecordLen;
    }

-    if (is_recyclable_type) {
-      const uint32_t log_num = DecodeFixed32(header + 7);
-      if (log_num != log_number_) {
-        buffer_.remove_prefix(header_size + length);
-        return kOldRecord;
-      }
-    }
-
    if (type == kZeroType && length == 0) {
      // Skip zero length record without reporting any drops since
      // such records are produced by the mmap based writing code in
@@ -1167,7 +1167,7 @@ TEST_P(StreamingCompressionTest, Basic) {
    }
    allocator->Deallocate((void*)output_buffer);
  } while (remaining > 0);
-  std::string uncompressed_buffer;
+  std::string uncompressed_buffer = "";
  int ret_val = 0;
  size_t output_pos;
  char* uncompressed_output_buffer = (char*)allocator->Allocate(kBlockSize);
@@ -9,7 +9,7 @@

 #include "db/log_writer.h"

-#include <cstdint>
+#include <stdint.h>

 #include "file/writable_file_writer.h"
 #include "rocksdb/env.h"
@@ -9,7 +9,8 @@

 #include "db/malloc_stats.h"

-#include <cstring>
+#include <string.h>
+
 #include <memory>

 #include "port/jemalloc_helper.h"
@@ -58,7 +58,7 @@ class ManualCompactionTest : public testing::Test {

 class DestroyAllCompactionFilter : public CompactionFilter {
 public:
-  DestroyAllCompactionFilter() = default;
+  DestroyAllCompactionFilter() {}

  bool Filter(int /*level*/, const Slice& /*key*/, const Slice& existing_value,
              std::string* /*new_value*/,
@@ -1061,8 +1061,8 @@ static bool SaveValue(void* arg, const char* entry) {
                merge_operator, s->key->user_key(),
                MergeHelper::kPlainBaseValue, v, merge_context->GetOperands(),
                s->logger, s->statistics, s->clock,
-                /* update_num_ops_stats */ true, /* op_failure_scope */ nullptr,
-                s->value, s->columns);
+                /* update_num_ops_stats */ true, s->value, s->columns,
+                /* op_failure_scope */ nullptr);
          }
        } else if (s->value) {
          s->value->assign(v.data(), v.size());
@@ -1114,8 +1114,8 @@ static bool SaveValue(void* arg, const char* entry) {
            *(s->status) = MergeHelper::TimedFullMerge(
                merge_operator, s->key->user_key(), MergeHelper::kWideBaseValue,
                v, merge_context->GetOperands(), s->logger, s->statistics,
-                s->clock, /* update_num_ops_stats */ true,
-                /* op_failure_scope */ nullptr, s->value, s->columns);
+                s->clock, /* update_num_ops_stats */ true, s->value, s->columns,
+                /* op_failure_scope */ nullptr);
          }
        } else if (s->value) {
          Slice value_of_default;
@@ -1152,8 +1152,8 @@ static bool SaveValue(void* arg, const char* entry) {
            *(s->status) = MergeHelper::TimedFullMerge(
                merge_operator, s->key->user_key(), MergeHelper::kNoBaseValue,
                merge_context->GetOperands(), s->logger, s->statistics,
-                s->clock, /* update_num_ops_stats */ true,
-                /* op_failure_scope */ nullptr, s->value, s->columns);
+                s->clock, /* update_num_ops_stats */ true, s->value, s->columns,
+                /* op_failure_scope */ nullptr);
          } else {
            // We have found a final value (a base deletion) and have newer
            // merge operands that we do not intend to merge. Nothing remains
@@ -1192,8 +1192,8 @@ static bool SaveValue(void* arg, const char* entry) {
            *(s->status) = MergeHelper::TimedFullMerge(
                merge_operator, s->key->user_key(), MergeHelper::kNoBaseValue,
                merge_context->GetOperands(), s->logger, s->statistics,
-                s->clock, /* update_num_ops_stats */ true,
-                /* op_failure_scope */ nullptr, s->value, s->columns);
+                s->clock, /* update_num_ops_stats */ true, s->value, s->columns,
+                /* op_failure_scope */ nullptr);
          }

          *(s->found_final_value) = true;
@@ -1362,7 +1362,7 @@ void MemTable::MultiGet(const ReadOptions& read_options, MultiGetRange* range,
        range_indexes[num_keys++] = iter.index();
      }
    }
-    bloom_filter_->MayContain(num_keys, bloom_keys.data(), may_match.data());
+    bloom_filter_->MayContain(num_keys, &bloom_keys[0], &may_match[0]);
    for (int i = 0; i < num_keys; ++i) {
      if (!may_match[i]) {
        temp_range.SkipIndex(range_indexes[i]);
@@ -106,9 +106,8 @@ class MemTableListTest : public testing::Test {
    VersionSet versions(dbname, &immutable_db_options, env_options,
                        table_cache.get(), &write_buffer_manager,
                        &write_controller, /*block_cache_tracer=*/nullptr,
-                        /*io_tracer=*/nullptr, /*db_id=*/"",
-                        /*db_session_id=*/"", /*daily_offpeak_time_utc=*/"",
-                        /*error_handler=*/nullptr);
+                        /*io_tracer=*/nullptr, /*db_id*/ "",
+                        /*db_session_id*/ "");
    std::vector<ColumnFamilyDescriptor> cf_descs;
    cf_descs.emplace_back(kDefaultColumnFamilyName, ColumnFamilyOptions());
    cf_descs.emplace_back("one", ColumnFamilyOptions());
@@ -158,9 +157,8 @@ class MemTableListTest : public testing::Test {
    VersionSet versions(dbname, &immutable_db_options, env_options,
                        table_cache.get(), &write_buffer_manager,
                        &write_controller, /*block_cache_tracer=*/nullptr,
-                        /*io_tracer=*/nullptr, /*db_id=*/"",
-                        /*db_session_id=*/"", /*daily_offpeak_time_utc=*/"",
-                        /*error_handler=*/nullptr);
+                        /*io_tracer=*/nullptr, /*db_id*/ "",
+                        /*db_session_id*/ "");
    std::vector<ColumnFamilyDescriptor> cf_descs;
    cf_descs.emplace_back(kDefaultColumnFamilyName, ColumnFamilyOptions());
    cf_descs.emplace_back("one", ColumnFamilyOptions());
@@ -12,6 +12,7 @@
 #include "db/blob/prefetch_buffer_collection.h"
 #include "db/compaction/compaction_iteration_stats.h"
 #include "db/dbformat.h"
+#include "db/wide/wide_column_serialization.h"
 #include "db/wide/wide_columns_helper.h"
 #include "logging/logging.h"
 #include "monitoring/perf_context_imp.h"
@@ -110,9 +111,9 @@ Status MergeHelper::TimedFullMergeImpl(
    const MergeOperator* merge_operator, const Slice& key,
    MergeOperator::MergeOperationInputV3::ExistingValue&& existing_value,
    const std::vector<Slice>& operands, Logger* logger, Statistics* statistics,
-    SystemClock* clock, bool update_num_ops_stats,
-    MergeOperator::OpFailureScope* op_failure_scope, std::string* result,
-    Slice* result_operand, ValueType* result_type) {
+    SystemClock* clock, bool update_num_ops_stats, std::string* result,
+    Slice* result_operand, ValueType* result_type,
+    MergeOperator::OpFailureScope* op_failure_scope) {
  assert(result);
  assert(result_type);

@@ -172,9 +173,9 @@ Status MergeHelper::TimedFullMergeImpl(
    const MergeOperator* merge_operator, const Slice& key,
    MergeOperator::MergeOperationInputV3::ExistingValue&& existing_value,
    const std::vector<Slice>& operands, Logger* logger, Statistics* statistics,
-    SystemClock* clock, bool update_num_ops_stats,
-    MergeOperator::OpFailureScope* op_failure_scope, std::string* result_value,
-    PinnableWideColumns* result_entity) {
+    SystemClock* clock, bool update_num_ops_stats, std::string* result_value,
+    PinnableWideColumns* result_entity,
+    MergeOperator::OpFailureScope* op_failure_scope) {
  assert(result_value || result_entity);
  assert(!result_value || !result_entity);

@@ -244,6 +245,141 @@ Status MergeHelper::TimedFullMergeImpl(
                                  op_failure_scope, std::move(visitor));
 }

+Status MergeHelper::TimedFullMerge(
+    const MergeOperator* merge_operator, const Slice& key, NoBaseValueTag,
+    const std::vector<Slice>& operands, Logger* logger, Statistics* statistics,
+    SystemClock* clock, bool update_num_ops_stats, std::string* result,
+    Slice* result_operand, ValueType* result_type,
+    MergeOperator::OpFailureScope* op_failure_scope) {
+  MergeOperator::MergeOperationInputV3::ExistingValue existing_value;
+
+  return TimedFullMergeImpl(merge_operator, key, std::move(existing_value),
+                            operands, logger, statistics, clock,
+                            update_num_ops_stats, result, result_operand,
+                            result_type, op_failure_scope);
+}
+
+Status MergeHelper::TimedFullMerge(
+    const MergeOperator* merge_operator, const Slice& key, PlainBaseValueTag,
+    const Slice& value, const std::vector<Slice>& operands, Logger* logger,
+    Statistics* statistics, SystemClock* clock, bool update_num_ops_stats,
+    std::string* result, Slice* result_operand, ValueType* result_type,
+    MergeOperator::OpFailureScope* op_failure_scope) {
+  MergeOperator::MergeOperationInputV3::ExistingValue existing_value(value);
+
+  return TimedFullMergeImpl(merge_operator, key, std::move(existing_value),
+                            operands, logger, statistics, clock,
+                            update_num_ops_stats, result, result_operand,
+                            result_type, op_failure_scope);
+}
+
+Status MergeHelper::TimedFullMerge(
+    const MergeOperator* merge_operator, const Slice& key, WideBaseValueTag,
+    const Slice& entity, const std::vector<Slice>& operands, Logger* logger,
+    Statistics* statistics, SystemClock* clock, bool update_num_ops_stats,
+    std::string* result, Slice* result_operand, ValueType* result_type,
+    MergeOperator::OpFailureScope* op_failure_scope) {
+  MergeOperator::MergeOperationInputV3::ExistingValue existing_value;
+
+  Slice entity_copy(entity);
+  WideColumns existing_columns;
+
+  const Status s =
+      WideColumnSerialization::Deserialize(entity_copy, existing_columns);
+  if (!s.ok()) {
+    return s;
+  }
+
+  existing_value = std::move(existing_columns);
+
+  return TimedFullMergeImpl(merge_operator, key, std::move(existing_value),
+                            operands, logger, statistics, clock,
+                            update_num_ops_stats, result, result_operand,
+                            result_type, op_failure_scope);
+}
+
+Status MergeHelper::TimedFullMerge(
+    const MergeOperator* merge_operator, const Slice& key, WideBaseValueTag,
+    const WideColumns& columns, const std::vector<Slice>& operands,
+    Logger* logger, Statistics* statistics, SystemClock* clock,
+    bool update_num_ops_stats, std::string* result, Slice* result_operand,
+    ValueType* result_type, MergeOperator::OpFailureScope* op_failure_scope) {
+  MergeOperator::MergeOperationInputV3::ExistingValue existing_value(columns);
+
+  return TimedFullMergeImpl(merge_operator, key, std::move(existing_value),
+                            operands, logger, statistics, clock,
+                            update_num_ops_stats, result, result_operand,
+                            result_type, op_failure_scope);
+}
+
+Status MergeHelper::TimedFullMerge(
+    const MergeOperator* merge_operator, const Slice& key, NoBaseValueTag,
+    const std::vector<Slice>& operands, Logger* logger, Statistics* statistics,
+    SystemClock* clock, bool update_num_ops_stats, std::string* result_value,
+    PinnableWideColumns* result_entity,
+    MergeOperator::OpFailureScope* op_failure_scope) {
+  MergeOperator::MergeOperationInputV3::ExistingValue existing_value;
+
+  return TimedFullMergeImpl(merge_operator, key, std::move(existing_value),
+                            operands, logger, statistics, clock,
+                            update_num_ops_stats, result_value, result_entity,
+                            op_failure_scope);
+}
+
+Status MergeHelper::TimedFullMerge(
+    const MergeOperator* merge_operator, const Slice& key, PlainBaseValueTag,
+    const Slice& value, const std::vector<Slice>& operands, Logger* logger,
+    Statistics* statistics, SystemClock* clock, bool update_num_ops_stats,
+    std::string* result_value, PinnableWideColumns* result_entity,
+    MergeOperator::OpFailureScope* op_failure_scope) {
+  MergeOperator::MergeOperationInputV3::ExistingValue existing_value(value);
+
+  return TimedFullMergeImpl(merge_operator, key, std::move(existing_value),
+                            operands, logger, statistics, clock,
+                            update_num_ops_stats, result_value, result_entity,
+                            op_failure_scope);
+}
+
+Status MergeHelper::TimedFullMerge(
+    const MergeOperator* merge_operator, const Slice& key, WideBaseValueTag,
+    const Slice& entity, const std::vector<Slice>& operands, Logger* logger,
+    Statistics* statistics, SystemClock* clock, bool update_num_ops_stats,
+    std::string* result_value, PinnableWideColumns* result_entity,
+    MergeOperator::OpFailureScope* op_failure_scope) {
+  MergeOperator::MergeOperationInputV3::ExistingValue existing_value;
+
+  Slice entity_copy(entity);
+  WideColumns existing_columns;
+
+  const Status s =
+      WideColumnSerialization::Deserialize(entity_copy, existing_columns);
+  if (!s.ok()) {
+    return s;
+  }
+
+  existing_value = std::move(existing_columns);
+
+  return TimedFullMergeImpl(merge_operator, key, std::move(existing_value),
+                            operands, logger, statistics, clock,
+                            update_num_ops_stats, result_value, result_entity,
+                            op_failure_scope);
+}
+
+Status MergeHelper::TimedFullMerge(
+    const MergeOperator* merge_operator, const Slice& key, WideBaseValueTag,
+    const WideColumns& columns, const std::vector<Slice>& operands,
+    Logger* logger, Statistics* statistics, SystemClock* clock,
+    bool update_num_ops_stats, std::string* result_value,
+    PinnableWideColumns* result_entity,
+    MergeOperator::OpFailureScope* op_failure_scope) {
+  MergeOperator::MergeOperationInputV3::ExistingValue existing_value(columns);
+
+  return TimedFullMergeImpl(merge_operator, key, std::move(existing_value),
+                            operands, logger, statistics, clock,
+                            update_num_ops_stats, result_value, result_entity,
+                            op_failure_scope);
+}
+
 // PRE:  iter points to the first merge type entry
 // POST: iter points to the first entry beyond the merge process (or the end)
 //       keys_, operands_ are updated to reflect the merge result.
@@ -292,9 +428,7 @@ Status MergeHelper::MergeUntil(InternalIterator* iter,

  Status s = ParseInternalKey(original_key, &orig_ikey, allow_data_in_errors);
  assert(s.ok());
-  if (!s.ok()) {
-    return s;
-  }
+  if (!s.ok()) return s;

  assert(kTypeMerge == orig_ikey.type);

@@ -383,14 +517,14 @@ Status MergeHelper::MergeUntil(InternalIterator* iter,
        s = TimedFullMerge(user_merge_operator_, ikey.user_key, kNoBaseValue,
                           merge_context_.GetOperands(), logger_, stats_,
                           clock_, /* update_num_ops_stats */ false,
-                           &op_failure_scope, &merge_result,
-                           /* result_operand */ nullptr, &merge_result_type);
+                           &merge_result, /* result_operand */ nullptr,
+                           &merge_result_type, &op_failure_scope);
      } else if (ikey.type == kTypeValue) {
        s = TimedFullMerge(user_merge_operator_, ikey.user_key, kPlainBaseValue,
                           iter->value(), merge_context_.GetOperands(), logger_,
                           stats_, clock_, /* update_num_ops_stats */ false,
-                           &op_failure_scope, &merge_result,
-                           /* result_operand */ nullptr, &merge_result_type);
+                           &merge_result, /* result_operand */ nullptr,
+                           &merge_result_type, &op_failure_scope);
      } else if (ikey.type == kTypeBlobIndex) {
        BlobIndex blob_index;

@@ -423,20 +557,20 @@ Status MergeHelper::MergeUntil(InternalIterator* iter,
        s = TimedFullMerge(user_merge_operator_, ikey.user_key, kPlainBaseValue,
                           blob_value, merge_context_.GetOperands(), logger_,
                           stats_, clock_, /* update_num_ops_stats */ false,
-                           &op_failure_scope, &merge_result,
-                           /* result_operand */ nullptr, &merge_result_type);
+                           &merge_result, /* result_operand */ nullptr,
+                           &merge_result_type, &op_failure_scope);
      } else if (ikey.type == kTypeWideColumnEntity) {
        s = TimedFullMerge(user_merge_operator_, ikey.user_key, kWideBaseValue,
                           iter->value(), merge_context_.GetOperands(), logger_,
                           stats_, clock_, /* update_num_ops_stats */ false,
-                           &op_failure_scope, &merge_result,
-                           /* result_operand */ nullptr, &merge_result_type);
+                           &merge_result, /* result_operand */ nullptr,
+                           &merge_result_type, &op_failure_scope);
      } else {
        s = TimedFullMerge(user_merge_operator_, ikey.user_key, kNoBaseValue,
                           merge_context_.GetOperands(), logger_, stats_,
                           clock_, /* update_num_ops_stats */ false,
-                           &op_failure_scope, &merge_result,
-                           /* result_operand */ nullptr, &merge_result_type);
+                           &merge_result, /* result_operand */ nullptr,
+                           &merge_result_type, &op_failure_scope);
      }

      // We store the result in keys_.back() and operands_.back()
@@ -578,9 +712,9 @@ Status MergeHelper::MergeUntil(InternalIterator* iter,
    MergeOperator::OpFailureScope op_failure_scope;
    s = TimedFullMerge(user_merge_operator_, orig_ikey.user_key, kNoBaseValue,
                       merge_context_.GetOperands(), logger_, stats_, clock_,
-                       /* update_num_ops_stats */ false, &op_failure_scope,
-                       &merge_result,
-                       /* result_operand */ nullptr, &merge_result_type);
+                       /* update_num_ops_stats */ false, &merge_result,
+                       /* result_operand */ nullptr, &merge_result_type,
+                       &op_failure_scope);
    if (s.ok()) {
      // The original key encountered
      // We are certain that keys_ is not empty here (see assertions couple of
@@ -12,7 +12,6 @@
 #include "db/merge_context.h"
 #include "db/range_del_aggregator.h"
 #include "db/snapshot_checker.h"
-#include "db/wide/wide_column_serialization.h"
 #include "rocksdb/compaction_filter.h"
 #include "rocksdb/env.h"
 #include "rocksdb/merge_operator.h"
@@ -61,73 +60,74 @@ class MergeHelper {
  struct WideBaseValueTag {};
  static constexpr WideBaseValueTag kWideBaseValue{};

-  template <typename... ResultTs>
+  // Variants that expose the merge result directly (in serialized form for wide
+  // columns) as well as its value type. Used by iterator and compaction.
  static Status TimedFullMerge(const MergeOperator* merge_operator,
                               const Slice& key, NoBaseValueTag,
                               const std::vector<Slice>& operands,
                               Logger* logger, Statistics* statistics,
                               SystemClock* clock, bool update_num_ops_stats,
-                               MergeOperator::OpFailureScope* op_failure_scope,
-                               ResultTs... results) {
-    MergeOperator::MergeOperationInputV3::ExistingValue existing_value;
+                               std::string* result, Slice* result_operand,
+                               ValueType* result_type,
+                               MergeOperator::OpFailureScope* op_failure_scope);

-    return TimedFullMergeImpl(
-        merge_operator, key, std::move(existing_value), operands, logger,
-        statistics, clock, update_num_ops_stats, op_failure_scope, results...);
-  }
-
-  template <typename... ResultTs>
  static Status TimedFullMerge(
      const MergeOperator* merge_operator, const Slice& key, PlainBaseValueTag,
      const Slice& value, const std::vector<Slice>& operands, Logger* logger,
      Statistics* statistics, SystemClock* clock, bool update_num_ops_stats,
-      MergeOperator::OpFailureScope* op_failure_scope, ResultTs... results) {
-    MergeOperator::MergeOperationInputV3::ExistingValue existing_value(value);
+      std::string* result, Slice* result_operand, ValueType* result_type,
+      MergeOperator::OpFailureScope* op_failure_scope);

-    return TimedFullMergeImpl(
-        merge_operator, key, std::move(existing_value), operands, logger,
-        statistics, clock, update_num_ops_stats, op_failure_scope, results...);
-  }
-
-  template <typename... ResultTs>
  static Status TimedFullMerge(
      const MergeOperator* merge_operator, const Slice& key, WideBaseValueTag,
      const Slice& entity, const std::vector<Slice>& operands, Logger* logger,
      Statistics* statistics, SystemClock* clock, bool update_num_ops_stats,
-      MergeOperator::OpFailureScope* op_failure_scope, ResultTs... results) {
-    MergeOperator::MergeOperationInputV3::ExistingValue existing_value;
+      std::string* result, Slice* result_operand, ValueType* result_type,
+      MergeOperator::OpFailureScope* op_failure_scope);

-    Slice entity_copy(entity);
-    WideColumns existing_columns;
+  static Status TimedFullMerge(
+      const MergeOperator* merge_operator, const Slice& key, WideBaseValueTag,
+      const WideColumns& columns, const std::vector<Slice>& operands,
+      Logger* logger, Statistics* statistics, SystemClock* clock,
+      bool update_num_ops_stats, std::string* result, Slice* result_operand,
+      ValueType* result_type, MergeOperator::OpFailureScope* op_failure_scope);

-    const Status s =
-        WideColumnSerialization::Deserialize(entity_copy, existing_columns);
-    if (!s.ok()) {
-      return s;
-    }
+  // Variants that expose the merge result translated to the form requested by
+  // the client. (For example, if the result is a wide-column structure but the
+  // client requested the results in plain-value form, the value of the default
+  // column is returned.) Used by point lookups.
+  static Status TimedFullMerge(const MergeOperator* merge_operator,
+                               const Slice& key, NoBaseValueTag,
+                               const std::vector<Slice>& operands,
+                               Logger* logger, Statistics* statistics,
+                               SystemClock* clock, bool update_num_ops_stats,
+                               std::string* result_value,
+                               PinnableWideColumns* result_entity,
+                               MergeOperator::OpFailureScope* op_failure_scope);

-    existing_value = std::move(existing_columns);
+  static Status TimedFullMerge(
+      const MergeOperator* merge_operator, const Slice& key, PlainBaseValueTag,
+      const Slice& value, const std::vector<Slice>& operands, Logger* logger,
+      Statistics* statistics, SystemClock* clock, bool update_num_ops_stats,
+      std::string* result_value, PinnableWideColumns* result_entity,
+      MergeOperator::OpFailureScope* op_failure_scope);

-    return TimedFullMergeImpl(
-        merge_operator, key, std::move(existing_value), operands, logger,
-        statistics, clock, update_num_ops_stats, op_failure_scope, results...);
-  }
+  static Status TimedFullMerge(
+      const MergeOperator* merge_operator, const Slice& key, WideBaseValueTag,
+      const Slice& entity, const std::vector<Slice>& operands, Logger* logger,
+      Statistics* statistics, SystemClock* clock, bool update_num_ops_stats,
+      std::string* result_value, PinnableWideColumns* result_entity,
+      MergeOperator::OpFailureScope* op_failure_scope);

-  template <typename... ResultTs>
  static Status TimedFullMerge(const MergeOperator* merge_operator,
                               const Slice& key, WideBaseValueTag,
                               const WideColumns& columns,
                               const std::vector<Slice>& operands,
                               Logger* logger, Statistics* statistics,
                               SystemClock* clock, bool update_num_ops_stats,
-                               MergeOperator::OpFailureScope* op_failure_scope,
-                               ResultTs... results) {
-    MergeOperator::MergeOperationInputV3::ExistingValue existing_value(columns);
-
-    return TimedFullMergeImpl(
-        merge_operator, key, std::move(existing_value), operands, logger,
-        statistics, clock, update_num_ops_stats, op_failure_scope, results...);
-  }
+                               std::string* result_value,
+                               PinnableWideColumns* result_entity,
+                               MergeOperator::OpFailureScope* op_failure_scope);

  // During compaction, merge entries until we hit
  //     - a corrupted key
@@ -271,27 +271,21 @@ class MergeHelper {
      Statistics* statistics, SystemClock* clock, bool update_num_ops_stats,
      MergeOperator::OpFailureScope* op_failure_scope, Visitor&& visitor);

-  // Variant that exposes the merge result directly (in serialized form for wide
-  // columns) as well as its value type. Used by iterator and compaction.
  static Status TimedFullMergeImpl(
      const MergeOperator* merge_operator, const Slice& key,
      MergeOperator::MergeOperationInputV3::ExistingValue&& existing_value,
      const std::vector<Slice>& operands, Logger* logger,
      Statistics* statistics, SystemClock* clock, bool update_num_ops_stats,
-      MergeOperator::OpFailureScope* op_failure_scope, std::string* result,
-      Slice* result_operand, ValueType* result_type);
+      std::string* result, Slice* result_operand, ValueType* result_type,
+      MergeOperator::OpFailureScope* op_failure_scope);

-  // Variant that exposes the merge result translated into the form requested by
-  // the client. (For example, if the result is a wide-column structure but the
-  // client requested the results in plain-value form, the value of the default
-  // column is returned.) Used by point lookups.
  static Status TimedFullMergeImpl(
      const MergeOperator* merge_operator, const Slice& key,
      MergeOperator::MergeOperationInputV3::ExistingValue&& existing_value,
      const std::vector<Slice>& operands, Logger* logger,
      Statistics* statistics, SystemClock* clock, bool update_num_ops_stats,
-      MergeOperator::OpFailureScope* op_failure_scope,
-      std::string* result_value, PinnableWideColumns* result_entity);
+      std::string* result_value, PinnableWideColumns* result_entity,
+      MergeOperator::OpFailureScope* op_failure_scope);
 };

 // MergeOutputIterator can be used to iterate over the result of a merge.
@@ -3,7 +3,8 @@
 //  COPYING file in the root directory) and Apache 2.0 License
 //  (found in the LICENSE.Apache file in the root directory).
 //
-#include <cassert>
+#include <assert.h>
+
 #include <iostream>
 #include <memory>

@@ -86,9 +87,7 @@ class EnvMergeTest : public EnvWrapper {
  static std::unique_ptr<EnvMergeTest> singleton_;

  static EnvMergeTest* GetInstance() {
-    if (nullptr == singleton_) {
-      singleton_.reset(new EnvMergeTest);
-    }
+    if (nullptr == singleton_) singleton_.reset(new EnvMergeTest);
    return singleton_.get();
  }
 };
@@ -146,7 +145,7 @@ class Counters {
    assert(db_);
  }

-  virtual ~Counters() = default;
+  virtual ~Counters() {}

  // public interface of Counters.
  // All four functions return false
@@ -195,7 +194,7 @@ class Counters {
        std::cerr << "value corruption\n";
        return false;
      }
-      *value = DecodeFixed64(str.data());
+      *value = DecodeFixed64(&str[0]);
      return true;
    } else {
      std::cerr << s.ToString() << std::endl;
@@ -221,18 +220,14 @@ class Counters {
    uint64_t value = default_;
    int result = get(key, &value);
    assert(result);
-    if (result == 0) {
-      exit(1);  // Disable unused variable warning.
-    }
+    if (result == 0) exit(1);  // Disable unused variable warning.
    return value;
  }

  void assert_add(const std::string& key, uint64_t value) {
    int result = add(key, value);
    assert(result);
-    if (result == 0) {
-      exit(1);  // Disable unused variable warning.
-    }
+    if (result == 0) exit(1);  // Disable unused variable warning.
  }
 };

@@ -501,7 +496,7 @@ void testSingleBatchSuccessiveMerge(DB* db, size_t max_num_merges,
  std::string get_value_str;
  ASSERT_OK(db->Get(ReadOptions(), key, &get_value_str));
  assert(get_value_str.size() == sizeof(uint64_t));
-  uint64_t get_value = DecodeFixed64(get_value_str.data());
+  uint64_t get_value = DecodeFixed64(&get_value_str[0]);
  ASSERT_EQ(get_value, num_merges * merge_value);
  ASSERT_EQ(num_merge_operator_calls,
            static_cast<size_t>((num_merges % (max_num_merges + 1))));
@@ -7,8 +7,10 @@
 // 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 <stdlib.h>
+
 #include <algorithm>
-#include <cstdlib>
 #include <map>
 #include <string>
 #include <vector>
@@ -66,7 +68,7 @@ class ObsoleteFilesTest : public DBTestBase {
    int log_cnt = 0;
    int sst_cnt = 0;
    int manifest_cnt = 0;
-    for (const auto& file : filenames) {
+    for (auto file : filenames) {
      uint64_t number;
      FileType type;
      if (ParseFileName(file, &number, &type)) {
@@ -163,7 +165,7 @@ TEST_F(ObsoleteFilesTest, DeleteObsoleteOptionsFile) {
                                     {{"paranoid_file_checks", "true"}}));
    }
  }
-  ASSERT_OK(dbfull()->EnableFileDeletions(/*force=*/false));
+  ASSERT_OK(dbfull()->EnableFileDeletions(true /* force */));

  Close();

@@ -28,7 +28,7 @@ void UpdateOptionsFiles(DB* db,
  uint64_t number;
  FileType type;
  *options_files_count = 0;
-  for (const auto& filename : filenames) {
+  for (auto filename : filenames) {
    if (ParseFileName(filename, &number, &type) && type == kOptionsFile) {
      filename_history->insert(filename);
      (*options_files_count)++;
@@ -44,16 +44,16 @@ void VerifyOptionsFileName(
  EXPECT_OK(db->GetEnv()->GetChildren(db->GetName(), &filenames));
  uint64_t number;
  FileType type;
-  for (const auto& filename : filenames) {
+  for (auto filename : filenames) {
    if (ParseFileName(filename, &number, &type) && type == kOptionsFile) {
      current_filenames.insert(filename);
    }
  }
-  for (const auto& past_filename : past_filenames) {
+  for (auto past_filename : past_filenames) {
    if (current_filenames.find(past_filename) != current_filenames.end()) {
      continue;
    }
-    for (const auto& filename : current_filenames) {
+    for (auto filename : current_filenames) {
      ASSERT_GT(filename, past_filename);
    }
  }
@@ -1050,7 +1050,7 @@ TEST_F(PerfContextTest, MergeOperandCount) {
        std::vector<Status> statuses(num_keys);

        db->MultiGet(ReadOptions(), db->DefaultColumnFamily(), num_keys,
-                     key_slices.data(), results.data(), statuses.data());
+                     &key_slices[0], &results[0], &statuses[0]);

        for (size_t i = 0; i < num_keys; ++i) {
          ASSERT_OK(statuses[i]);
@@ -1068,7 +1068,7 @@ TEST_F(PerfContextTest, MergeOperandCount) {
        std::vector<Status> statuses(num_keys);

        db->MultiGetEntity(ReadOptions(), db->DefaultColumnFamily(), num_keys,
-                           key_slices.data(), results.data(), statuses.data());
+                           &key_slices[0], &results[0], &statuses[0]);

        for (size_t i = 0; i < num_keys; ++i) {
          ASSERT_OK(statuses[i]);
@@ -94,7 +94,7 @@ Status PeriodicTaskScheduler::Unregister(PeriodicTaskType task_type) {
 }

 Timer* PeriodicTaskScheduler::Default() {
-  STATIC_AVOID_DESTRUCTION(Timer, timer)(SystemClock::Default().get());
+  static Timer timer(SystemClock::Default().get());
  return &timer;
 }

@@ -108,3 +108,4 @@ void PeriodicTaskScheduler::TEST_OverrideTimer(SystemClock* clock) {
 #endif  // NDEBUG

 }  // namespace ROCKSDB_NAMESPACE
+
@@ -292,7 +292,7 @@ class TestPlainTableReader : public PlainTableReader {
    table_properties_ = std::move(props);
  }

-  ~TestPlainTableReader() override = default;
+  ~TestPlainTableReader() override {}

 private:
  bool MatchBloom(uint32_t hash) const override {
@@ -89,12 +89,8 @@ class TestKeyComparator : public Comparator {
    const TestKey* key_a = &kkey_a;
    const TestKey* key_b = &kkey_b;
    if (key_a->prefix != key_b->prefix) {
-      if (key_a->prefix < key_b->prefix) {
-        return -1;
-      }
-      if (key_a->prefix > key_b->prefix) {
-        return 1;
-      }
+      if (key_a->prefix < key_b->prefix) return -1;
+      if (key_a->prefix > key_b->prefix) return 1;
    } else {
      EXPECT_TRUE(key_a->prefix == key_b->prefix);
      // note, both a and b could be prefix only
@@ -103,12 +99,8 @@ class TestKeyComparator : public Comparator {
        EXPECT_TRUE(
            (a.size() == sizeof(uint64_t) && b.size() == sizeof(TestKey)) ||
            (b.size() == sizeof(uint64_t) && a.size() == sizeof(TestKey)));
-        if (a.size() < b.size()) {
-          return -1;
-        }
-        if (a.size() > b.size()) {
-          return 1;
-        }
+        if (a.size() < b.size()) return -1;
+        if (a.size() > b.size()) return 1;
      } else {
        // both a and b are prefix
        if (a.size() == sizeof(uint64_t)) {
@@ -117,15 +109,9 @@ class TestKeyComparator : public Comparator {

        // both a and b are whole key
        EXPECT_TRUE(a.size() == sizeof(TestKey) && b.size() == sizeof(TestKey));
-        if (key_a->sorted < key_b->sorted) {
-          return -1;
-        }
-        if (key_a->sorted > key_b->sorted) {
-          return 1;
-        }
-        if (key_a->sorted == key_b->sorted) {
-          return 0;
-        }
+        if (key_a->sorted < key_b->sorted) return -1;
+        if (key_a->sorted > key_b->sorted) return 1;
+        if (key_a->sorted == key_b->sorted) return 0;
      }
    }
    return 0;
@@ -906,3 +892,4 @@ int main(int argc, char** argv) {
 }

 #endif  // GFLAGS
+
@@ -8,6 +8,7 @@
 #include "db/compaction/compaction_iteration_stats.h"
 #include "db/dbformat.h"
 #include "db/pinned_iterators_manager.h"
+#include "db/range_del_aggregator.h"
 #include "db/range_tombstone_fragmenter.h"
 #include "db/version_edit.h"
 #include "rocksdb/comparator.h"
@@ -122,8 +122,7 @@ class Repairer {
        vset_(dbname_, &immutable_db_options_, file_options_,
              raw_table_cache_.get(), &wb_, &wc_,
              /*block_cache_tracer=*/nullptr, /*io_tracer=*/nullptr,
-              /*db_id=*/"", db_session_id_, db_options.daily_offpeak_time_utc,
-              /*error_handler=*/nullptr),
+              /*db_id=*/"", db_session_id_),
        next_file_number_(1),
        db_lock_(nullptr),
        closed_(false) {
@@ -695,8 +694,7 @@ class Repairer {
          cfd->NumberLevels(), cfd->ioptions()->compaction_style,
          nullptr /* src_vstorage */, cfd->ioptions()->force_consistency_checks,
          EpochNumberRequirement::kMightMissing, cfd->ioptions()->clock,
-          /*bottommost_file_compaction_delay=*/0,
-          cfd->current()->version_set()->offpeak_time_option());
+          /*bottommost_file_compaction_delay=*/0);
      Status s;
      VersionEdit dummy_edit;
      for (const auto* table : cf_id_and_tables.second) {
@@ -378,7 +378,8 @@ TEST_P(RepairTestWithTimestamp, UnflushedSst) {

  ColumnFamilyOptions cf_options(options);
  std::vector<ColumnFamilyDescriptor> column_families;
-  column_families.emplace_back(kDefaultColumnFamilyName, cf_options);
+  column_families.push_back(
+      ColumnFamilyDescriptor(kDefaultColumnFamilyName, cf_options));

  ASSERT_OK(DB::Open(options, dbname_, column_families, &handles_, &db_));

@@ -85,7 +85,7 @@ TableCache::TableCache(const ImmutableOptions& ioptions,
  }
 }

-TableCache::~TableCache() = default;
+TableCache::~TableCache() {}

 Status TableCache::GetTableReader(
    const ReadOptions& ro, const FileOptions& file_options,
@@ -98,13 +98,8 @@ class UserKeyTablePropertiesCollectorFactory
    TablePropertiesCollectorFactory::Context context;
    context.column_family_id = column_family_id;
    context.level_at_creation = level_at_creation;
-    TablePropertiesCollector* collector =
-        user_collector_factory_->CreateTablePropertiesCollector(context);
-    if (collector) {
-      return new UserKeyTablePropertiesCollector(collector);
-    } else {
-      return nullptr;
-    }
+    return new UserKeyTablePropertiesCollector(
+        user_collector_factory_->CreateTablePropertiesCollector(context));
  }

  virtual const char* Name() const override {
@@ -180,6 +180,7 @@ class RegularKeysStartWithAInternal : public IntTblPropCollector {
                uint64_t /* block_compressed_bytes_fast */,
                uint64_t /* block_compressed_bytes_slow */) override {
    // Nothing to do.
+    return;
  }

  UserCollectedProperties GetReadableProperties() const override {
@@ -226,7 +227,7 @@ class FlushBlockEveryThreePolicy : public FlushBlockPolicy {

 class FlushBlockEveryThreePolicyFactory : public FlushBlockPolicyFactory {
 public:
-  explicit FlushBlockEveryThreePolicyFactory() = default;
+  explicit FlushBlockEveryThreePolicyFactory() {}

  const char* Name() const override {
    return "FlushBlockEveryThreePolicyFactory";
@@ -38,8 +38,7 @@ class VersionBuilderTest : public testing::Test {
        mutable_cf_options_(options_),
        vstorage_(&icmp_, ucmp_, options_.num_levels, kCompactionStyleLevel,
                  nullptr, false, EpochNumberRequirement::kMustPresent,
-                  ioptions_.clock, options_.bottommost_file_compaction_delay,
-                  OffpeakTimeOption(options_.daily_offpeak_time_utc)),
+                  ioptions_.clock, options_.bottommost_file_compaction_delay),
        file_num_(1) {
    mutable_cf_options_.RefreshDerivedOptions(ioptions_);
    size_being_compacted_.resize(options_.num_levels);
@@ -203,8 +202,7 @@ TEST_F(VersionBuilderTest, ApplyAndSaveTo) {

  VersionStorageInfo new_vstorage(
      &icmp_, ucmp_, options_.num_levels, kCompactionStyleLevel, nullptr, false,
-      EpochNumberRequirement::kMightMissing, nullptr, 0,
-      OffpeakTimeOption(options_.daily_offpeak_time_utc));
+      EpochNumberRequirement::kMightMissing, nullptr, 0);
  ASSERT_OK(version_builder.Apply(&version_edit));
  ASSERT_OK(version_builder.SaveTo(&new_vstorage));

@@ -255,8 +253,7 @@ TEST_F(VersionBuilderTest, ApplyAndSaveToDynamic) {

  VersionStorageInfo new_vstorage(
      &icmp_, ucmp_, options_.num_levels, kCompactionStyleLevel, nullptr, false,
-      EpochNumberRequirement::kMightMissing, nullptr, 0,
-      OffpeakTimeOption(options_.daily_offpeak_time_utc));
+      EpochNumberRequirement::kMightMissing, nullptr, 0);
  ASSERT_OK(version_builder.Apply(&version_edit));
  ASSERT_OK(version_builder.SaveTo(&new_vstorage));

@@ -311,8 +308,7 @@ TEST_F(VersionBuilderTest, ApplyAndSaveToDynamic2) {

  VersionStorageInfo new_vstorage(
      &icmp_, ucmp_, options_.num_levels, kCompactionStyleLevel, nullptr, false,
-      EpochNumberRequirement::kMightMissing, nullptr, 0,
-      OffpeakTimeOption(options_.daily_offpeak_time_utc));
+      EpochNumberRequirement::kMightMissing, nullptr, 0);
  ASSERT_OK(version_builder.Apply(&version_edit));
  ASSERT_OK(version_builder.SaveTo(&new_vstorage));

@@ -369,8 +365,7 @@ TEST_F(VersionBuilderTest, ApplyMultipleAndSaveTo) {

  VersionStorageInfo new_vstorage(
      &icmp_, ucmp_, options_.num_levels, kCompactionStyleLevel, nullptr, false,
-      EpochNumberRequirement::kMightMissing, nullptr, 0,
-      OffpeakTimeOption(options_.daily_offpeak_time_utc));
+      EpochNumberRequirement::kMightMissing, nullptr, 0);
  ASSERT_OK(version_builder.Apply(&version_edit));
  ASSERT_OK(version_builder.SaveTo(&new_vstorage));

@@ -393,8 +388,7 @@ TEST_F(VersionBuilderTest, ApplyDeleteAndSaveTo) {

  VersionStorageInfo new_vstorage(
      &icmp_, ucmp_, options_.num_levels, kCompactionStyleLevel, nullptr, false,
-      EpochNumberRequirement::kMightMissing, nullptr, 0,
-      OffpeakTimeOption(options_.daily_offpeak_time_utc));
+      EpochNumberRequirement::kMightMissing, nullptr, 0);

  VersionEdit version_edit;
  version_edit.AddFile(
@@ -563,7 +557,7 @@ TEST_F(VersionBuilderTest, ApplyFileDeletionAndAddition) {
  VersionStorageInfo new_vstorage(
      &icmp_, ucmp_, options_.num_levels, kCompactionStyleLevel, &vstorage_,
      force_consistency_checks, EpochNumberRequirement::kMightMissing, nullptr,
-      0, OffpeakTimeOption(options_.daily_offpeak_time_utc));
+      0);

  ASSERT_OK(builder.SaveTo(&new_vstorage));

@@ -708,7 +702,7 @@ TEST_F(VersionBuilderTest, ApplyFileAdditionAndDeletion) {
  VersionStorageInfo new_vstorage(
      &icmp_, ucmp_, options_.num_levels, kCompactionStyleLevel, &vstorage_,
      force_consistency_checks, EpochNumberRequirement::kMightMissing, nullptr,
-      0, OffpeakTimeOption(options_.daily_offpeak_time_utc));
+      0);

  ASSERT_OK(builder.SaveTo(&new_vstorage));

@@ -753,7 +747,7 @@ TEST_F(VersionBuilderTest, ApplyBlobFileAddition) {
  VersionStorageInfo new_vstorage(
      &icmp_, ucmp_, options_.num_levels, kCompactionStyleLevel, &vstorage_,
      force_consistency_checks, EpochNumberRequirement::kMightMissing, nullptr,
-      0, OffpeakTimeOption(options_.daily_offpeak_time_utc));
+      0);

  ASSERT_OK(builder.SaveTo(&new_vstorage));

@@ -893,7 +887,7 @@ TEST_F(VersionBuilderTest, ApplyBlobFileGarbageFileInBase) {
  VersionStorageInfo new_vstorage(
      &icmp_, ucmp_, options_.num_levels, kCompactionStyleLevel, &vstorage_,
      force_consistency_checks, EpochNumberRequirement::kMightMissing, nullptr,
-      0, OffpeakTimeOption(options_.daily_offpeak_time_utc));
+      0);

  ASSERT_OK(builder.SaveTo(&new_vstorage));

@@ -967,7 +961,7 @@ TEST_F(VersionBuilderTest, ApplyBlobFileGarbageFileAdditionApplied) {
  VersionStorageInfo new_vstorage(
      &icmp_, ucmp_, options_.num_levels, kCompactionStyleLevel, &vstorage_,
      force_consistency_checks, EpochNumberRequirement::kMightMissing, nullptr,
-      0, OffpeakTimeOption(options_.daily_offpeak_time_utc));
+      0);

  ASSERT_OK(builder.SaveTo(&new_vstorage));

@@ -1148,7 +1142,7 @@ TEST_F(VersionBuilderTest, SaveBlobFilesTo) {
  VersionStorageInfo new_vstorage(
      &icmp_, ucmp_, options_.num_levels, kCompactionStyleLevel, &vstorage_,
      force_consistency_checks, EpochNumberRequirement::kMightMissing, nullptr,
-      0, OffpeakTimeOption(options_.daily_offpeak_time_utc));
+      0);

  ASSERT_OK(builder.SaveTo(&new_vstorage));

@@ -1197,7 +1191,7 @@ TEST_F(VersionBuilderTest, SaveBlobFilesTo) {
  VersionStorageInfo newer_vstorage(
      &icmp_, ucmp_, options_.num_levels, kCompactionStyleLevel, &new_vstorage,
      force_consistency_checks, EpochNumberRequirement::kMightMissing, nullptr,
-      0, OffpeakTimeOption(options_.daily_offpeak_time_utc));
+      0);

  ASSERT_OK(second_builder.SaveTo(&newer_vstorage));

@@ -1284,7 +1278,7 @@ TEST_F(VersionBuilderTest, SaveBlobFilesToConcurrentJobs) {
  VersionStorageInfo new_vstorage(
      &icmp_, ucmp_, options_.num_levels, kCompactionStyleLevel, &vstorage_,
      force_consistency_checks, EpochNumberRequirement::kMightMissing, nullptr,
-      0, OffpeakTimeOption(options_.daily_offpeak_time_utc));
+      0);

  ASSERT_OK(builder.SaveTo(&new_vstorage));

@@ -1388,7 +1382,7 @@ TEST_F(VersionBuilderTest, CheckConsistencyForBlobFiles) {
  VersionStorageInfo new_vstorage(
      &icmp_, ucmp_, options_.num_levels, kCompactionStyleLevel, &vstorage_,
      force_consistency_checks, EpochNumberRequirement::kMightMissing, nullptr,
-      0, OffpeakTimeOption(options_.daily_offpeak_time_utc));
+      0);

  ASSERT_OK(builder.SaveTo(&new_vstorage));

@@ -1428,7 +1422,7 @@ TEST_F(VersionBuilderTest, CheckConsistencyForBlobFilesInconsistentLinks) {
  VersionStorageInfo new_vstorage(
      &icmp_, ucmp_, options_.num_levels, kCompactionStyleLevel, &vstorage_,
      force_consistency_checks, EpochNumberRequirement::kMightMissing, nullptr,
-      0, OffpeakTimeOption(options_.daily_offpeak_time_utc));
+      0);

  const Status s = builder.SaveTo(&new_vstorage);
  ASSERT_TRUE(s.IsCorruption());
@@ -1470,7 +1464,7 @@ TEST_F(VersionBuilderTest, CheckConsistencyForBlobFilesAllGarbage) {
  VersionStorageInfo new_vstorage(
      &icmp_, ucmp_, options_.num_levels, kCompactionStyleLevel, &vstorage_,
      force_consistency_checks, EpochNumberRequirement::kMightMissing, nullptr,
-      0, OffpeakTimeOption(options_.daily_offpeak_time_utc));
+      0);

  const Status s = builder.SaveTo(&new_vstorage);
  ASSERT_TRUE(s.IsCorruption());
@@ -1520,7 +1514,7 @@ TEST_F(VersionBuilderTest, CheckConsistencyForBlobFilesAllGarbageLinkedSsts) {
  VersionStorageInfo new_vstorage(
      &icmp_, ucmp_, options_.num_levels, kCompactionStyleLevel, &vstorage_,
      force_consistency_checks, EpochNumberRequirement::kMightMissing, nullptr,
-      0, OffpeakTimeOption(options_.daily_offpeak_time_utc));
+      0);

  const Status s = builder.SaveTo(&new_vstorage);
  ASSERT_TRUE(s.IsCorruption());
@@ -1684,7 +1678,7 @@ TEST_F(VersionBuilderTest, MaintainLinkedSstsForBlobFiles) {
  VersionStorageInfo new_vstorage(
      &icmp_, ucmp_, options_.num_levels, kCompactionStyleLevel, &vstorage_,
      force_consistency_checks, EpochNumberRequirement::kMightMissing, nullptr,
-      0, OffpeakTimeOption(options_.daily_offpeak_time_utc));
+      0);

  ASSERT_OK(builder.SaveTo(&new_vstorage));

@@ -1736,8 +1730,7 @@ TEST_F(VersionBuilderTest, CheckConsistencyForFileDeletedTwice) {
  VersionStorageInfo new_vstorage(
      &icmp_, ucmp_, options_.num_levels, kCompactionStyleLevel, nullptr,
      true /* force_consistency_checks */,
-      EpochNumberRequirement::kMightMissing, nullptr, 0,
-      OffpeakTimeOption(options_.daily_offpeak_time_utc));
+      EpochNumberRequirement::kMightMissing, nullptr, 0);
  ASSERT_OK(version_builder.Apply(&version_edit));
  ASSERT_OK(version_builder.SaveTo(&new_vstorage));

@@ -1748,8 +1741,7 @@ TEST_F(VersionBuilderTest, CheckConsistencyForFileDeletedTwice) {
  VersionStorageInfo new_vstorage2(
      &icmp_, ucmp_, options_.num_levels, kCompactionStyleLevel, nullptr,
      true /* force_consistency_checks */,
-      EpochNumberRequirement::kMightMissing, nullptr, 0,
-      OffpeakTimeOption(options_.daily_offpeak_time_utc));
+      EpochNumberRequirement::kMightMissing, nullptr, 0);
  ASSERT_NOK(version_builder2.Apply(&version_edit));

  UnrefFilesInVersion(&new_vstorage);
@@ -1788,8 +1780,7 @@ TEST_F(VersionBuilderTest, CheckConsistencyForL0FilesSortedByEpochNumber) {
  VersionStorageInfo new_vstorage_1(
      &icmp_, ucmp_, options_.num_levels, kCompactionStyleLevel,
      nullptr /* src_vstorage */, true /* force_consistency_checks */,
-      EpochNumberRequirement::kMightMissing, nullptr, 0,
-      OffpeakTimeOption(options_.daily_offpeak_time_utc));
+      EpochNumberRequirement::kMightMissing, nullptr, 0);

  ASSERT_OK(version_builder_1.Apply(&version_edit_1));
  s = version_builder_1.SaveTo(&new_vstorage_1);
@@ -1827,8 +1818,7 @@ TEST_F(VersionBuilderTest, CheckConsistencyForL0FilesSortedByEpochNumber) {
  VersionStorageInfo new_vstorage_2(
      &icmp_, ucmp_, options_.num_levels, kCompactionStyleLevel,
      nullptr /* src_vstorage */, true /* force_consistency_checks */,
-      EpochNumberRequirement::kMightMissing, nullptr, 0,
-      OffpeakTimeOption(options_.daily_offpeak_time_utc));
+      EpochNumberRequirement::kMightMissing, nullptr, 0);

  ASSERT_OK(version_builder_2.Apply(&version_edit_2));
  s = version_builder_2.SaveTo(&new_vstorage_2);
@@ -484,6 +484,7 @@ void VersionEdit::EncodeFileBoundaries(std::string* dst,
  StripTimestampFromInternalKey(&largest_buf, meta.largest.Encode(), ts_sz);
  PutLengthPrefixedSlice(dst, smallest_buf);
  PutLengthPrefixedSlice(dst, largest_buf);
+  return;
 };

 Status VersionEdit::DecodeFrom(const Slice& src) {
@@ -492,7 +492,6 @@ class VersionEdit {
                     file_checksum_func_name, unique_id,
                     compensated_range_deletion_size, tail_size,
                     user_defined_timestamps_persisted));
-    files_to_quarantine_.push_back(file);
    if (!HasLastSequence() || largest_seqno > GetLastSequence()) {
      SetLastSequence(largest_seqno);
    }
@@ -501,7 +500,6 @@ class VersionEdit {
  void AddFile(int level, const FileMetaData& f) {
    assert(f.fd.smallest_seqno <= f.fd.largest_seqno);
    new_files_.emplace_back(level, f);
-    files_to_quarantine_.push_back(f.fd.GetNumber());
    if (!HasLastSequence() || f.fd.largest_seqno > GetLastSequence()) {
      SetLastSequence(f.fd.largest_seqno);
    }
@@ -538,13 +536,10 @@ class VersionEdit {
    blob_file_additions_.emplace_back(
        blob_file_number, total_blob_count, total_blob_bytes,
        std::move(checksum_method), std::move(checksum_value));
-    files_to_quarantine_.push_back(blob_file_number);
  }

  void AddBlobFile(BlobFileAddition blob_file_addition) {
    blob_file_additions_.emplace_back(std::move(blob_file_addition));
-    files_to_quarantine_.push_back(
-        blob_file_additions_.back().GetBlobFileNumber());
  }

  // Retrieve all the blob files added.
@@ -556,11 +551,6 @@ class VersionEdit {
  void SetBlobFileAdditions(BlobFileAdditions blob_file_additions) {
    assert(blob_file_additions_.empty());
    blob_file_additions_ = std::move(blob_file_additions);
-    std::for_each(
-        blob_file_additions_.begin(), blob_file_additions_.end(),
-        [&](const BlobFileAddition& blob_file) {
-          files_to_quarantine_.push_back(blob_file.GetBlobFileNumber());
-        });
  }

  // Add garbage for an existing blob file.  Note: intentionally broken English
@@ -628,8 +618,6 @@ class VersionEdit {
  }
  uint32_t GetColumnFamily() const { return column_family_; }

-  const std::string& GetColumnFamilyName() const { return column_family_name_; }
-
  // set column family ID by calling SetColumnFamily()
  void AddColumnFamily(const std::string& name) {
    assert(!is_column_family_drop_);
@@ -660,9 +648,6 @@ class VersionEdit {
    remaining_entries_ = remaining_entries;
  }
  bool IsInAtomicGroup() const { return is_in_atomic_group_; }
-  void SetRemainingEntries(uint32_t remaining_entries) {
-    remaining_entries_ = remaining_entries;
-  }
  uint32_t GetRemainingEntries() const { return remaining_entries_; }

  bool HasFullHistoryTsLow() const { return !full_history_ts_low_.empty(); }
@@ -689,14 +674,20 @@ class VersionEdit {
                std::optional<size_t> ts_sz = std::nullopt) const;
  Status DecodeFrom(const Slice& src);

-  const autovector<uint64_t>* GetFilesToQuarantineIfCommitFail() const {
-    return &files_to_quarantine_;
-  }
-
  std::string DebugString(bool hex_key = false) const;
  std::string DebugJSON(int edit_num, bool hex_key = false) const;

 private:
+  friend class ReactiveVersionSet;
+  friend class VersionEditHandlerBase;
+  friend class ListColumnFamiliesHandler;
+  friend class VersionEditHandler;
+  friend class VersionEditHandlerPointInTime;
+  friend class DumpManifestHandler;
+  friend class VersionSet;
+  friend class Version;
+  friend class AtomicGroupReadBuffer;
+
  bool GetLevel(Slice* input, int* level, const char** msg);

  const char* DecodeNewFile4From(Slice* input);
@@ -754,16 +745,6 @@ class VersionEdit {

  std::string full_history_ts_low_;
  bool persist_user_defined_timestamps_ = true;
-
-  // Newly created table files and blob files are eligible for deletion if they
-  // are not registered as live files after the background jobs creating them
-  // have finished. In case committing the VersionEdit containing such changes
-  // to manifest encountered an error, we want to quarantine these files from
-  // deletion to avoid prematurely deleting files that ended up getting recorded
-  // in Manifest as live files.
-  // Since table files and blob files share the same file number space, we just
-  // record the file number here.
-  autovector<uint64_t> files_to_quarantine_;
 };

 }  // namespace ROCKSDB_NAMESPACE
@@ -43,7 +43,7 @@ void VersionEditHandlerBase::Iterate(log::Reader& reader,
      break;
    }
    ColumnFamilyData* cfd = nullptr;
-    if (edit.IsInAtomicGroup()) {
+    if (edit.is_in_atomic_group_) {
      if (read_buffer_.IsFull()) {
        for (auto& e : read_buffer_.replay_buffer()) {
          s = ApplyVersionEdit(e, &cfd);
@@ -101,18 +101,20 @@ void VersionEditHandlerBase::Iterate(log::Reader& reader,
 Status ListColumnFamiliesHandler::ApplyVersionEdit(
    VersionEdit& edit, ColumnFamilyData** /*unused*/) {
  Status s;
-  uint32_t cf_id = edit.GetColumnFamily();
-  if (edit.IsColumnFamilyAdd()) {
-    if (column_family_names_.find(cf_id) != column_family_names_.end()) {
+  if (edit.is_column_family_add_) {
+    if (column_family_names_.find(edit.column_family_) !=
+        column_family_names_.end()) {
      s = Status::Corruption("Manifest adding the same column family twice");
    } else {
-      column_family_names_.insert({cf_id, edit.GetColumnFamilyName()});
+      column_family_names_.insert(
+          {edit.column_family_, edit.column_family_name_});
    }
-  } else if (edit.IsColumnFamilyDrop()) {
-    if (column_family_names_.find(cf_id) == column_family_names_.end()) {
+  } else if (edit.is_column_family_drop_) {
+    if (column_family_names_.find(edit.column_family_) ==
+        column_family_names_.end()) {
      s = Status::Corruption("Manifest - dropping non-existing column family");
    } else {
-      column_family_names_.erase(cf_id);
+      column_family_names_.erase(edit.column_family_);
    }
  }
  return s;
@@ -199,9 +201,9 @@ Status VersionEditHandler::Initialize() {
 Status VersionEditHandler::ApplyVersionEdit(VersionEdit& edit,
                                            ColumnFamilyData** cfd) {
  Status s;
-  if (edit.IsColumnFamilyAdd()) {
+  if (edit.is_column_family_add_) {
    s = OnColumnFamilyAdd(edit, cfd);
-  } else if (edit.IsColumnFamilyDrop()) {
+  } else if (edit.is_column_family_drop_) {
    s = OnColumnFamilyDrop(edit, cfd);
  } else if (edit.IsWalAddition()) {
    s = OnWalAddition(edit);
@@ -225,22 +227,22 @@ Status VersionEditHandler::OnColumnFamilyAdd(VersionEdit& edit,

  assert(cfd != nullptr);
  *cfd = nullptr;
-  const std::string& cf_name = edit.GetColumnFamilyName();
  Status s;
  if (cf_in_builders || cf_in_not_found) {
    s = Status::Corruption("MANIFEST adding the same column family twice: " +
-                           cf_name);
+                           edit.column_family_name_);
  }
  if (s.ok()) {
-    auto cf_options = name_to_options_.find(cf_name);
+    auto cf_options = name_to_options_.find(edit.column_family_name_);
    // implicitly add persistent_stats column family without requiring user
    // to specify
    ColumnFamilyData* tmp_cfd = nullptr;
    bool is_persistent_stats_column_family =
-        cf_name.compare(kPersistentStatsColumnFamilyName) == 0;
+        edit.column_family_name_.compare(kPersistentStatsColumnFamilyName) == 0;
    if (cf_options == name_to_options_.end() &&
        !is_persistent_stats_column_family) {
-      column_families_not_found_.emplace(edit.GetColumnFamily(), cf_name);
+      column_families_not_found_.emplace(edit.column_family_,
+                                         edit.column_family_name_);
    } else {
      if (is_persistent_stats_column_family) {
        ColumnFamilyOptions cfo;
@@ -268,7 +270,7 @@ Status VersionEditHandler::OnColumnFamilyDrop(VersionEdit& edit,
  if (cf_in_builders) {
    tmp_cfd = DestroyCfAndCleanup(edit);
  } else if (cf_in_not_found) {
-    column_families_not_found_.erase(edit.GetColumnFamily());
+    column_families_not_found_.erase(edit.column_family_);
  } else {
    s = Status::Corruption("MANIFEST - dropping non-existing column family");
  }
@@ -303,10 +305,10 @@ Status VersionEditHandler::OnNonCfOperation(VersionEdit& edit,
    }
    ColumnFamilyData* tmp_cfd = nullptr;
    if (s.ok()) {
-      auto builder_iter = builders_.find(edit.GetColumnFamily());
+      auto builder_iter = builders_.find(edit.column_family_);
      assert(builder_iter != builders_.end());
      tmp_cfd = version_set_->GetColumnFamilySet()->GetColumnFamily(
-          edit.GetColumnFamily());
+          edit.column_family_);
      assert(tmp_cfd != nullptr);
      // It's important to handle file boundaries before `MaybeCreateVersion`
      // because `VersionEditHandlerPointInTime::MaybeCreateVersion` does
@@ -360,12 +362,11 @@ void VersionEditHandler::CheckColumnFamilyId(const VersionEdit& edit,
  // record. Once we encounter column family drop record,
  // we will delete the column family from
  // column_families_not_found.
-  uint32_t cf_id = edit.GetColumnFamily();
-  bool in_not_found = column_families_not_found_.find(cf_id) !=
+  bool in_not_found = column_families_not_found_.find(edit.column_family_) !=
                      column_families_not_found_.end();
  // in builders means that user supplied that column family
  // option AND that we encountered column family add record
-  bool in_builders = builders_.find(cf_id) != builders_.end();
+  bool in_builders = builders_.find(edit.column_family_) != builders_.end();
  // They cannot both be true
  assert(!(in_not_found && in_builders));
  *cf_in_not_found = in_not_found;
@@ -377,17 +378,17 @@ void VersionEditHandler::CheckIterationResult(const log::Reader& reader,
  assert(s != nullptr);
  if (!s->ok()) {
    // Do nothing here.
-  } else if (!version_edit_params_.HasLogNumber() ||
-             !version_edit_params_.HasNextFile() ||
-             !version_edit_params_.HasLastSequence()) {
+  } else if (!version_edit_params_.has_log_number_ ||
+             !version_edit_params_.has_next_file_number_ ||
+             !version_edit_params_.has_last_sequence_) {
    std::string msg("no ");
-    if (!version_edit_params_.HasLogNumber()) {
+    if (!version_edit_params_.has_log_number_) {
      msg.append("log_file_number, ");
    }
-    if (!version_edit_params_.HasNextFile()) {
+    if (!version_edit_params_.has_next_file_number_) {
      msg.append("next_file_number, ");
    }
-    if (!version_edit_params_.HasLastSequence()) {
+    if (!version_edit_params_.has_last_sequence_) {
      msg.append("last_sequence, ");
    }
    msg = msg.substr(0, msg.size() - 2);
@@ -408,11 +409,11 @@ void VersionEditHandler::CheckIterationResult(const log::Reader& reader,
  }
  if (s->ok()) {
    version_set_->GetColumnFamilySet()->UpdateMaxColumnFamily(
-        version_edit_params_.GetMaxColumnFamily());
+        version_edit_params_.max_column_family_);
    version_set_->MarkMinLogNumberToKeep(
-        version_edit_params_.GetMinLogNumberToKeep());
-    version_set_->MarkFileNumberUsed(version_edit_params_.GetPrevLogNumber());
-    version_set_->MarkFileNumberUsed(version_edit_params_.GetLogNumber());
+        version_edit_params_.min_log_number_to_keep_);
+    version_set_->MarkFileNumberUsed(version_edit_params_.prev_log_number_);
+    version_set_->MarkFileNumberUsed(version_edit_params_.log_number_);
    for (auto* cfd : *(version_set_->GetColumnFamilySet())) {
      if (cfd->IsDropped()) {
        continue;
@@ -463,9 +464,9 @@ void VersionEditHandler::CheckIterationResult(const log::Reader& reader,
  if (s->ok()) {
    version_set_->manifest_file_size_ = reader.GetReadOffset();
    assert(version_set_->manifest_file_size_ > 0);
-    version_set_->next_file_number_.store(version_edit_params_.GetNextFile() +
-                                          1);
-    SequenceNumber last_seq = version_edit_params_.GetLastSequence();
+    version_set_->next_file_number_.store(
+        version_edit_params_.next_file_number_ + 1);
+    SequenceNumber last_seq = version_edit_params_.last_sequence_;
    assert(last_seq != kMaxSequenceNumber);
    if (last_seq != kMaxSequenceNumber &&
        last_seq > version_set_->last_allocated_sequence_.load()) {
@@ -487,46 +488,46 @@ void VersionEditHandler::CheckIterationResult(const log::Reader& reader,
      // sequence number zeroed through compaction.
      version_set_->descriptor_last_sequence_ = last_seq;
    }
-    version_set_->prev_log_number_ = version_edit_params_.GetPrevLogNumber();
+    version_set_->prev_log_number_ = version_edit_params_.prev_log_number_;
  }
 }

 ColumnFamilyData* VersionEditHandler::CreateCfAndInit(
    const ColumnFamilyOptions& cf_options, const VersionEdit& edit) {
-  uint32_t cf_id = edit.GetColumnFamily();
  ColumnFamilyData* cfd =
      version_set_->CreateColumnFamily(cf_options, read_options_, &edit);
  assert(cfd != nullptr);
  cfd->set_initialized();
-  assert(builders_.find(cf_id) == builders_.end());
-  builders_.emplace(cf_id,
+  assert(builders_.find(edit.column_family_) == builders_.end());
+  builders_.emplace(edit.column_family_,
                    VersionBuilderUPtr(new BaseReferencedVersionBuilder(cfd)));
  if (track_missing_files_) {
-    cf_to_missing_files_.emplace(cf_id, std::unordered_set<uint64_t>());
-    cf_to_missing_blob_files_high_.emplace(cf_id, kInvalidBlobFileNumber);
+    cf_to_missing_files_.emplace(edit.column_family_,
+                                 std::unordered_set<uint64_t>());
+    cf_to_missing_blob_files_high_.emplace(edit.column_family_,
+                                           kInvalidBlobFileNumber);
  }
  return cfd;
 }

 ColumnFamilyData* VersionEditHandler::DestroyCfAndCleanup(
    const VersionEdit& edit) {
-  uint32_t cf_id = edit.GetColumnFamily();
-  auto builder_iter = builders_.find(cf_id);
+  auto builder_iter = builders_.find(edit.column_family_);
  assert(builder_iter != builders_.end());
  builders_.erase(builder_iter);
  if (track_missing_files_) {
-    auto missing_files_iter = cf_to_missing_files_.find(cf_id);
+    auto missing_files_iter = cf_to_missing_files_.find(edit.column_family_);
    assert(missing_files_iter != cf_to_missing_files_.end());
    cf_to_missing_files_.erase(missing_files_iter);

    auto missing_blob_files_high_iter =
-        cf_to_missing_blob_files_high_.find(cf_id);
+        cf_to_missing_blob_files_high_.find(edit.column_family_);
    assert(missing_blob_files_high_iter !=
           cf_to_missing_blob_files_high_.end());
    cf_to_missing_blob_files_high_.erase(missing_blob_files_high_iter);
  }
  ColumnFamilyData* ret =
-      version_set_->GetColumnFamilySet()->GetColumnFamily(cf_id);
+      version_set_->GetColumnFamilySet()->GetColumnFamily(edit.column_family_);
  assert(ret != nullptr);
  ret->SetDropped();
  ret->UnrefAndTryDelete();
@@ -597,33 +598,33 @@ Status VersionEditHandler::LoadTables(ColumnFamilyData* cfd,
 Status VersionEditHandler::ExtractInfoFromVersionEdit(ColumnFamilyData* cfd,
                                                      const VersionEdit& edit) {
  Status s;
-  if (edit.HasDbId()) {
+  if (edit.has_db_id_) {
    version_set_->db_id_ = edit.GetDbId();
-    version_edit_params_.SetDBId(edit.GetDbId());
+    version_edit_params_.SetDBId(edit.db_id_);
  }
  if (cfd != nullptr) {
-    if (edit.HasLogNumber()) {
-      if (cfd->GetLogNumber() > edit.GetLogNumber()) {
+    if (edit.has_log_number_) {
+      if (cfd->GetLogNumber() > edit.log_number_) {
        ROCKS_LOG_WARN(
            version_set_->db_options()->info_log,
            "MANIFEST corruption detected, but ignored - Log numbers in "
            "records NOT monotonically increasing");
      } else {
-        cfd->SetLogNumber(edit.GetLogNumber());
-        version_edit_params_.SetLogNumber(edit.GetLogNumber());
+        cfd->SetLogNumber(edit.log_number_);
+        version_edit_params_.SetLogNumber(edit.log_number_);
      }
    }
-    if (edit.HasComparatorName()) {
+    if (edit.has_comparator_) {
      bool mark_sst_files_has_no_udt = false;
      // If `persist_user_defined_timestamps` flag is recorded in manifest, it
      // is guaranteed to be in the same VersionEdit as comparator. Otherwise,
      // it's not recorded and it should have default value true.
      s = ValidateUserDefinedTimestampsOptions(
-          cfd->user_comparator(), edit.GetComparatorName(),
+          cfd->user_comparator(), edit.comparator_,
          cfd->ioptions()->persist_user_defined_timestamps,
-          edit.GetPersistUserDefinedTimestamps(), &mark_sst_files_has_no_udt);
+          edit.persist_user_defined_timestamps_, &mark_sst_files_has_no_udt);
      if (!s.ok() && cf_to_cmp_names_) {
-        cf_to_cmp_names_->emplace(cfd->GetID(), edit.GetComparatorName());
+        cf_to_cmp_names_->emplace(cfd->GetID(), edit.comparator_);
      }
      if (mark_sst_files_has_no_udt) {
        cfds_to_mark_no_udt_.insert(cfd->GetID());
@@ -636,29 +637,29 @@ Status VersionEditHandler::ExtractInfoFromVersionEdit(ColumnFamilyData* cfd,
  }

  if (s.ok()) {
-    if (edit.HasPrevLogNumber()) {
-      version_edit_params_.SetPrevLogNumber(edit.GetPrevLogNumber());
+    if (edit.has_prev_log_number_) {
+      version_edit_params_.SetPrevLogNumber(edit.prev_log_number_);
    }
-    if (edit.HasNextFile()) {
-      version_edit_params_.SetNextFile(edit.GetNextFile());
+    if (edit.has_next_file_number_) {
+      version_edit_params_.SetNextFile(edit.next_file_number_);
    }
-    if (edit.HasMaxColumnFamily()) {
-      version_edit_params_.SetMaxColumnFamily(edit.GetMaxColumnFamily());
+    if (edit.has_max_column_family_) {
+      version_edit_params_.SetMaxColumnFamily(edit.max_column_family_);
    }
-    if (edit.HasMinLogNumberToKeep()) {
-      version_edit_params_.SetMinLogNumberToKeep(
-          std::max(version_edit_params_.GetMinLogNumberToKeep(),
-                   edit.GetMinLogNumberToKeep()));
+    if (edit.has_min_log_number_to_keep_) {
+      version_edit_params_.min_log_number_to_keep_ =
+          std::max(version_edit_params_.min_log_number_to_keep_,
+                   edit.min_log_number_to_keep_);
    }
-    if (edit.HasLastSequence()) {
+    if (edit.has_last_sequence_) {
      // `VersionEdit::last_sequence_`s are assumed to be non-decreasing. This
      // is legacy behavior that cannot change without breaking downgrade
      // compatibility.
-      assert(!version_edit_params_.HasLastSequence() ||
-             version_edit_params_.GetLastSequence() <= edit.GetLastSequence());
-      version_edit_params_.SetLastSequence(edit.GetLastSequence());
+      assert(!version_edit_params_.has_last_sequence_ ||
+             version_edit_params_.last_sequence_ <= edit.last_sequence_);
+      version_edit_params_.SetLastSequence(edit.last_sequence_);
    }
-    if (!version_edit_params_.HasPrevLogNumber()) {
+    if (!version_edit_params_.has_prev_log_number_) {
      version_edit_params_.SetPrevLogNumber(0);
    }
  }
@@ -764,7 +765,7 @@ void VersionEditHandlerPointInTime::CheckIterationResult(
 ColumnFamilyData* VersionEditHandlerPointInTime::DestroyCfAndCleanup(
    const VersionEdit& edit) {
  ColumnFamilyData* cfd = VersionEditHandler::DestroyCfAndCleanup(edit);
-  auto v_iter = versions_.find(edit.GetColumnFamily());
+  auto v_iter = versions_.find(edit.column_family_);
  if (v_iter != versions_.end()) {
    delete v_iter->second;
    versions_.erase(v_iter);
@@ -776,7 +777,7 @@ Status VersionEditHandlerPointInTime::MaybeCreateVersion(
    const VersionEdit& edit, ColumnFamilyData* cfd, bool force_create_version) {
  assert(cfd != nullptr);
  if (!force_create_version) {
-    assert(edit.GetColumnFamily() == cfd->GetID());
+    assert(edit.column_family_ == cfd->GetID());
  }
  auto missing_files_iter = cf_to_missing_files_.find(cfd->GetID());
  assert(missing_files_iter != cf_to_missing_files_.end());
@@ -859,9 +860,9 @@ Status VersionEditHandlerPointInTime::MaybeCreateVersion(
  const bool has_missing_files =
      !missing_files.empty() || has_missing_blob_files;

-  bool missing_info = !version_edit_params_.HasLogNumber() ||
-                      !version_edit_params_.HasNextFile() ||
-                      !version_edit_params_.HasLastSequence();
+  bool missing_info = !version_edit_params_.has_log_number_ ||
+                      !version_edit_params_.has_next_file_number_ ||
+                      !version_edit_params_.has_last_sequence_;

  // Create version before apply edit. The version will represent the state
  // before applying the version edit.
@@ -133,8 +133,8 @@ class VersionEditHandler : public VersionEditHandlerBase {
  bool HasMissingFiles() const;

  void GetDbId(std::string* db_id) const {
-    if (db_id && version_edit_params_.HasDbId()) {
-      *db_id = version_edit_params_.GetDbId();
+    if (db_id && version_edit_params_.has_db_id_) {
+      *db_id = version_edit_params_.db_id_;
    }
  }

@@ -562,9 +562,7 @@ TEST_F(VersionEditTest, AddWalDebug) {
    std::stringstream ss;
    ss << "{\"LogNumber\": " << kLogNumbers[i] << ", "
       << "\"SyncedSizeInBytes\": " << kSizeInBytes[i] << "}";
-    if (i < n - 1) {
-      ss << ", ";
-    }
+    if (i < n - 1) ss << ", ";
    expected_json += ss.str();
  }
  expected_json += "], \"ColumnFamily\": 0}";
Author	SHA1	Message	Date
anand76	986b8b9f20	Update version to 8.8.1	2023-11-17 15:25:29 -08:00
anand76	35b30e4c3d	Make CacheWithSecondaryAdapter reservation accounting more robust (#12059 ) Summary: `CacheWithSecondaryAdapter` can distribute placeholder reservations across the primary and secondary caches. The current implementation of the accounting is quite complicated in order to avoid using a mutex. This may cause the accounting to be slightly off after changes to the cache capacity and ratio, resulting in assertion failures. There's also a bug in the unlikely event that the total reservation exceeds the cache capacity. Furthermore, the current implementation is difficult to reason about. This PR simplifies it by doing the accounting while holding a mutex. The reservations are processed in 1MB chunks in order to avoid taking a lock too frequently. As a side effect, this also removes the restriction of not allowing to increase the compressed secondary cache capacity after decreasing it to 0. Pull Request resolved: https://github.com/facebook/rocksdb/pull/12059 Test Plan: Existing unit tests, and a new test for capacity increase from 0 Reviewed By: pdillinger Differential Revision: D51278686 Pulled By: anand1976 fbshipit-source-id: 7e1ad2c50694772997072dd59cab35c93c12ba4f	2023-11-17 12:55:45 -08:00
Yu Zhang	4d706dc4db	Update HISTORY.md	2023-10-31 22:03:03 -07:00
Yu Zhang	b375f596ec	Rate limiting stale sst files' deletion during recovery (#12016 ) Summary: As titled. If SstFileManager is available, deleting stale sst files will be delegated to it so it can be rate limited. Pull Request resolved: https://github.com/facebook/rocksdb/pull/12016 Reviewed By: hx235 Differential Revision: D50670482 Pulled By: jowlyzhang fbshipit-source-id: bde5b76ea1d98e67f6b4f08bfba3db48e46aab4e	2023-10-31 21:59:19 -07:00
Adam Retter	54bb0183e0	Fix the ZStd checksum (#12005 ) Summary: Somehow we had the wrong checksum when validating the ZStd 1.5.5 download for RocksJava in the previous Pull Request - https://github.com/facebook/rocksdb/pull/9304. This PR fixes that. Pull Request resolved: https://github.com/facebook/rocksdb/pull/12005 Reviewed By: jaykorean Differential Revision: D50840338 Pulled By: cbi42 fbshipit-source-id: 8a92779d3bef013d812eecb89aaaf33fc73991ec	2023-10-31 18:26:24 -07:00
anand76	8d08b843eb	Update HISTORY.md	2023-10-27 12:41:43 -07:00
anand76	8767167425	Add APIs to query secondary cache capacity and usage for TieredCache (#12011 ) Summary: In `TieredCache`, the underlying compressed secondary cache is hidden from the user. So we need a way to query the capacity, as well as the portion of cache reservation charged to the compressed secondary cache. Pull Request resolved: https://github.com/facebook/rocksdb/pull/12011 Test Plan: Update the unit tests Reviewed By: akankshamahajan15 Differential Revision: D50651943 Pulled By: anand1976 fbshipit-source-id: 06d1cb5edb75a790c919bce718e2ff65f5908220	2023-10-27 12:40:37 -07:00
Yu Zhang	0d13952bcc	Remove extra semicolon (#12017 ) Summary: As titled. Pull Request resolved: https://github.com/facebook/rocksdb/pull/12017 Reviewed By: hx235 Differential Revision: D50670406 Pulled By: jowlyzhang fbshipit-source-id: 28b3acd930ee676d78ebb47144047ce233fc11c5	2023-10-25 17:52:23 -07:00
Peter Dillinger	b5fed4a509	Fix windows build errors (rdtsc and fnptr) (#12008 ) Summary: Combining best parts of https://github.com/facebook/rocksdb/issues/11794 and https://github.com/facebook/rocksdb/issues/11766, fixing the CircleCI config in the latter. I was going to amend the latter but wasn't granted access. Ideally this would be ported back to 8.4 branch and crc32c part into 8.3 branch. Pull Request resolved: https://github.com/facebook/rocksdb/pull/12008 Test Plan: CI Reviewed By: hx235 Differential Revision: D50616172 Pulled By: pdillinger fbshipit-source-id: fa7f778bc281e881a140522e774f480c6d1e5f48	2023-10-25 09:35:38 -07:00
Hui Xiao	366a61aee6	Update 8.8.fb release note	2023-10-23 20:20:34 -07:00