Retrieve ZLib from the archive (#9782 )

Do not rely on ADL when invoking std::max_element (#9608 )
Summary: Certain STLs use raw pointers and ADL does not work for them. Pull Request resolved: https://github.com/facebook/rocksdb/pull/9608 Reviewed By: ajkr Differential Revision: D34583012 Pulled By: riversand963 fbshipit-source-id: 7de6bbc8a080c3e7243ce0d758fe83f1663168aa
2026-07-08 07:05:23 +08:00 · 2022-04-04 18:09:07 -07:00 · 2022-03-29 12:54:19 -07:00 · 2022-03-29 12:18:28 -07:00 · 2022-03-29 12:17:49 -07:00 · 2022-03-29 12:14:13 -07:00
463 changed files with 16816 additions and 34321 deletions
@@ -0,0 +1,54 @@
+#! /bin/bash
+
+# Work around issue with parallel make output causing random error, as in
+# make[1]: write error: stdout
+# Probably due to a kernel bug:
+#   https://bugs.launchpad.net/ubuntu/+source/linux-signed/+bug/1814393
+# Seems to affect image ubuntu-1604:201903-01 and ubuntu-1604:202004-01
+
+cd "$(dirname $0)"
+
+if [ ! -x cat_ignore_eagain.out ]; then
+    cc -x c -o cat_ignore_eagain.out - << EOF
+#include <unistd.h>
+#include <errno.h>
+#include <stdio.h>
+int main() {
+    int n, m, p;
+    char buf[1024];
+    for (;;) {
+        n = read(STDIN_FILENO, buf, 1024);
+        if (n > 0 && n <= 1024) {
+            for (m = 0; m < n;) {
+                p = write(STDOUT_FILENO, buf + m, n - m);
+                if (p < 0) {
+                    if (errno == EAGAIN) {
+                        // ignore but pause a bit
+                        usleep(100);
+                    } else {
+                        perror("write failed");
+                        return 42;
+                    }
+                } else {
+                    m += p;
+                }
+            }
+        } else if (n < 0) {
+            if (errno == EAGAIN) {
+                // ignore but pause a bit
+                usleep(100);
+            } else {
+                // Some non-ignorable error
+                perror("read failed");
+                return 43;
+            }
+        } else {
+            // EOF
+            return 0;
+        }
+    }
+}
+EOF
+fi
+
+exec ./cat_ignore_eagain.out
@@ -76,9 +76,8 @@ commands:
      - run:
          name: Install Clang 10
          command: |
-            wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-            echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main" | sudo tee -a /etc/apt/sources.list
-            echo "deb-src http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main" | sudo tee -a /etc/apt/sources.list
+            echo "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-10 main" | sudo tee -a /etc/apt/sources.list
+            echo "deb-src http://apt.llvm.org/xenial/ llvm-toolchain-xenial-10 main" | sudo tee -a /etc/apt/sources.list
            echo "APT::Acquire::Retries \"10\";" | sudo tee -a /etc/apt/apt.conf.d/80-retries # llvm.org unreliable
            sudo apt-get update -y && sudo apt-get install -y clang-10

@@ -102,11 +101,18 @@ commands:

  install-benchmark:
    steps:
-      - run:
+      - run: # currently doesn't support ubuntu-1604 which doesn't have libbenchmark package, user can still install by building it youself
          name: Install benchmark
          command: |
            sudo apt-get update -y && sudo apt-get install -y libbenchmark-dev

+  install-librados:
+    steps:
+      - run:
+          name: Install librados
+          command: |
+            sudo apt-get update -y && sudo apt-get install -y librados-dev
+
  upgrade-cmake:
    steps:
      - run:
@@ -137,21 +143,6 @@ commands:
          command: |
            sudo apt-get update -y && sudo apt-get install -y libsnappy-dev zlib1g-dev libbz2-dev liblz4-dev libzstd-dev

-  install-libprotobuf-mutator:
-    steps:
-      - run:
-          name: Install libprotobuf-mutator libs
-          command: |
-            git clone --single-branch --branch master --depth 1 git@github.com:google/libprotobuf-mutator.git ~/libprotobuf-mutator
-            cd ~/libprotobuf-mutator && mkdir build && cd build
-            cmake .. -GNinja -DCMAKE_C_COMPILER=clang-13 -DCMAKE_CXX_COMPILER=clang++-13 -DCMAKE_BUILD_TYPE=Release -DLIB_PROTO_MUTATOR_DOWNLOAD_PROTOBUF=ON
-            ninja && sudo ninja install
-      - run:
-          name: Setup environment variables
-          command: |
-            echo "export PKG_CONFIG_PATH=/usr/local/OFF/:~/libprotobuf-mutator/build/external.protobuf/lib/pkgconfig/" >> $BASH_ENV
-            echo "export PROTOC_BIN=~/libprotobuf-mutator/build/external.protobuf/bin/protoc" >> $BASH_ENV
-
 executors:
  windows-2xlarge:
    machine:
@@ -170,218 +161,187 @@ jobs:
      - increase-max-open-files-on-macos
      - install-gflags-on-macos
      - pre-steps-macos
-      - run: ulimit -S -n 1048576 && OPT=-DCIRCLECI make V=1 J=32 -j32 all
+      - run: ulimit -S -n 1048576 && OPT=-DCIRCLECI make V=1 J=32 -j32 check 2>&1 | .circleci/cat_ignore_eagain
      - post-steps

  build-macos-cmake:
    macos:
      xcode: 12.5.1
    resource_class: large
-    parameters:
-      run_even_tests:
-        description: run even or odd tests, used to split tests to 2 groups
-        type: boolean
-        default: true
    steps:
      - increase-max-open-files-on-macos
      - install-cmake-on-macos
      - install-gflags-on-macos
      - pre-steps-macos
-      - run:
-          name: "cmake generate project file"
-          command: ulimit -S -n 1048576 && mkdir build && cd build && cmake -DWITH_GFLAGS=1 ..
-      - run:
-          name: "Build tests"
-          command: cd build && make V=1 -j32
-      - when:
-          condition: << parameters.run_even_tests >>
-          steps:
-            - run:
-                name: "Run even tests"
-                command: ulimit -S -n 1048576 && cd build && ctest -j32 -I 0,,2
-      - when:
-          condition:
-            not: << parameters.run_even_tests >>
-          steps:
-            - run:
-                name: "Run odd tests"
-                command: ulimit -S -n 1048576 && cd build && ctest -j32 -I 1,,2
+      - run: ulimit -S -n 1048576 && (mkdir build && cd build && cmake -DWITH_GFLAGS=1 .. && make V=1 -j32 && ctest -j10) 2>&1 | .circleci/cat_ignore_eagain
      - post-steps

  build-linux:
    machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-1604:202104-01
    resource_class: 2xlarge
    steps:
      - pre-steps
      - install-gflags
-      - run: make V=1 J=32 -j32 check
+      - run: make V=1 J=32 -j32 check 2>&1 | .circleci/cat_ignore_eagain
+      - post-steps
+
+  build-linux-mem-env-librados:
+    machine:
+      image: ubuntu-1604:202104-01
+    resource_class: 2xlarge
+    steps:
+      - pre-steps
+      - install-gflags
+      - install-librados
+      - run: MEM_ENV=1 ROCKSDB_USE_LIBRADOS=1 make V=1 J=32 -j32 check 2>&1 | .circleci/cat_ignore_eagain
      - post-steps

  build-linux-encrypted-env:
    machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-1604:202104-01
    resource_class: 2xlarge
    steps:
      - pre-steps
      - install-gflags
-      - run: ENCRYPTED_ENV=1 make V=1 J=32 -j32 check
+      - run: ENCRYPTED_ENV=1 make V=1 J=32 -j32 check 2>&1 | .circleci/cat_ignore_eagain
      - post-steps

  build-linux-shared_lib-alt_namespace-status_checked:
    machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-1604:202104-01
    resource_class: 2xlarge
    steps:
      - pre-steps
      - install-gflags
-      - run: ASSERT_STATUS_CHECKED=1 TEST_UINT128_COMPAT=1 ROCKSDB_MODIFY_NPHASH=1 LIB_MODE=shared OPT="-DROCKSDB_NAMESPACE=alternative_rocksdb_ns" make V=1 -j32 check
+      - run: ASSERT_STATUS_CHECKED=1 TEST_UINT128_COMPAT=1 ROCKSDB_MODIFY_NPHASH=1 LIB_MODE=shared OPT="-DROCKSDB_NAMESPACE=alternative_rocksdb_ns" make V=1 -j32 check 2>&1 | .circleci/cat_ignore_eagain
      - post-steps

  build-linux-release:
    machine:
-      image: ubuntu-2004:202111-02
-    resource_class: 2xlarge
+      image: ubuntu-1604:202104-01
+    resource_class: large
    steps:
      - checkout # check out the code in the project directory
-      - run: make V=1 -j32 release
+      - run: make V=1 -j8 release 2>&1 | .circleci/cat_ignore_eagain
      - run: if ./db_stress --version; then false; else true; fi # ensure without gflags
      - install-gflags
-      - run: make V=1 -j32 release
+      - run: make V=1 -j8 release 2>&1 | .circleci/cat_ignore_eagain
      - run: ./db_stress --version # ensure with gflags
      - post-steps

  build-linux-release-rtti:
    machine:
-      image: ubuntu-2004:202111-02
-    resource_class: xlarge
+      image: ubuntu-1604:201903-01
+    resource_class: large
    steps:
      - checkout # check out the code in the project directory
      - run: make clean
-      - run: USE_RTTI=1 DEBUG_LEVEL=0 make V=1 -j16 static_lib tools db_bench
+      - run: USE_RTTI=1 DEBUG_LEVEL=0 make V=1 -j8 static_lib tools db_bench 2>&1 | .circleci/cat_ignore_eagain
      - run: if ./db_stress --version; then false; else true; fi # ensure without gflags
      - run: sudo apt-get update -y && sudo apt-get install -y libgflags-dev
      - run: make clean
-      - run: USE_RTTI=1 DEBUG_LEVEL=0 make V=1 -j16 static_lib tools db_bench
+      - run: USE_RTTI=1 DEBUG_LEVEL=0 make V=1 -j8 static_lib tools db_bench 2>&1 | .circleci/cat_ignore_eagain
      - run: ./db_stress --version # ensure with gflags

  build-linux-lite:
    machine:
-      image: ubuntu-2004:202111-02
-    resource_class: large
+      image: ubuntu-1604:202104-01
+    resource_class: 2xlarge
    steps:
      - pre-steps
      - install-gflags
-      - run: LITE=1 make V=1 J=8 -j8 check
+      - run: LITE=1 make V=1 J=32 -j32 check 2>&1 | .circleci/cat_ignore_eagain
      - post-steps

  build-linux-lite-release:
    machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-1604:202104-01
    resource_class: large
    steps:
      - checkout # check out the code in the project directory
-      - run: LITE=1 make V=1 -j8 release
+      - run: LITE=1 make V=1 -j8 release 2>&1 | .circleci/cat_ignore_eagain
      - run: if ./db_stress --version; then false; else true; fi # ensure without gflags
      - install-gflags
-      - run: LITE=1 make V=1 -j8 release
+      - run: LITE=1 make V=1 -j8 release 2>&1 | .circleci/cat_ignore_eagain
      - run: ./db_stress --version # ensure with gflags
      - post-steps

  build-linux-clang-no_test_run:
    machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-1604:202104-01
    resource_class: xlarge
    steps:
      - checkout # check out the code in the project directory
      - run: sudo apt-get update -y && sudo apt-get install -y clang libgflags-dev libtbb-dev
-      - run: CC=clang CXX=clang++ USE_CLANG=1 PORTABLE=1 make V=1 -j16 all
+      - run: CC=clang CXX=clang++ USE_CLANG=1 PORTABLE=1 make V=1 -j16 all 2>&1 | .circleci/cat_ignore_eagain
      - post-steps

  build-linux-clang10-asan:
    machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-1604:202104-01
    resource_class: 2xlarge
    steps:
      - pre-steps
      - install-gflags
      - install-clang-10
-      - run: ASAN_OPTIONS=detect_stack_use_after_return=1 COMPILE_WITH_ASAN=1 CC=clang-10 CXX=clang++-10 ROCKSDB_DISABLE_ALIGNED_NEW=1 USE_CLANG=1 make V=1 -j32 check # aligned new doesn't work for reason we haven't figured out
+      - run: COMPILE_WITH_ASAN=1 CC=clang-10 CXX=clang++-10 ROCKSDB_DISABLE_ALIGNED_NEW=1 USE_CLANG=1 make V=1 -j32 check 2>&1 | .circleci/cat_ignore_eagain # aligned new doesn't work for reason we haven't figured out
      - post-steps

  build-linux-clang10-mini-tsan:
    machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-1604:202104-01
    resource_class: 2xlarge
-    # find test list by `make list_all_tests`
-    parameters:
-      start_test:
-        default: ""
-        type: string
-      end_test:
-        default: ""
-        type: string
    steps:
      - pre-steps
      - install-gflags
      - install-clang-10
-      - install-gtest-parallel
-      - run:
-          name: "Build unit tests"
-          command: |
-            echo "env: $(env)"
-            ROCKSDBTESTS_START=<<parameters.start_test>> ROCKSDBTESTS_END=<<parameters.end_test>> ROCKSDBTESTS_SUBSET_TESTS_TO_FILE=/tmp/test_list COMPILE_WITH_TSAN=1 CC=clang-10 CXX=clang++-10 ROCKSDB_DISABLE_ALIGNED_NEW=1 USE_CLANG=1 make V=1 -j32 --output-sync=target build_subset_tests
-      - run:
-          name: "Run unit tests in parallel"
-          command: |
-            sed -i 's/[[:space:]]*$//; s/ / \.\//g; s/.*/.\/&/' /tmp/test_list
-            cat /tmp/test_list
-            gtest-parallel $(</tmp/test_list) --output_dir=/tmp | cat  # pipe to cat to continuously output status on circleci UI. Otherwise, no status will be printed while the job is running.
+      - run: COMPILE_WITH_TSAN=1 CC=clang-10 CXX=clang++-10 ROCKSDB_DISABLE_ALIGNED_NEW=1 USE_CLANG=1 make V=1 -j32 check 2>&1 | .circleci/cat_ignore_eagain # aligned new doesn't work for reason we haven't figured out.
      - post-steps

  build-linux-clang10-ubsan:
    machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-1604:202104-01
    resource_class: 2xlarge
    steps:
      - pre-steps
      - install-gflags
      - install-clang-10
-      - run: COMPILE_WITH_UBSAN=1 OPT="-fsanitize-blacklist=.circleci/ubsan_suppression_list.txt" CC=clang-10 CXX=clang++-10 ROCKSDB_DISABLE_ALIGNED_NEW=1 USE_CLANG=1 make V=1 -j32 ubsan_check # aligned new doesn't work for reason we haven't figured out
+      - run: COMPILE_WITH_UBSAN=1 OPT="-fsanitize-blacklist=.circleci/ubsan_suppression_list.txt" CC=clang-10 CXX=clang++-10 ROCKSDB_DISABLE_ALIGNED_NEW=1 USE_CLANG=1 make V=1 -j32 ubsan_check 2>&1 | .circleci/cat_ignore_eagain # aligned new doesn't work for reason we haven't figured out
      - post-steps

  build-linux-clang10-clang-analyze:
    machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-1604:202104-01
    resource_class: 2xlarge
    steps:
      - pre-steps
      - install-gflags
      - install-clang-10
      - run: sudo apt-get update -y && sudo apt-get install -y clang-tools-10
-      - run: CC=clang-10 CXX=clang++-10 ROCKSDB_DISABLE_ALIGNED_NEW=1 CLANG_ANALYZER="/usr/bin/clang++-10" CLANG_SCAN_BUILD=scan-build-10 USE_CLANG=1 make V=1 -j32 analyze # aligned new doesn't work for reason we haven't figured out. For unknown, reason passing "clang++-10" as CLANG_ANALYZER doesn't work, and we need a full path.
+      - run: CC=clang-10 CXX=clang++-10 ROCKSDB_DISABLE_ALIGNED_NEW=1 CLANG_ANALYZER="/usr/bin/clang++-10" CLANG_SCAN_BUILD=scan-build-10 USE_CLANG=1 make V=1 -j32 analyze 2>&1 | .circleci/cat_ignore_eagain # aligned new doesn't work for reason we haven't figured out. For unknown, reason passing "clang++-10" as CLANG_ANALYZER doesn't work, and we need a full path.
      - post-steps

  build-linux-cmake:
    machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-1604:202104-01
    resource_class: 2xlarge
    steps:
      - pre-steps
      - install-gflags
      - upgrade-cmake
-      - run: (mkdir build && cd build && cmake -DWITH_GFLAGS=1 .. && make V=1 -j20 && ctest -j20)
+      - run: (mkdir build && cd build && cmake -DWITH_GFLAGS=1 .. && make V=1 -j20 && ctest -j20) 2>&1 | .circleci/cat_ignore_eagain
      - post-steps

  build-linux-cmake-ubuntu-20:
    machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-2004:202104-01
    resource_class: 2xlarge
    steps:
      - pre-steps
      - install-gflags
      - install-benchmark
-      - run: (mkdir build && cd build && cmake -DWITH_GFLAGS=1 -DWITH_BENCHMARK=1 .. && make V=1 -j20 && ctest -j20)
+      - run: (mkdir build && cd build && cmake -DWITH_GFLAGS=1 -DWITH_BENCHMARK=1 .. && make V=1 -j20 && ctest -j20 && make microbench) 2>&1 | .circleci/cat_ignore_eagain
      - post-steps

  build-linux-unity-and-headers:
@@ -391,82 +351,79 @@ jobs:
    steps:
      - checkout # check out the code in the project directory
      - run: apt-get update -y && apt-get install -y libgflags-dev
-      - run: TEST_TMPDIR=/dev/shm && make V=1 -j8 unity_test
-      - run: make V=1 -j8 -k check-headers # could be moved to a different build
+      - run: TEST_TMPDIR=/dev/shm && make V=1 -j8 unity_test 2>&1 | .circleci/cat_ignore_eagain
+      - run: make V=1 -j8 -k check-headers 2>&1 | .circleci/cat_ignore_eagain # could be moved to a different build
      - post-steps

-  build-linux-gcc-7:
+  build-linux-gcc-4_8-no_test_run:
    machine:
-      image: ubuntu-2004:202111-02
-    resource_class: 2xlarge
+      image: ubuntu-1604:202104-01
+    resource_class: large
    steps:
      - pre-steps
-      - run: sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test && sudo apt-get update -y && sudo apt-get install gcc-7 g++-7 libgflags-dev
-      - run: CC=gcc-7 CXX=g++-7 V=1 make -j32 check
+      - run: sudo apt-get update -y && sudo apt-get install gcc-4.8 g++-4.8 libgflags-dev
+      - run: CC=gcc-4.8 CXX=g++-4.8 V=1 SKIP_LINK=1 make -j8 all 2>&1 | .circleci/cat_ignore_eagain # Linking broken because libgflags compiled with newer ABI
      - post-steps

  build-linux-gcc-8-no_test_run:
    machine:
-      image: ubuntu-2004:202111-02
-    resource_class: xlarge
+      image: ubuntu-2004:202010-01
+    resource_class: large
    steps:
      - pre-steps
-      - run: sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test && sudo apt-get update -y && sudo apt-get install gcc-8 g++-8 libgflags-dev
-      - run: CC=gcc-8 CXX=g++-8 V=1 make -j16 all
+      - run: sudo apt-get update -y && sudo apt-get install gcc-8 g++-8 libgflags-dev
+      - run: CC=gcc-8 CXX=g++-8 V=1 SKIP_LINK=1 make -j8 all 2>&1 | .circleci/cat_ignore_eagain # Linking broken because libgflags compiled with newer ABI
+      - post-steps
+
+  build-linux-gcc-9-no_test_run:
+    machine:
+      image: ubuntu-2004:202010-01
+    resource_class: large
+    steps:
+      - pre-steps
+      - run: sudo apt-get update -y && sudo apt-get install gcc-9 g++-9 libgflags-dev
+      - run: CC=gcc-9 CXX=g++-9 V=1 SKIP_LINK=1 make -j8 all 2>&1 | .circleci/cat_ignore_eagain # Linking broken because libgflags compiled with newer ABI
      - post-steps

  build-linux-gcc-10-cxx20-no_test_run:
    machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-2004:202010-01
    resource_class: xlarge
    steps:
      - pre-steps
      - run: sudo apt-get update -y && sudo apt-get install gcc-10 g++-10 libgflags-dev
-      - run: CC=gcc-10 CXX=g++-10 V=1 ROCKSDB_CXX_STANDARD=c++20 make -j16 all
+      - run: CC=gcc-10 CXX=g++-10 V=1 SKIP_LINK=1 ROCKSDB_CXX_STANDARD=c++20 make -j16 all 2>&1 | .circleci/cat_ignore_eagain # Linking broken because libgflags compiled with newer ABI
      - post-steps

  build-linux-gcc-11-no_test_run:
    machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-2004:202010-01
    resource_class: xlarge
    steps:
      - pre-steps
-      - install-benchmark
-      - run: sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test && sudo apt-get update -y && sudo apt-get install gcc-11 g++-11 libgflags-dev
-      - run: CC=gcc-11 CXX=g++-11 V=1 make -j16 all microbench
+      - run: sudo apt-get update -y && sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test && sudo apt-get install gcc-11 g++-11 libgflags-dev
+      - run: CC=gcc-11 CXX=g++-11 V=1 SKIP_LINK=1 make -j16 all 2>&1 | .circleci/cat_ignore_eagain # Linking broken because libgflags compiled with newer ABI
      - post-steps

  build-linux-clang-13-no_test_run:
    machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-2004:202010-01
    resource_class: xlarge
    steps:
      - pre-steps
      - install-clang-13
-      - install-benchmark
-      - run: CC=clang-13 CXX=clang++-13 USE_CLANG=1 make -j16 all microbench
+      - run: CC=clang-13 CXX=clang++-13 USE_CLANG=1 make -j16 all 2>&1 | .circleci/cat_ignore_eagain
      - post-steps

  # This job is only to make sure the microbench tests are able to run, the benchmark result is not meaningful as the CI host is changing.
-  build-linux-run-microbench:
+  build-linux-microbench:
    machine:
-      image: ubuntu-2004:202111-02
-    resource_class: 2xlarge
+      image: ubuntu-2004:202010-01
+    resource_class: xlarge
    steps:
      - pre-steps
      - install-benchmark
-      - run: DEBUG_LEVEL=0 make -j32 run_microbench
-      - post-steps
-
-  build-linux-mini-crashtest:
-    machine:
-      image: ubuntu-2004:202111-02
-    resource_class: large
-    steps:
-      - pre-steps
-      - install-gflags
-      - install-compression-libs
-      - run: make V=1 -j8 CRASH_TEST_EXT_ARGS=--duration=960 blackbox_crash_test_with_atomic_flush
+      - run: DEBUG_LEVEL=0 make microbench 2>&1 | .circleci/cat_ignore_eagain
      - post-steps

  build-windows:
@@ -539,7 +496,7 @@ jobs:

  build-linux-java:
    machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-1604:202104-01
    resource_class: large
    environment:
      JAVA_HOME: /usr/lib/jvm/java-1.8.0-openjdk-amd64
@@ -555,15 +512,15 @@ jobs:
            which javac && javac -version
      - run:
          name: "Build RocksDBJava Shared Library"
-          command: make V=1 J=8 -j8 rocksdbjava
+          command: make V=1 J=8 -j8 rocksdbjava 2>&1 | .circleci/cat_ignore_eagain
      - run:
          name: "Test RocksDBJava"
-          command: make V=1 J=8 -j8 jtest
+          command: make V=1 J=8 -j8 jtest 2>&1 | .circleci/cat_ignore_eagain
      - post-steps

  build-linux-java-static:
    machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-1604:202104-01
    resource_class: large
    environment:
      JAVA_HOME: /usr/lib/jvm/java-1.8.0-openjdk-amd64
@@ -579,13 +536,13 @@ jobs:
            which javac && javac -version
      - run:
          name: "Build RocksDBJava Static Library"
-          command: make V=1 J=8 -j8 rocksdbjavastatic
+          command: make V=1 J=8 -j8 rocksdbjavastatic 2>&1 | .circleci/cat_ignore_eagain
      - post-steps

  build-macos-java:
    macos:
      xcode: 12.5.1
-    resource_class: large
+    resource_class: medium
    environment:
      JAVA_HOME: /Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home
      ROCKSDB_DISABLE_JEMALLOC: 1 # jemalloc causes java 8 crash
@@ -603,16 +560,16 @@ jobs:
            which javac && javac -version
      - run:
          name: "Build RocksDBJava Shared Library"
-          command: make V=1 J=16 -j16 rocksdbjava
+          command: make V=1 J=8 -j8 rocksdbjava 2>&1 | .circleci/cat_ignore_eagain
      - run:
          name: "Test RocksDBJava"
-          command: make V=1 J=16 -j16 jtest
+          command: make V=1 J=8 -j8 jtest 2>&1 | .circleci/cat_ignore_eagain
      - post-steps

  build-macos-java-static:
    macos:
      xcode: 12.5.1
-    resource_class: large
+    resource_class: medium
    environment:
      JAVA_HOME: /Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home
    steps:
@@ -630,13 +587,13 @@ jobs:
            which javac && javac -version
      - run:
          name: "Build RocksDBJava x86 and ARM Static Libraries"
-          command: make V=1 J=16 -j16 rocksdbjavastaticosx
+          command: make V=1 J=8 -j8 rocksdbjavastaticosx 2>&1 | .circleci/cat_ignore_eagain
      - post-steps

  build-macos-java-static-universal:
    macos:
      xcode: 12.5.1
-    resource_class: large
+    resource_class: medium
    environment:
      JAVA_HOME: /Library/Java/JavaVirtualMachines/adoptopenjdk-8.jdk/Contents/Home
    steps:
@@ -654,12 +611,12 @@ jobs:
            which javac && javac -version
      - run:
          name: "Build RocksDBJava Universal Binary Static Library"
-          command: make V=1 J=16 -j16 rocksdbjavastaticosx_ub
+          command: make V=1 J=8 -j8 rocksdbjavastaticosx_ub 2>&1 | .circleci/cat_ignore_eagain
      - post-steps

  build-examples:
    machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-1604:202104-01
    resource_class: large
    steps:
      - pre-steps
@@ -667,13 +624,13 @@ jobs:
      - run:
          name: "Build examples"
          command: |
-            OPT=-DTRAVIS V=1 make -j4 static_lib && cd examples && make -j4
+            OPT=-DTRAVIS V=1 make -j4 static_lib && cd examples && make -j4 | ../.circleci/cat_ignore_eagain
      - post-steps

  build-cmake-mingw:
    machine:
-      image: ubuntu-2004:202111-02
-    resource_class: large
+      image: ubuntu-1604:202104-01
+    resource_class: 2xlarge
    steps:
      - pre-steps
      - install-gflags
@@ -695,39 +652,57 @@ jobs:

  build-linux-non-shm:
    machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-1604:202104-01
    resource_class: 2xlarge
-    environment:
-      TEST_TMPDIR: /tmp/rocksdb_test_tmp
+    parameters:
+      start_test:
+        default: ""
+        type: string
+      end_test:
+        default: ""
+        type: string
    steps:
      - pre-steps
      - install-gflags
-      - run: make V=1 -j32 check
+      - install-gtest-parallel
+      - run:
+          name: "Build unit tests"
+          command: |
+            echo "env: $(env)"
+            echo "** done env"
+            ROCKSDBTESTS_START=<<parameters.start_test>> ROCKSDBTESTS_END=<<parameters.end_test>> ROCKSDBTESTS_SUBSET_TESTS_TO_FILE=/tmp/test_list make V=1 -j32 --output-sync=target build_subset_tests
+      - run:
+          name: "Run unit tests in parallel"
+          command: |
+            sed -i 's/[[:space:]]*$//; s/ / \.\//g; s/.*/.\/&/' /tmp/test_list
+            cat /tmp/test_list
+            export TEST_TMPDIR=/tmp/rocksdb_test_tmp
+            gtest-parallel $(</tmp/test_list) --output_dir=/tmp | cat  # pipe to cat to continuously output status on circleci UI. Otherwise, no status will be printed while the job is running.
      - post-steps

  build-linux-arm-test-full:
    machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-2004:202101-01
    resource_class: arm.large
    steps:
      - pre-steps
      - install-gflags
-      - run: make V=1 J=4 -j4 check
+      - run: make V=1 J=4 -j4 check 2>&1 | .circleci/cat_ignore_eagain
      - post-steps

  build-linux-arm:
    machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-2004:202101-01
    resource_class: arm.large
    steps:
      - pre-steps
      - install-gflags
-      - run: ROCKSDBTESTS_PLATFORM_DEPENDENT=only make V=1 J=4 -j4 all_but_some_tests check_some
+      - run: ROCKSDBTESTS_PLATFORM_DEPENDENT=only make V=1 J=4 -j4 all_but_some_tests check_some 2>&1 | .circleci/cat_ignore_eagain
      - post-steps

  build-linux-arm-cmake-no_test_run:
    machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-2004:202101-01
    resource_class: arm.large
    environment:
      JAVA_HOME: /usr/lib/jvm/java-8-openjdk-arm64
@@ -760,7 +735,7 @@ jobs:

  build-format-compatible:
    machine:
-      image: ubuntu-2004:202111-02
+      image: ubuntu-1604:202104-01
    resource_class: 2xlarge
    steps:
      - pre-steps
@@ -775,23 +750,6 @@ jobs:
            tools/check_format_compatible.sh
      - post-steps

-  build-fuzzers:
-    machine:
-      image: ubuntu-2004:202111-02
-    resource_class: large
-    steps:
-      - pre-steps
-      - install-clang-13
-      - run: sudo apt-get update -y && sudo apt-get install -y cmake ninja-build binutils liblzma-dev libz-dev pkg-config autoconf libtool
-      - install-libprotobuf-mutator
-      - run:
-          name: "Build rocksdb lib"
-          command: CC=clang-13 CXX=clang++-13 USE_CLANG=1 make -j4 static_lib
-      - run:
-          name: "Build fuzzers"
-          command: cd fuzz && make sst_file_writer_fuzzer db_fuzzer db_map_fuzzer
-      - post-steps
-
 workflows:
  version: 2
  build-linux:
@@ -801,6 +759,9 @@ workflows:
    jobs:
      - build-linux-cmake
      - build-linux-cmake-ubuntu-20
+  build-linux-mem-env-librados:
+    jobs:
+      - build-linux-mem-env-librados
  build-linux-encrypted-env:
    jobs:
      - build-linux-encrypted-env
@@ -824,12 +785,7 @@ workflows:
      - build-linux-clang10-asan
  build-linux-clang10-mini-tsan:
    jobs:
-      - build-linux-clang10-mini-tsan:
-          start_test: ""
-          end_test: "env_test"
-      - build-linux-clang10-mini-tsan:
-          start_test: "env_test"
-          end_test: ""
+      - build-linux-clang10-mini-tsan
  build-linux-clang10-ubsan:
    jobs:
      - build-linux-clang10-ubsan
@@ -839,9 +795,6 @@ workflows:
  build-linux-unity-and-headers:
    jobs:
      - build-linux-unity-and-headers
-  build-linux-mini-crashtest:
-    jobs:
-      - build-linux-mini-crashtest
  build-windows-vs2019:
    jobs:
      - build-windows:
@@ -867,31 +820,45 @@ workflows:
  build-examples:
    jobs:
      - build-examples
+  build-linux-non-shm:
+    jobs:
+      - build-linux-non-shm:
+          start_test: ""
+          end_test: "db_options_test" # make sure unique in src.mk
+      - build-linux-non-shm:
+          start_test: "db_options_test" # make sure unique in src.mk
+          end_test: "filename_test" # make sure unique in src.mk
+      - build-linux-non-shm:
+          start_test: "filename_test" # make sure unique in src.mk
+          end_test: "statistics_test" # make sure unique in src.mk
+      - build-linux-non-shm:
+          start_test: "statistics_test" # make sure unique in src.mk
+          end_test: ""
  build-linux-compilers-no_test_run:
    jobs:
      - build-linux-clang-no_test_run
      - build-linux-clang-13-no_test_run
-      - build-linux-gcc-7
+      - build-linux-gcc-4_8-no_test_run
      - build-linux-gcc-8-no_test_run
+      - build-linux-gcc-9-no_test_run
      - build-linux-gcc-10-cxx20-no_test_run
      - build-linux-gcc-11-no_test_run
      - build-linux-arm-cmake-no_test_run
  build-macos:
    jobs:
      - build-macos
-      - build-macos-cmake:
-          run_even_tests: true
-      - build-macos-cmake:
-          run_even_tests: false
+  build-macos-cmake:
+    jobs:
+      - build-macos-cmake
  build-cmake-mingw:
    jobs:
      - build-cmake-mingw
  build-linux-arm:
    jobs:
      - build-linux-arm
-  build-fuzzers:
+  build-microbench:
    jobs:
-      - build-fuzzers
+      - build-linux-microbench
  nightly:
    triggers:
      - schedule:
@@ -903,5 +870,3 @@ workflows:
    jobs:
      - build-format-compatible
      - build-linux-arm-test-full
-      - build-linux-run-microbench
-      - build-linux-non-shm
@@ -32,7 +32,7 @@ jobs:
    - name: Download clang-format-diff.py
      uses: wei/wget@v1
      with:
-        args: https://raw.githubusercontent.com/llvm/llvm-project/release/12.x/clang/tools/clang-format/clang-format-diff.py
+        args: https://raw.githubusercontent.com/llvm/llvm-project/main/clang/tools/clang-format/clang-format-diff.py

    - name: Check format
      run: VERBOSE_CHECK=1 make check-format
@@ -43,18 +43,29 @@ env:
  - JOB_NAME=cmake-gcc9 # 3-5 minutes
  - JOB_NAME=cmake-gcc9-c++20 # 3-5 minutes
  - JOB_NAME=cmake-mingw # 3 minutes
+  - JOB_NAME=make-gcc4.8
+  - JOB_NAME=status_checked

 matrix:
  exclude:
  - os : linux
    arch: arm64
    env: JOB_NAME=cmake-mingw
+  - os : linux
+    arch: arm64
+    env: JOB_NAME=make-gcc4.8
  - os: linux
    arch: ppc64le
    env: JOB_NAME=cmake-mingw
+  - os: linux
+    arch: ppc64le
+    env: JOB_NAME=make-gcc4.8
  - os: linux
    arch: s390x
    env: JOB_NAME=cmake-mingw
+  - os: linux
+    arch: s390x
+    env: JOB_NAME=make-gcc4.8
  - os: linux
    compiler: clang
  - if: type = pull_request AND commit_message !~ /FULL_CI/
@@ -185,9 +196,20 @@ matrix:
    os: linux
    arch: s390x
    env: JOB_NAME=cmake-gcc9-c++20
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    os : linux
+    arch: arm64
+    env: JOB_NAME=status_checked
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    os: linux
+    arch: ppc64le
+    env: JOB_NAME=status_checked
+  - if: type = pull_request AND commit_message !~ /FULL_CI/
+    os: linux
+    arch: s390x
+    env: JOB_NAME=status_checked

 install:
-  -  CC=gcc-7 && CXX=g++-7
  - if [ "${JOB_NAME}" == cmake-gcc8 ]; then
      sudo apt-get install -y g++-8 || exit $?;
      CC=gcc-8 && CXX=g++-8;
@@ -199,8 +221,9 @@ install:
  - if [ "${JOB_NAME}" == cmake-mingw ]; then
      sudo apt-get install -y mingw-w64 || exit $?;
    fi
-  - if [ "${CXX}" == "g++-7" ]; then
-      sudo apt-get install -y g++-7 || exit $?;
+  - if [ "${JOB_NAME}" == make-gcc4.8 ]; then
+      sudo apt-get install -y g++-4.8 || exit $?;
+      CC=gcc-4.8 && CXX=g++-4.8;
    fi
  - |
    if [[ "${JOB_NAME}" == cmake* ]]; then
@@ -230,25 +253,21 @@ before_script:
 script:
  - date; ${CXX} --version
  - if [ `command -v ccache` ]; then ccache -C; fi
-  - export MK_PARALLEL=4;
-    if [[ "$TRAVIS_CPU_ARCH" == s390x ]]; then
-      export MK_PARALLEL=1;
-    fi
  - case $TEST_GROUP in
    platform_dependent)
-      OPT=-DTRAVIS LIB_MODE=shared V=1 ROCKSDBTESTS_PLATFORM_DEPENDENT=only make -j$MK_PARALLEL all_but_some_tests check_some
+      OPT=-DTRAVIS LIB_MODE=shared V=1 ROCKSDBTESTS_PLATFORM_DEPENDENT=only make -j4 all_but_some_tests check_some
      ;;
    1)
-      OPT=-DTRAVIS LIB_MODE=shared V=1 ROCKSDBTESTS_PLATFORM_DEPENDENT=exclude ROCKSDBTESTS_END=backupable_db_test make -j$MK_PARALLEL check_some
+      OPT=-DTRAVIS LIB_MODE=shared V=1 ROCKSDBTESTS_PLATFORM_DEPENDENT=exclude ROCKSDBTESTS_END=backupable_db_test make -j4 check_some
      ;;
    2)
-      OPT="-DTRAVIS -DROCKSDB_NAMESPACE=alternative_rocksdb_ns" LIB_MODE=shared V=1 make -j$MK_PARALLEL tools && OPT="-DTRAVIS -DROCKSDB_NAMESPACE=alternative_rocksdb_ns" LIB_MODE=shared V=1 ROCKSDBTESTS_PLATFORM_DEPENDENT=exclude ROCKSDBTESTS_START=backupable_db_test ROCKSDBTESTS_END=db_universal_compaction_test make -j$MK_PARALLEL check_some
+      OPT="-DTRAVIS -DROCKSDB_NAMESPACE=alternative_rocksdb_ns" LIB_MODE=shared V=1 make -j4 tools && OPT="-DTRAVIS -DROCKSDB_NAMESPACE=alternative_rocksdb_ns" LIB_MODE=shared V=1 ROCKSDBTESTS_PLATFORM_DEPENDENT=exclude ROCKSDBTESTS_START=backupable_db_test ROCKSDBTESTS_END=db_universal_compaction_test make -j4 check_some
      ;;
    3)
-      OPT=-DTRAVIS LIB_MODE=shared V=1 ROCKSDBTESTS_PLATFORM_DEPENDENT=exclude ROCKSDBTESTS_START=db_universal_compaction_test ROCKSDBTESTS_END=table_properties_collector_test make -j$MK_PARALLEL check_some
+      OPT=-DTRAVIS LIB_MODE=shared V=1 ROCKSDBTESTS_PLATFORM_DEPENDENT=exclude ROCKSDBTESTS_START=db_universal_compaction_test ROCKSDBTESTS_END=table_properties_collector_test make -j4 check_some
      ;;
    4)
-      OPT=-DTRAVIS LIB_MODE=shared V=1 ROCKSDBTESTS_PLATFORM_DEPENDENT=exclude ROCKSDBTESTS_START=table_properties_collector_test make -j$MK_PARALLEL check_some
+      OPT=-DTRAVIS LIB_MODE=shared V=1 ROCKSDBTESTS_PLATFORM_DEPENDENT=exclude ROCKSDBTESTS_START=table_properties_collector_test make -j4 check_some
      ;;
    esac
  - case $JOB_NAME in
@@ -256,10 +275,10 @@ script:
      OPT=-DTRAVIS LIB_MODE=shared V=1 make rocksdbjava jtest
      ;;
    lite_build)
-      OPT='-DTRAVIS -DROCKSDB_LITE' LIB_MODE=shared V=1 make -j$MK_PARALLEL all
+      OPT='-DTRAVIS -DROCKSDB_LITE' LIB_MODE=shared V=1 make -j4 all
      ;;
    examples)
-      OPT=-DTRAVIS LIB_MODE=shared V=1 make -j$MK_PARALLEL static_lib && cd examples && make -j$MK_PARALLEL
+      OPT=-DTRAVIS LIB_MODE=shared V=1 make -j4 static_lib && cd examples && make -j4
      ;;
    cmake-mingw)
      sudo update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix;
@@ -272,7 +291,13 @@ script:
          ;;
      esac

-      mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=0 -DWITH_GFLAGS=0 -DWITH_BENCHMARK_TOOLS=0 -DWITH_TOOLS=0 -DWITH_CORE_TOOLS=1 .. && make -j$MK_PARALLEL && cd  .. && rm -rf build && mkdir build && cd build && cmake -DJNI=1 .. -DCMAKE_BUILD_TYPE=Release $OPT && make -j$MK_PARALLEL rocksdb rocksdbjni
+      mkdir build && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=0 -DWITH_GFLAGS=0 -DWITH_BENCHMARK_TOOLS=0 -DWITH_TOOLS=0 -DWITH_CORE_TOOLS=1 .. && make -j4 && cd  .. && rm -rf build && mkdir build && cd build && cmake -DJNI=1 .. -DCMAKE_BUILD_TYPE=Release $OPT && make -j4 rocksdb rocksdbjni
+      ;;
+    make-gcc4.8)
+      OPT=-DTRAVIS LIB_MODE=shared V=1 SKIP_LINK=1 make -j4 all && [ "Linking broken because libgflags compiled with newer ABI" ]
+      ;;
+    status_checked)
+      OPT=-DTRAVIS LIB_MODE=shared V=1 ASSERT_STATUS_CHECKED=1 make -j4 check_some
      ;;
    esac
 notifications:
@@ -14,7 +14,7 @@
 #        cd build
 # 3. Run cmake to generate project files for Windows, add more options to enable required third-party libraries.
 #    See thirdparty.inc for more information.
-#        sample command: cmake -G "Visual Studio 16 2019" -DCMAKE_BUILD_TYPE=Release -DWITH_GFLAGS=1 -DWITH_SNAPPY=1 -DWITH_JEMALLOC=1 -DWITH_JNI=1 ..
+#        sample command: cmake -G "Visual Studio 15 Win64" -DCMAKE_BUILD_TYPE=Release -DWITH_GFLAGS=1 -DWITH_SNAPPY=1 -DWITH_JEMALLOC=1 -DWITH_JNI=1 ..
 # 4. Then build the project in debug mode (you may want to add /m[:<N>] flag to run msbuild in <N> parallel threads
 #                                          or simply /m to use all avail cores)
 #        msbuild rocksdb.sln
@@ -27,7 +27,7 @@
 #
 # Linux:
 #
-# 1. Install a recent toolchain if you're on a older distro. C++17 required (GCC >= 7, Clang >= 5)
+# 1. Install a recent toolchain such as devtoolset-3 if you're on a older distro. C++11 required.
 # 2. mkdir build; cd build
 # 3. cmake ..
 # 4. make -j
@@ -92,7 +92,7 @@ else()
 endif()

 if( NOT DEFINED CMAKE_CXX_STANDARD )
-  set(CMAKE_CXX_STANDARD 17)
+  set(CMAKE_CXX_STANDARD 11)
 endif()

 include(CMakeDependentOption)
@@ -219,7 +219,7 @@ if(MSVC)
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /FC /d2Zi+ /W4 /wd4127 /wd4800 /wd4996 /wd4351 /wd4100 /wd4204 /wd4324")
 else()
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -W -Wextra -Wall -pthread")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-compare -Wshadow -Wno-unused-parameter -Wno-unused-variable -Woverloaded-virtual -Wnon-virtual-dtor -Wno-missing-field-initializers -Wno-strict-aliasing -Wno-invalid-offsetof")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wsign-compare -Wshadow -Wno-unused-parameter -Wno-unused-variable -Woverloaded-virtual -Wnon-virtual-dtor -Wno-missing-field-initializers -Wno-strict-aliasing")
  if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wstrict-prototypes")
  endif()
@@ -344,7 +344,7 @@ endif()

 # Check if -latomic is required or not
 if (NOT MSVC)
-  set(CMAKE_REQUIRED_FLAGS "--std=c++17")
+  set(CMAKE_REQUIRED_FLAGS "--std=c++11")
  CHECK_CXX_SOURCE_COMPILES("
 #include <atomic>
 std::atomic<uint64_t> x(0);
@@ -371,8 +371,18 @@ endif()
 # Reset the required flags
 set(CMAKE_REQUIRED_FLAGS ${OLD_CMAKE_REQUIRED_FLAGS})

-# thread_local is part of C++11 and later (TODO: clean up this define)
-add_definitions(-DROCKSDB_SUPPORT_THREAD_LOCAL)
+CHECK_CXX_SOURCE_COMPILES("
+#if defined(_MSC_VER) && !defined(__thread)
+#define __thread __declspec(thread)
+#endif
+int main() {
+  static __thread int tls;
+  (void)tls;
+}
+" HAVE_THREAD_LOCAL)
+if(HAVE_THREAD_LOCAL)
+  add_definitions(-DROCKSDB_SUPPORT_THREAD_LOCAL)
+endif()

 option(WITH_IOSTATS_CONTEXT "Enable IO stats context" ON)
 if (NOT WITH_IOSTATS_CONTEXT)
@@ -405,7 +415,7 @@ endif()

 option(WITH_TSAN "build with TSAN" OFF)
 if(WITH_TSAN)
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=thread -Wl,-pie")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fsanitize=thread -pie")
  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=thread -fPIC")
  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fsanitize=thread -fPIC")
  if(WITH_JEMALLOC)
@@ -629,7 +639,6 @@ set(SOURCES
        cache/cache_reservation_manager.cc
        cache/clock_cache.cc
        cache/lru_cache.cc
-        cache/lru_secondary_cache.cc
        cache/sharded_cache.cc
        db/arena_wrapped_db_iter.cc
        db/blob/blob_fetcher.cc
@@ -712,6 +721,7 @@ set(SOURCES
        env/env.cc
        env/env_chroot.cc
        env/env_encryption.cc
+        env/env_hdfs.cc
        env/file_system.cc
        env/file_system_tracer.cc
        env/fs_remap.cc
@@ -832,7 +842,6 @@ set(SOURCES
        util/coding.cc
        util/compaction_job_stats_impl.cc
        util/comparator.cc
-        util/compression.cc
        util/compression_context_cache.cc
        util/concurrent_task_limiter_impl.cc
        util/crc32c.cc
@@ -842,6 +851,7 @@ set(SOURCES
        util/random.cc
        util/rate_limiter.cc
        util/ribbon_config.cc
+        util/regex.cc
        util/slice.cc
        util/file_checksum_helper.cc
        util/status.cc
@@ -864,7 +874,6 @@ set(SOURCES
        utilities/checkpoint/checkpoint_impl.cc
        utilities/compaction_filters.cc
        utilities/compaction_filters/remove_emptyvalue_compactionfilter.cc
-        utilities/counted_fs.cc
        utilities/debug.cc
        utilities/env_mirror.cc
        utilities/env_timed.cc
@@ -1012,6 +1021,12 @@ set(ROCKSDB_SHARED_LIB rocksdb-shared${ARTIFACT_SUFFIX})

 option(ROCKSDB_BUILD_SHARED "Build shared versions of the RocksDB libraries" ON)

+option(WITH_LIBRADOS "Build with librados" OFF)
+if(WITH_LIBRADOS)
+  list(APPEND SOURCES
+    utilities/env_librados.cc)
+  list(APPEND THIRDPARTY_LIBS rados)
+endif()

 if(WIN32)
  set(SYSTEM_LIBS ${SYSTEM_LIBS} shlwapi.lib rpcrt4.lib)
@@ -1158,7 +1173,6 @@ if(WITH_TESTS)
        cache/cache_reservation_manager_test.cc
        cache/cache_test.cc
        cache/lru_cache_test.cc
-        cache/lru_secondary_cache_test.cc
        db/blob/blob_counting_iterator_test.cc
        db/blob/blob_file_addition_test.cc
        db/blob/blob_file_builder_test.cc
@@ -1187,7 +1201,6 @@ if(WITH_TESTS)
        db/db_compaction_filter_test.cc
        db/db_compaction_test.cc
        db/db_dynamic_level_test.cc
-        db/db_encryption_test.cc
        db/db_flush_test.cc
        db/db_inplace_update_test.cc
        db/db_io_failure_test.cc
@@ -1202,7 +1215,6 @@ if(WITH_TESTS)
        db/db_options_test.cc
        db/db_properties_test.cc
        db/db_range_del_test.cc
-        db/db_rate_limiter_test.cc
        db/db_secondary_test.cc
        db/db_sst_test.cc
        db/db_statistics_test.cc
@@ -1214,7 +1226,6 @@ if(WITH_TESTS)
        db/db_universal_compaction_test.cc
        db/db_wal_test.cc
        db/db_with_timestamp_compaction_test.cc
-        db/db_write_buffer_manager_test.cc
        db/db_write_test.cc
        db/dbformat_test.cc
        db/deletefile_test.cc
@@ -1226,7 +1237,6 @@ if(WITH_TESTS)
        db/file_indexer_test.cc
        db/filename_test.cc
        db/flush_job_test.cc
-        db/import_column_family_test.cc
        db/listener_test.cc
        db/log_test.cc
        db/manual_compaction_test.cc
@@ -1322,7 +1332,6 @@ if(WITH_TESTS)
        utilities/cassandra/cassandra_row_merge_test.cc
        utilities/cassandra/cassandra_serialize_test.cc
        utilities/checkpoint/checkpoint_test.cc
-        utilities/env_timed_test.cc
        utilities/memory/memory_test.cc
        utilities/merge_operators/string_append/stringappend_test.cc
        utilities/object_registry_test.cc
@@ -1336,15 +1345,16 @@ if(WITH_TESTS)
        utilities/transactions/optimistic_transaction_test.cc
        utilities/transactions/transaction_test.cc
        utilities/transactions/lock/point/point_lock_manager_test.cc
-        utilities/transactions/write_committed_transaction_ts_test.cc
        utilities/transactions/write_prepared_transaction_test.cc
        utilities/transactions/write_unprepared_transaction_test.cc
        utilities/transactions/lock/range/range_locking_test.cc
        utilities/ttl/ttl_test.cc
-        utilities/util_merge_operators_test.cc
        utilities/write_batch_with_index/write_batch_with_index_test.cc
    )
  endif()
+  if(WITH_LIBRADOS)
+    list(APPEND TESTS utilities/env_librados_test.cc)
+  endif()

  if(WITH_FOLLY_DISTRIBUTED_MUTEX)
    list(APPEND TESTS third-party/folly/folly/synchronization/test/DistributedMutexTest.cpp)
@@ -1384,6 +1394,10 @@ if(WITH_TESTS)
        gtest_discover_tests(${exename} DISCOVERY_TIMEOUT 120)
        add_dependencies(check ${exename}${ARTIFACT_SUFFIX})
      endif()
+      if("${exename}" MATCHES "env_librados_test")
+        # env_librados_test.cc uses librados directly
+        target_link_libraries(${exename}${ARTIFACT_SUFFIX} rados)
+      endif()
  endforeach(sourcefile ${TESTS})

  if(WIN32)
@@ -1,123 +1,34 @@
 # Rocksdb Change Log
-## 7.1.0 (03/23/2022)
-### New Features
-* Allow WriteBatchWithIndex to index a WriteBatch that includes keys with user-defined timestamps. The index itself does not have timestamp.
-* Add support for user-defined timestamps to write-committed transaction without API change. The `TransactionDB` layer APIs do not allow timestamps because we require that all user-defined-timestamps-aware operations go through the `Transaction` APIs.
-* Added BlobDB options to `ldb`
-* `BlockBasedTableOptions::detect_filter_construct_corruption` can now be dynamically configured using `DB::SetOptions`.
-* Automatically recover from retryable read IO errors during backgorund flush/compaction.
-* Experimental support for preserving file Temperatures through backup and restore, and for updating DB metadata for outside changes to file Temperature (`UpdateManifestForFilesState` or `ldb update_manifest --update_temperatures`).
-* Experimental support for async_io in ReadOptions which is used by FilePrefetchBuffer to prefetch some of the data asynchronously,  if reads are sequential and auto readahead is enabled by rocksdb internally.
-
+## 6.29.5 (03/29/2022)
 ### Bug Fixes
-* Fixed a major performance bug in which Bloom filters generated by pre-7.0 releases are not read by early 7.0.x releases (and vice-versa) due to changes to FilterPolicy::Name() in #9590. This can severely impact read performance and read I/O on upgrade or downgrade with existing DB, but not data correctness.
-* Fixed a data race on `versions_` between `DBImpl::ResumeImpl()` and threads waiting for recovery to complete (#9496)
-* Fixed a bug caused by race among flush, incoming writes and taking snapshots. Queries to snapshots created with these race condition can return incorrect result, e.g. resurfacing deleted data.
-* Fixed a bug that DB flush uses `options.compression` even `options.compression_per_level` is set.
-* Fixed a bug that DisableManualCompaction may assert when disable an unscheduled manual compaction.
-* Fix a race condition when cancel manual compaction with `DisableManualCompaction`. Also DB close can cancel the manual compaction thread.
-* Fixed a potential timer crash when open close DB concurrently.
 * Fixed a race condition for `alive_log_files_` in non-two-write-queues mode. The race is between the write_thread_ in WriteToWAL() and another thread executing `FindObsoleteFiles()`. The race condition will be caught if `__glibcxx_requires_nonempty` is enabled.
+* Fixed a race condition when mmaping a WritableFile on POSIX.
+* Fixed a race condition when 2PC is disabled and WAL tracking in the MANIFEST is enabled. The race condition is between two background flush threads trying to install flush results, causing a WAL deletion not tracked in the MANIFEST. A future DB open may fail.
+* Fixed a heap use-after-free race with DropColumnFamily.
+* Fixed a bug that `rocksdb.read.block.compaction.micros` cannot track compaction stats (#9722).
+
+## 6.29.4 (03/22/2022)
+### Bug Fixes
+* Fixed a bug caused by race among flush, incoming writes and taking snapshots. Queries to snapshots created with these race condition can return incorrect result, e.g. resurfacing deleted data.
+* Fixed a bug that DisableManualCompaction may assert when disable an unscheduled manual compaction.
 * Fixed a bug that `Iterator::Refresh()` reads stale keys after DeleteRange() performed.
 * Fixed a race condition when disable and re-enable manual compaction.
-* Fixed automatic error recovery failure in atomic flush.
-* Fixed a race condition when mmaping a WritableFile on POSIX.
-
-### Public API changes
-* Added pure virtual FilterPolicy::CompatibilityName(), which is needed for fixing major performance bug involving FilterPolicy naming in SST metadata without affecting Customizable aspect of FilterPolicy. This change only affects those with their own custom or wrapper FilterPolicy classes.
-* `options.compression_per_level` is dynamically changeable with `SetOptions()`.
-* Added `WriteOptions::rate_limiter_priority`. When set to something other than `Env::IO_TOTAL`, the internal rate limiter (`DBOptions::rate_limiter`) will be charged at the specified priority for writes associated with the API to which the `WriteOptions` was provided. Currently the support covers automatic WAL flushes, which happen during live updates (`Put()`, `Write()`, `Delete()`, etc.) when `WriteOptions::disableWAL == false` and `DBOptions::manual_wal_flush == false`.
-* Add DB::OpenAndTrimHistory API. This API will open DB and trim data to the timestamp specified by trim_ts (The data with timestamp larger than specified trim bound will be removed). This API should only be used at a timestamp-enabled column families recovery. If the column family doesn't have timestamp enabled, this API won't trim any data on that column family. This API is not compatible with avoid_flush_during_recovery option.
-* Remove BlockBasedTableOptions.hash_index_allow_collision which already takes no effect.
-
-## 7.0.0 (02/20/2022)
-### Bug Fixes
-* Fixed a major bug in which batched MultiGet could return old values for keys deleted by DeleteRange when memtable Bloom filter is enabled (memtable_prefix_bloom_size_ratio > 0). (The fix includes a substantial MultiGet performance improvement in the unusual case of both memtable_whole_key_filtering and prefix_extractor.)
-* Fixed more cases of EventListener::OnTableFileCreated called with OK status, file_size==0, and no SST file kept. Now the status is Aborted.
+* Fix a race condition when cancel manual compaction with `DisableManualCompaction`. Also DB close can cancel the manual compaction thread.
+* Fixed a data race on `versions_` between `DBImpl::ResumeImpl()` and threads waiting for recovery to complete (#9496)
 * Fixed a read-after-free bug in `DB::GetMergeOperands()`.
-* Fix a data loss bug for 2PC write-committed transaction caused by concurrent transaction commit and memtable switch (#9571).
 * Fixed NUM_INDEX_AND_FILTER_BLOCKS_READ_PER_LEVEL, NUM_DATA_BLOCKS_READ_PER_LEVEL, and NUM_SST_READ_PER_LEVEL stats to be reported once per MultiGet batch per level.

+## 6.29.3 (02/17/2022)
+### Bug Fixes
+* Fix a data loss bug for 2PC write-committed transaction caused by concurrent transaction commit and memtable switch (#9571).
+
+## 6.29.2 (02/15/2022)
 ### Performance Improvements
-* Mitigated the overhead of building the file location hash table used by the online LSM tree consistency checks, which can improve performance for certain workloads (see #9351).
-* Switched to using a sorted `std::vector` instead of `std::map` for storing the metadata objects for blob files, which can improve performance for certain workloads, especially when the number of blob files is high.
 * DisableManualCompaction() doesn't have to wait scheduled manual compaction to be executed in thread-pool to cancel the job.

-### Public API changes
-* Require C++17 compatible compiler (GCC >= 7, Clang >= 5, Visual Studio >= 2017) for compiling RocksDB and any code using RocksDB headers. See #9388.
-* Added `ReadOptions::rate_limiter_priority`. When set to something other than `Env::IO_TOTAL`, the internal rate limiter (`DBOptions::rate_limiter`) will be charged at the specified priority for file reads associated with the API to which the `ReadOptions` was provided.
-* Remove HDFS support from main repo.
-* Remove librados support from main repo.
-* Remove obsolete backupable_db.h and type alias `BackupableDBOptions`. Use backup_engine.h and `BackupEngineOptions`. Similar renamings are in the C and Java APIs.
-* Removed obsolete utility_db.h and `UtilityDB::OpenTtlDB`. Use db_ttl.h and `DBWithTTL::Open`.
-* Remove deprecated API DB::AddFile from main repo.
-* Remove deprecated API ObjectLibrary::Register() and the (now obsolete) Regex public API. Use ObjectLibrary::AddFactory() with PatternEntry instead.
-* Remove deprecated option DBOption::table_cache_remove_scan_count_limit.
-* Remove deprecated API AdvancedColumnFamilyOptions::soft_rate_limit.
-* Remove deprecated API AdvancedColumnFamilyOptions::hard_rate_limit.
-* Remove deprecated API DBOption::base_background_compactions.
-* Remove deprecated API DBOptions::purge_redundant_kvs_while_flush.
-* Remove deprecated overloads of API DB::CompactRange.
-* Remove deprecated option DBOptions::skip_log_error_on_recovery.
-* Remove ReadOptions::iter_start_seqnum which has been deprecated.
-* Remove DBOptions::preserved_deletes and DB::SetPreserveDeletesSequenceNumber().
-* Remove deprecated API AdvancedColumnFamilyOptions::rate_limit_delay_max_milliseconds.
-* Removed timestamp from WriteOptions. Accordingly, added to DB APIs Put, Delete, SingleDelete, etc. accepting an additional argument 'timestamp'. Added Put, Delete, SingleDelete, etc to WriteBatch accepting an additional argument 'timestamp'. Removed WriteBatch::AssignTimestamps(vector<Slice>) API. Renamed WriteBatch::AssignTimestamp() to WriteBatch::UpdateTimestamps() with clarified comments.
-* Changed type of cache buffer passed to `Cache::CreateCallback` from `void*` to `const void*`.
-* Significant updates to FilterPolicy-related APIs and configuration:
-  * Remove public API support for deprecated, inefficient block-based filter (use_block_based_builder=true).
-    * Old code and configuration strings that would enable it now quietly enable full filters instead, though any built-in FilterPolicy can still read block-based filters. This includes changing the longstanding default behavior of the Java API.
-    * Remove deprecated FilterPolicy::CreateFilter() and FilterPolicy::KeyMayMatch()
-    * Remove `rocksdb_filterpolicy_create()` from C API, as the only C API support for custom filter policies is now obsolete.
-    * If temporary memory usage in full filter creation is a problem, consider using partitioned filters, smaller SST files, or setting reserve_table_builder_memory=true.
-  * Remove support for "filter_policy=experimental_ribbon" configuration
-  string. Use something like "filter_policy=ribbonfilter:10" instead.
-  * Allow configuration string like "filter_policy=bloomfilter:10" without
-  bool, to minimize acknowledgement of obsolete block-based filter.
-  * Made FilterPolicy Customizable. Configuration of filter_policy is now accurately saved in OPTIONS file and can be loaded with LoadOptionsFromFile. (Loading an OPTIONS file generated by a previous version only enables reading and using existing filters, not generating new filters. Previously, no filter_policy would be configured from a saved OPTIONS file.)
-  * Change meaning of nullptr return from GetBuilderWithContext() from "use
-    block-based filter" to "generate no filter in this case."
-    * Also, when user specifies bits_per_key < 0.5, we now round this down
-    to "no filter" because we expect a filter with >= 80% FP rate is
-    unlikely to be worth the CPU cost of accessing it (esp with
-    cache_index_and_filter_blocks=1 or partition_filters=1).
-    * bits_per_key >= 0.5 and < 1.0 is still rounded up to 1.0 (for 62% FP
-    rate)
-  * Remove class definitions for FilterBitsBuilder and FilterBitsReader from
-    public API, so these can evolve more easily as implementation details.
-    Custom FilterPolicy can still decide what kind of built-in filter to use
-    under what conditions.
-  * Also removed deprecated functions
-    * FilterPolicy::GetFilterBitsBuilder()
-    * NewExperimentalRibbonFilterPolicy()
-  * Remove default implementations of
-    * FilterPolicy::GetBuilderWithContext()
-* Remove default implementation of Name() from FileSystemWrapper.
-* Rename `SizeApproximationOptions.include_memtabtles` to `SizeApproximationOptions.include_memtables`.
-* Remove deprecated option DBOptions::max_mem_compaction_level.
-* Return Status::InvalidArgument from ObjectRegistry::NewObject if a factory exists but the object ould not be created (returns NotFound if the factory is missing).
-* Remove deprecated overloads of API DB::GetApproximateSizes.
-* Remove deprecated option DBOptions::new_table_reader_for_compaction_inputs.
-* Add Transaction::SetReadTimestampForValidation() and Transaction::SetCommitTimestamp(). Default impl returns NotSupported().
-* Add support for decimal patterns to ObjectLibrary::PatternEntry
-* Remove deprecated remote compaction APIs `CompactionService::Start()` and `CompactionService::WaitForComplete()`. Please use `CompactionService::StartV2()`, `CompactionService::WaitForCompleteV2()` instead, which provides the same information plus extra data like priority, db_id, etc.
-* `ColumnFamilyOptions::OldDefaults` and `DBOptions::OldDefaults` are marked deprecated, as they are no longer maintained.
-* Add subcompaction callback APIs: `OnSubcompactionBegin()` and `OnSubcompactionCompleted()`.
-* Add file Temperature information to `FileOperationInfo` in event listener API.
-* Change the type of SizeApproximationFlags from enum to enum class. Also update the signature of DB::GetApproximateSizes API from uint8_t to SizeApproximationFlags.
-* Add Temperature hints information from RocksDB in API `NewSequentialFile()`. backup and checkpoint operations need to open the source files with `NewSequentialFile()`, which will have the temperature hints. Other operations are not covered.
-
-### Behavior Changes
-* Disallow the combination of DBOptions.use_direct_io_for_flush_and_compaction == true and DBOptions.writable_file_max_buffer_size == 0. This combination can cause WritableFileWriter::Append() to loop forever, and it does not make much sense in direct IO.
-* `ReadOptions::total_order_seek` no longer affects `DB::Get()`. The original motivation for this interaction has been obsolete since RocksDB has been able to detect whether the current prefix extractor is compatible with that used to generate table files, probably RocksDB 5.14.0.
-
-## New Features
-* Introduced an option `BlockBasedTableOptions::detect_filter_construct_corruption` for detecting corruption during Bloom Filter (format_version >= 5) and Ribbon Filter construction.
-* Improved the SstDumpTool to read the comparator from table properties and use it to read the SST File.
-* Extended the column family statistics in the info log so the total amount of garbage in the blob files and the blob file space amplification factor are also logged. Also exposed the blob file space amp via the `rocksdb.blob-stats` DB property.
-* Introduced the API rocksdb_create_dir_if_missing in c.h that calls underlying file system's CreateDirIfMissing API to create the directory.
-* Added last level and non-last level read statistics: `LAST_LEVEL_READ_*`, `NON_LAST_LEVEL_READ_*`.
-* Experimental: Add support for new APIs ReadAsync in FSRandomAccessFile that reads the data asynchronously and Poll API in FileSystem that checks if requested read request has completed or not. ReadAsync takes a callback function. Poll API checks for completion of read IO requests and  should call callback functions to indicate completion of read requests.
+## 6.29.1 (01/31/2022)
+### Bug Fixes
+* Fixed a major bug in which batched MultiGet could return old values for keys deleted by DeleteRange when memtable Bloom filter is enabled (memtable_prefix_bloom_size_ratio > 0). (The fix includes a substantial MultiGet performance improvement in the unusual case of both memtable_whole_key_filtering and prefix_extractor.)

 ## 6.29.0 (01/21/2022)
 Note: The next release will be major release 7.0. See https://github.com/facebook/rocksdb/issues/9390 for more info.
@@ -129,7 +40,6 @@ Note: The next release will be major release 7.0. See https://github.com/faceboo
 * Add ObjectLibrary::AddFactory and ObjectLibrary::PatternEntry classes.  This method and associated class are the preferred mechanism for registering factories with the ObjectLibrary going forward.  The ObjectLibrary::Register method, which uses regular expressions and may be problematic, is deprecated and will be in a future release.
 * Changed `BlockBasedTableOptions::block_size` from `size_t` to `uint64_t`.
 * Added API warning against using `Iterator::Refresh()` together with `DB::DeleteRange()`, which are incompatible and have always risked causing the refreshed iterator to return incorrect results.
-* Made `AdvancedColumnFamilyOptions.bottommost_temperature` dynamically changeable with `SetOptions()`.

 ### Behavior Changes
 * `DB::DestroyColumnFamilyHandle()` will return Status::InvalidArgument() if called with `DB::DefaultColumnFamily()`.
@@ -145,7 +55,6 @@ Note: The next release will be major release 7.0. See https://github.com/faceboo
 * Fix a bug that FlushMemTable may return ok even flush not succeed.
 * Fixed a bug of Sync() and Fsync() not using `fcntl(F_FULLFSYNC)` on OS X and iOS.
 * Fixed a significant performance regression in version 6.26 when a prefix extractor is used on the read path (Seek, Get, MultiGet). (Excessive time was spent in SliceTransform::AsString().)
-* Fixed a race condition in SstFileManagerImpl error recovery code that can cause a crash during process shutdown.

 ### New Features
 * Added RocksJava support for MacOS universal binary (ARM+x86)
@@ -6,7 +6,7 @@ than release mode.

 RocksDB's library should be able to compile without any dependency installed,
 although we recommend installing some compression libraries (see below).
-We do depend on newer gcc/clang with C++17 support (GCC >= 7, Clang >= 5).
+We do depend on newer gcc/clang with C++11 support.

 There are few options when compiling RocksDB:

@@ -47,12 +47,10 @@ to build a portable binary, add `PORTABLE=1` before your make commands, like thi

 * If you wish to build the RocksJava static target, then cmake is required for building Snappy.

-* If you wish to run microbench (e.g, `make microbench`, `make ribbon_bench` or `cmake -DWITH_BENCHMARK=1`), Google benchmark < 1.6.0 is needed.
-
 ## Supported platforms

 * **Linux - Ubuntu**
-    * Upgrade your gcc to version at least 7 to get C++17 support.
+    * Upgrade your gcc to version at least 4.8 to get C++11 support.
    * Install gflags. First, try: `sudo apt-get install libgflags-dev`
      If this doesn't work and you're using Ubuntu, here's a nice tutorial:
      (http://askubuntu.com/questions/312173/installing-gflags-12-04)
@@ -64,7 +62,8 @@ to build a portable binary, add `PORTABLE=1` before your make commands, like thi
    * Install zstandard: `sudo apt-get install libzstd-dev`.

 * **Linux - CentOS / RHEL**
-    * Upgrade your gcc to version at least 7 to get C++17 support
+    * Upgrade your gcc to version at least 4.8 to get C++11 support:
+      `yum install gcc48-c++`
    * Install gflags:

              git clone https://github.com/gflags/gflags.git
@@ -114,11 +113,11 @@ to build a portable binary, add `PORTABLE=1` before your make commands, like thi
              make && sudo make install

 * **OS X**:
-    * Install latest C++ compiler that supports C++ 17:
+    * Install latest C++ compiler that supports C++ 11:
        * Update XCode:  run `xcode-select --install` (or install it from XCode App's settting).
        * Install via [homebrew](http://brew.sh/).
            * If you're first time developer in MacOS, you still need to run: `xcode-select --install` in your command line.
-            * run `brew tap homebrew/versions; brew install gcc7 --use-llvm` to install gcc 7 (or higher).
+            * run `brew tap homebrew/versions; brew install gcc48 --use-llvm` to install gcc 4.8 (or higher).
    * run `brew install rocksdb`

 * **FreeBSD** (11.01):
@@ -161,7 +160,7 @@ to build a portable binary, add `PORTABLE=1` before your make commands, like thi

    * Install the dependencies for RocksDB:

-        pkg_add gmake gflags snappy bzip2 lz4 zstd git jdk bash findutils gnuwatch
+        pkg_add gmake gflags snappy bzip2 lz4 zstd git jdk bash findutils gnuwatch 

    * Build RocksDB from source:

@@ -183,13 +182,13 @@ to build a portable binary, add `PORTABLE=1` before your make commands, like thi
 * **Windows**:
  * For building with MS Visual Studio 13 you will need Update 4 installed.
  * Read and follow the instructions at CMakeLists.txt
-  * Or install via [vcpkg](https://github.com/microsoft/vcpkg)
+  * Or install via [vcpkg](https://github.com/microsoft/vcpkg) 
       * run `vcpkg install rocksdb:x64-windows`

 * **AIX 6.1**
    * Install AIX Toolbox rpms with gcc
    * Use these environment variables:
-
+  
             export PORTABLE=1
             export CC=gcc
             export AR="ar -X64"
@@ -200,9 +199,9 @@ to build a portable binary, add `PORTABLE=1` before your make commands, like thi
             export LIBPATH=/opt/freeware/lib
             export JAVA_HOME=/usr/java8_64
             export PATH=/opt/freeware/bin:$PATH
-
+  
 * **Solaris Sparc**
-    * Install GCC 7 and higher.
+    * Install GCC 4.8.2 and higher.
    * Use these environment variables:

             export CC=gcc
@@ -211,3 +210,4 @@ to build a portable binary, add `PORTABLE=1` before your make commands, like thi
             export EXTRA_LDFLAGS=-m64
             export PORTABLE=1
             export PLATFORM_LDFLAGS="-static-libstdc++ -static-libgcc"
+
@@ -8,7 +8,11 @@

 BASH_EXISTS := $(shell which bash)
 SHELL := $(shell which bash)
-include python.mk
+# Default to python3. Some distros like CentOS 8 do not have `python`.
+ifeq ($(origin PYTHON), undefined)
+	PYTHON := $(shell which python3 || which python || echo python3)
+endif
+export PYTHON

 CLEAN_FILES = # deliberately empty, so we can append below.
 CFLAGS += ${EXTRA_CFLAGS}
@@ -210,8 +214,14 @@ am__v_AR_ = $(am__v_AR_$(AM_DEFAULT_VERBOSITY))
 am__v_AR_0 = @echo "  AR      " $@;
 am__v_AR_1 =

+ifdef ROCKSDB_USE_LIBRADOS
+LIB_SOURCES += utilities/env_librados.cc
+TEST_MAIN_SOURCES += utilities/env_librados_test.cc
+LDFLAGS += -lrados
+endif
+
 AM_LINK = $(AM_V_CCLD)$(CXX) -L. $(patsubst lib%.a, -l%, $(patsubst lib%.$(PLATFORM_SHARED_EXT), -l%, $^)) $(EXEC_LDFLAGS) -o $@ $(LDFLAGS) $(COVERAGEFLAGS)
-AM_SHARE = $(AM_V_CCLD) $(CXX) $(PLATFORM_SHARED_LDFLAGS)$@ -L. $(patsubst lib%.$(PLATFORM_SHARED_EXT), -l%, $^) $(EXEC_LDFLAGS) $(LDFLAGS) -o $@
+AM_SHARE = $(AM_V_CCLD) $(CXX) $(PLATFORM_SHARED_LDFLAGS)$@ -L. $(patsubst lib%.$(PLATFORM_SHARED_EXT), -l%, $^) $(LDFLAGS) -o $@

 # Detect what platform we're building on.
 # Export some common variables that might have been passed as Make variables
@@ -225,7 +235,6 @@ dummy := $(shell (export ROCKSDB_ROOT="$(CURDIR)"; \
                  export PORTABLE="$(PORTABLE)"; \
                  export ROCKSDB_NO_FBCODE="$(ROCKSDB_NO_FBCODE)"; \
                  export USE_CLANG="$(USE_CLANG)"; \
-                  export LIB_MODE="$(LIB_MODE)"; \
                  "$(CURDIR)/build_tools/build_detect_platform" "$(CURDIR)/make_config.mk"))
 # this file is generated by the previous line to set build flags and sources
 include make_config.mk
@@ -235,19 +244,9 @@ include $(ROCKSDB_PLUGIN_MKS)
 ROCKSDB_PLUGIN_SOURCES = $(foreach plugin, $(ROCKSDB_PLUGINS), $(foreach source, $($(plugin)_SOURCES), plugin/$(plugin)/$(source)))
 ROCKSDB_PLUGIN_HEADERS = $(foreach plugin, $(ROCKSDB_PLUGINS), $(foreach header, $($(plugin)_HEADERS), plugin/$(plugin)/$(header)))
 ROCKSDB_PLUGIN_PKGCONFIG_REQUIRES = $(foreach plugin, $(ROCKSDB_PLUGINS), $($(plugin)_PKGCONFIG_REQUIRES))
+PLATFORM_LDFLAGS += $(foreach plugin, $(ROCKSDB_PLUGINS), $($(plugin)_LDFLAGS))
 CXXFLAGS += $(foreach plugin, $(ROCKSDB_PLUGINS), $($(plugin)_CXXFLAGS))

-# Patch up the link flags for JNI from the plugins
-ROCKSDB_PLUGIN_LDFLAGS = $(foreach plugin, $(ROCKSDB_PLUGINS), $($(plugin)_LDFLAGS))
-PLATFORM_LDFLAGS += $(ROCKSDB_PLUGIN_LDFLAGS)
-JAVA_LDFLAGS += $(ROCKSDB_PLUGIN_LDFLAGS)
-JAVA_STATIC_LDFLAGS += $(ROCKSDB_PLUGIN_LDFLAGS)
-
-# Patch up the list of java native sources with files from the plugins
-ROCKSDB_PLUGIN_JNI_NATIVE_SOURCES = $(foreach plugin, $(ROCKSDB_PLUGINS), $(foreach source, $($(plugin)_JNI_NATIVE_SOURCES), plugin/$(plugin)/$(source)))
-ALL_JNI_NATIVE_SOURCES = $(JNI_NATIVE_SOURCES) $(ROCKSDB_PLUGIN_JNI_NATIVE_SOURCES)
-ROCKSDB_PLUGIN_JNI_CXX_INCLUDEFLAGS = $(foreach plugin, $(ROCKSDB_PLUGINS), -I./plugin/$(plugin))
-
 ifneq ($(strip $(ROCKSDB_PLUGIN_PKGCONFIG_REQUIRES)),)
 LDFLAGS := $(LDFLAGS) $(shell pkg-config --libs $(ROCKSDB_PLUGIN_PKGCONFIG_REQUIRES))
 ifneq ($(.SHELLSTATUS),0)
@@ -507,11 +506,6 @@ endif
 CFLAGS += $(C_WARNING_FLAGS) $(WARNING_FLAGS) -I. -I./include $(PLATFORM_CCFLAGS) $(OPT)
 CXXFLAGS += $(WARNING_FLAGS) -I. -I./include $(PLATFORM_CXXFLAGS) $(OPT) -Woverloaded-virtual -Wnon-virtual-dtor -Wno-missing-field-initializers

-# Allow offsetof to work on non-standard layout types. Some compiler could
-# completely reject our usage of offsetof, but we will solve that when it
-# happens.
-CXXFLAGS += -Wno-invalid-offsetof
-
 LDFLAGS += $(PLATFORM_LDFLAGS)

 LIB_OBJECTS = $(patsubst %.cc, $(OBJ_DIR)/%.o, $(LIB_SOURCES))
@@ -565,9 +559,9 @@ endif
 # dependencies
 ifneq ($(filter check-headers, $(MAKECMDGOALS)),)
 # TODO: add/support JNI headers
-	DEV_HEADER_DIRS := $(sort include/ $(dir $(ALL_SOURCES)))
+	DEV_HEADER_DIRS := $(sort include/ hdfs/ $(dir $(ALL_SOURCES)))
 # Some headers like in port/ are platform-specific
-	DEV_HEADERS := $(shell $(FIND) $(DEV_HEADER_DIRS) -type f -name '*.h' | egrep -v 'port/|plugin/|lua/|range_tree/')
+	DEV_HEADERS := $(shell $(FIND) $(DEV_HEADER_DIRS) -type f -name '*.h' | egrep -v 'port/|plugin/|lua/|range_tree/|tools/rdb/db_wrapper.h|include/rocksdb/utilities/env_librados.h')
 else
 	DEV_HEADERS :=
 endif
@@ -586,29 +580,27 @@ check-headers: $(HEADER_OK_FILES)

 # options_settable_test doesn't pass with UBSAN as we use hack in the test
 ifdef COMPILE_WITH_UBSAN
-TESTS := $(shell echo $(TESTS) | sed 's/\boptions_settable_test\b//g')
+        TESTS := $(shell echo $(TESTS) | sed 's/\boptions_settable_test\b//g')
 endif
 ifdef ASSERT_STATUS_CHECKED
-# TODO: finish fixing all tests to pass this check
-TESTS_FAILING_ASC = \
-	c_test \
-	env_test \
-	range_locking_test \
-	testutil_test \
+	# TODO: finish fixing all tests to pass this check
+	TESTS_FAILING_ASC = \
+		c_test \
+		env_test \
+		range_locking_test \
+		testutil_test \

-# Since we have very few ASC exclusions left, excluding them from
-# the build is the most convenient way to exclude them from testing
-TESTS := $(filter-out $(TESTS_FAILING_ASC),$(TESTS))
+	# Since we have very few ASC exclusions left, excluding them from
+	# the build is the most convenient way to exclude them from testing
+	TESTS := $(filter-out $(TESTS_FAILING_ASC),$(TESTS))
 endif

 ROCKSDBTESTS_SUBSET ?= $(TESTS)

-# c_test - doesn't use gtest
 # env_test - suspicious use of test::TmpDir
 # deletefile_test - serial because it generates giant temporary files in
 #   its various tests. Parallel can fill up your /dev/shm
 NON_PARALLEL_TEST = \
-	c_test \
 	env_test \
 	deletefile_test \

@@ -789,9 +781,7 @@ endif  # PLATFORM_SHARED_EXT
 	blackbox_crash_test_with_atomic_flush whitebox_crash_test_with_atomic_flush  \
 	blackbox_crash_test_with_txn whitebox_crash_test_with_txn \
 	blackbox_crash_test_with_best_efforts_recovery \
-	blackbox_crash_test_with_ts whitebox_crash_test_with_ts \
-	blackbox_crash_test_with_multiops_wc_txn \
-	blackbox_crash_test_with_multiops_wp_txn
+	blackbox_crash_test_with_ts whitebox_crash_test_with_ts


 all: $(LIBRARY) $(BENCHMARKS) tools tools_lib test_libs $(TESTS)
@@ -813,8 +803,6 @@ test_libs: $(TEST_LIBS)
 benchmarks: $(BENCHMARKS)

 microbench: $(MICROBENCHS)
-
-run_microbench: $(MICROBENCHS)
 	for t in $(MICROBENCHS); do echo "===== Running benchmark $$t (`date`)"; ./$$t || exit 1; done;

 dbg: $(LIBRARY) $(BENCHMARKS) tools $(TESTS)
@@ -870,7 +858,7 @@ endif

 parallel_tests = $(patsubst %,parallel_%,$(PARALLEL_TEST))
 .PHONY: gen_parallel_tests $(parallel_tests)
-$(parallel_tests):
+$(parallel_tests): $(PARALLEL_TEST)
 	$(AM_V_at)TEST_BINARY=$(patsubst parallel_%,%,$@); \
  TEST_NAMES=` \
    (./$$TEST_BINARY --gtest_list_tests || echo "  $${TEST_BINARY}__list_tests_failure") \
@@ -909,7 +897,7 @@ gen_parallel_tests:
 # 107.816 PASS t/DBTest.EncodeDecompressedBlockSizeTest
 #
 slow_test_regexp = \
-	^.*MySQLStyleTransactionTest.*$$|^.*SnapshotConcurrentAccessTest.*$$|^.*SeqAdvanceConcurrentTest.*$$|^t/run-table_test-HarnessTest.Randomized$$|^t/run-db_test-.*(?:FileCreationRandomFailure|EncodeDecompressedBlockSizeTest)$$|^.*RecoverFromCorruptedWALWithoutFlush$$
+	^.*SnapshotConcurrentAccessTest.*$$|^.*SeqAdvanceConcurrentTest.*$$|^t/run-table_test-HarnessTest.Randomized$$|^t/run-db_test-.*(?:FileCreationRandomFailure|EncodeDecompressedBlockSizeTest)$$|^.*RecoverFromCorruptedWALWithoutFlush$$
 prioritize_long_running_tests =						\
  perl -pe 's,($(slow_test_regexp)),100 $$1,'				\
    | sort -k1,1gr							\
@@ -1029,34 +1017,92 @@ check_some: $(ROCKSDBTESTS_SUBSET)
 ldb_tests: ldb
 	$(PYTHON) tools/ldb_test.py

-include crash_test.mk
+crash_test:
+# Do not parallelize
+	$(MAKE) whitebox_crash_test
+	$(MAKE) blackbox_crash_test
+
+crash_test_with_atomic_flush:
+# Do not parallelize
+	$(MAKE) whitebox_crash_test_with_atomic_flush
+	$(MAKE) blackbox_crash_test_with_atomic_flush
+
+crash_test_with_txn:
+# Do not parallelize
+	$(MAKE) whitebox_crash_test_with_txn
+	$(MAKE) blackbox_crash_test_with_txn
+
+crash_test_with_best_efforts_recovery: blackbox_crash_test_with_best_efforts_recovery
+
+crash_test_with_ts:
+# Do not parallelize
+	$(MAKE) whitebox_crash_test_with_ts
+	$(MAKE) blackbox_crash_test_with_ts
+
+blackbox_crash_test: db_stress
+	$(PYTHON) -u tools/db_crashtest.py --simple blackbox $(CRASH_TEST_EXT_ARGS)
+	$(PYTHON) -u tools/db_crashtest.py blackbox $(CRASH_TEST_EXT_ARGS)
+
+blackbox_crash_test_with_atomic_flush: db_stress
+	$(PYTHON) -u tools/db_crashtest.py --cf_consistency blackbox $(CRASH_TEST_EXT_ARGS)
+
+blackbox_crash_test_with_txn: db_stress
+	$(PYTHON) -u tools/db_crashtest.py --txn blackbox $(CRASH_TEST_EXT_ARGS)
+
+blackbox_crash_test_with_best_efforts_recovery: db_stress
+	$(PYTHON) -u tools/db_crashtest.py --test_best_efforts_recovery blackbox $(CRASH_TEST_EXT_ARGS)
+
+blackbox_crash_test_with_ts: db_stress
+	$(PYTHON) -u tools/db_crashtest.py --enable_ts blackbox $(CRASH_TEST_EXT_ARGS)
+
+ifeq ($(CRASH_TEST_KILL_ODD),)
+  CRASH_TEST_KILL_ODD=888887
+endif
+
+whitebox_crash_test: db_stress
+	$(PYTHON) -u tools/db_crashtest.py --simple whitebox --random_kill_odd \
+      $(CRASH_TEST_KILL_ODD) $(CRASH_TEST_EXT_ARGS)
+	$(PYTHON) -u tools/db_crashtest.py whitebox  --random_kill_odd \
+      $(CRASH_TEST_KILL_ODD) $(CRASH_TEST_EXT_ARGS)
+
+whitebox_crash_test_with_atomic_flush: db_stress
+	$(PYTHON) -u tools/db_crashtest.py --cf_consistency whitebox  --random_kill_odd \
+      $(CRASH_TEST_KILL_ODD) $(CRASH_TEST_EXT_ARGS)
+
+whitebox_crash_test_with_txn: db_stress
+	$(PYTHON) -u tools/db_crashtest.py --txn whitebox --random_kill_odd \
+      $(CRASH_TEST_KILL_ODD) $(CRASH_TEST_EXT_ARGS)
+
+whitebox_crash_test_with_ts: db_stress
+	$(PYTHON) -u tools/db_crashtest.py --enable_ts whitebox --random_kill_odd \
+      $(CRASH_TEST_KILL_ODD) $(CRASH_TEST_EXT_ARGS)

 asan_check: clean
-	ASAN_OPTIONS=detect_stack_use_after_return=1 COMPILE_WITH_ASAN=1 $(MAKE) check -j32
+	COMPILE_WITH_ASAN=1 $(MAKE) check -j32
 	$(MAKE) clean

 asan_crash_test: clean
-	ASAN_OPTIONS=detect_stack_use_after_return=1 COMPILE_WITH_ASAN=1 $(MAKE) crash_test
+	COMPILE_WITH_ASAN=1 $(MAKE) crash_test
 	$(MAKE) clean

 whitebox_asan_crash_test: clean
-	ASAN_OPTIONS=detect_stack_use_after_return=1 COMPILE_WITH_ASAN=1 $(MAKE) whitebox_crash_test
+	COMPILE_WITH_ASAN=1 $(MAKE) whitebox_crash_test
 	$(MAKE) clean

 blackbox_asan_crash_test: clean
-	ASAN_OPTIONS=detect_stack_use_after_return=1 COMPILE_WITH_ASAN=1 $(MAKE) blackbox_crash_test
+	COMPILE_WITH_ASAN=1 $(MAKE) blackbox_crash_test
 	$(MAKE) clean

 asan_crash_test_with_atomic_flush: clean
-	ASAN_OPTIONS=detect_stack_use_after_return=1 COMPILE_WITH_ASAN=1 $(MAKE) crash_test_with_atomic_flush
+	COMPILE_WITH_ASAN=1 $(MAKE) crash_test_with_atomic_flush
 	$(MAKE) clean

 asan_crash_test_with_txn: clean
-	ASAN_OPTIONS=detect_stack_use_after_return=1 COMPILE_WITH_ASAN=1 $(MAKE) crash_test_with_txn
+	COMPILE_WITH_ASAN=1 $(MAKE) crash_test_with_txn
 	$(MAKE) clean

 asan_crash_test_with_best_efforts_recovery: clean
-	ASAN_OPTIONS=detect_stack_use_after_return=1 COMPILE_WITH_ASAN=1 $(MAKE) crash_test_with_best_efforts_recovery
+	COMPILE_WITH_ASAN=1 $(MAKE) crash_test_with_best_efforts_recovery
 	$(MAKE) clean

 ubsan_check: clean
@@ -1179,7 +1225,7 @@ analyze_incremental:
 	$(CLANG_SCAN_BUILD) --use-analyzer=$(CLANG_ANALYZER) \
 		--use-c++=$(CXX) --use-cc=$(CC) --status-bugs \
 		-o $(CURDIR)/scan_build_report \
-		$(MAKE) SKIP_LINK=1 dbg
+		$(MAKE) dbg

 CLEAN_FILES += unity.cc
 unity.cc: Makefile util/build_version.cc.in
@@ -1485,9 +1531,6 @@ db_options_test: $(OBJ_DIR)/db/db_options_test.o $(TEST_LIBRARY) $(LIBRARY)
 db_range_del_test: $(OBJ_DIR)/db/db_range_del_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)

-db_rate_limiter_test: $(OBJ_DIR)/db/db_rate_limiter_test.o $(TEST_LIBRARY) $(LIBRARY)
-	$(AM_LINK)
-
 db_sst_test: $(OBJ_DIR)/db/db_sst_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)

@@ -1569,6 +1612,11 @@ env_mirror_test: $(OBJ_DIR)/utilities/env_mirror_test.o $(TEST_LIBRARY) $(LIBRAR
 env_timed_test: $(OBJ_DIR)/utilities/env_timed_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)

+ifdef ROCKSDB_USE_LIBRADOS
+env_librados_test: $(OBJ_DIR)/utilities/env_librados_test.o $(TEST_LIBRARY) $(LIBRARY)
+	$(AM_LINK)
+endif
+
 object_registry_test: $(OBJ_DIR)/utilities/object_registry_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)

@@ -1806,9 +1854,6 @@ point_lock_manager_test: utilities/transactions/lock/point/point_lock_manager_te
 transaction_test: $(OBJ_DIR)/utilities/transactions/transaction_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)

-write_committed_transaction_ts_test: $(OBJ_DIR)/utilities/transactions/write_committed_transaction_ts_test.o $(TEST_LIBRARY) $(LIBRARY)
-	$(AM_LINK)
-
 write_prepared_transaction_test: $(OBJ_DIR)/utilities/transactions/write_prepared_transaction_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)

@@ -1842,9 +1887,6 @@ statistics_test: $(OBJ_DIR)/monitoring/statistics_test.o $(TEST_LIBRARY) $(LIBRA
 stats_history_test: $(OBJ_DIR)/monitoring/stats_history_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)

-lru_secondary_cache_test: $(OBJ_DIR)/cache/lru_secondary_cache_test.o $(TEST_LIBRARY) $(LIBRARY)
-	$(AM_LINK)
-
 lru_cache_test: $(OBJ_DIR)/cache/lru_cache_test.o $(TEST_LIBRARY) $(LIBRARY)
 	$(AM_LINK)

@@ -2046,7 +2088,7 @@ SHA256_CMD = sha256sum

 ZLIB_VER ?= 1.2.11
 ZLIB_SHA256 ?= c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
-ZLIB_DOWNLOAD_BASE ?= http://zlib.net
+ZLIB_DOWNLOAD_BASE ?= https://zlib.net/fossils
 BZIP2_VER ?= 1.0.8
 BZIP2_SHA256 ?= ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269
 BZIP2_DOWNLOAD_BASE ?= http://sourceware.org/pub/bzip2
@@ -2212,7 +2254,7 @@ rocksdbjavastaticosx_ub: rocksdbjavastaticosx_archs
 	cd java/target/classes; $(JAR_CMD) -uf ../$(ROCKSDB_JAR) org/rocksdb/*.class org/rocksdb/util/*.class
 	openssl sha1 java/target/$(ROCKSDB_JAR) | sed 's/.*= \([0-9a-f]*\)/\1/' > java/target/$(ROCKSDB_JAR).sha1

-rocksdbjavastaticosx_archs:
+rocksdbjavastaticosx_archs: 
 	$(MAKE) rocksdbjavastaticosx_arch_x86_64
 	$(MAKE) rocksdbjavastaticosx_arch_arm64

@@ -2237,7 +2279,7 @@ rocksdbjavastatic_javalib:
 	cd java; SHA256_CMD='$(SHA256_CMD)' $(MAKE) javalib
 	rm -f java/target/$(ROCKSDBJNILIB)
 	$(CXX) $(CXXFLAGS) -I./java/. $(JAVA_INCLUDE) -shared -fPIC \
-	  -o ./java/target/$(ROCKSDBJNILIB) $(ALL_JNI_NATIVE_SOURCES) \
+	  -o ./java/target/$(ROCKSDBJNILIB) $(JNI_NATIVE_SOURCES) \
 	  $(LIB_OBJECTS) $(COVERAGEFLAGS) \
 	  $(JAVA_COMPRESSIONS) $(JAVA_STATIC_LDFLAGS)
 	cd java/target;if [ "$(DEBUG_LEVEL)" == "0" ]; then \
@@ -2293,7 +2335,7 @@ rocksdbjavastaticdockerarm64v8:

 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
+	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:centos7_s390x-be /rocksdb-host/java/crossbuild/docker-build-linux-centos.sh

 rocksdbjavastaticdockerx86musl:
 	mkdir -p java/target
@@ -2350,7 +2392,7 @@ ifeq ($(JAVA_HOME),)
 endif
 	$(AM_V_GEN)cd java; SHA256_CMD='$(SHA256_CMD)' $(MAKE) javalib;
 	$(AM_V_at)rm -f ./java/target/$(ROCKSDBJNILIB)
-	$(AM_V_at)$(CXX) $(CXXFLAGS) -I./java/. -I./java/rocksjni $(JAVA_INCLUDE) $(ROCKSDB_PLUGIN_JNI_CXX_INCLUDEFLAGS) -shared -fPIC -o ./java/target/$(ROCKSDBJNILIB) $(ALL_JNI_NATIVE_SOURCES) $(LIB_OBJECTS) $(JAVA_LDFLAGS) $(COVERAGEFLAGS)
+	$(AM_V_at)$(CXX) $(CXXFLAGS) -I./java/. $(JAVA_INCLUDE) -shared -fPIC -o ./java/target/$(ROCKSDBJNILIB) $(JNI_NATIVE_SOURCES) $(LIB_OBJECTS) $(JAVA_LDFLAGS) $(COVERAGEFLAGS)
 	$(AM_V_at)cd java; $(JAR_CMD) -cf target/$(ROCKSDB_JAR) HISTORY*.md
 	$(AM_V_at)cd java/target; $(JAR_CMD) -uf $(ROCKSDB_JAR) $(ROCKSDBJNILIB)
 	$(AM_V_at)cd java/target/classes; $(JAR_CMD) -uf ../$(ROCKSDB_JAR) org/rocksdb/*.class org/rocksdb/util/*.class
@@ -2472,9 +2514,6 @@ endif
 build_subset_tests: $(ROCKSDBTESTS_SUBSET)
 	$(AM_V_GEN)if [ -n "$${ROCKSDBTESTS_SUBSET_TESTS_TO_FILE}" ]; then echo "$(ROCKSDBTESTS_SUBSET)" > "$${ROCKSDBTESTS_SUBSET_TESTS_TO_FILE}"; else echo "$(ROCKSDBTESTS_SUBSET)"; fi

-list_all_tests:
-	echo "$(ROCKSDBTESTS_SUBSET)"
-
 # Remove the rules for which dependencies should not be generated and see if any are left.
 #If so, include the dependencies; if not, do not include the dependency files
 ROCKS_DEP_RULES=$(filter-out clean format check-format check-buck-targets check-headers check-sources jclean jtest package analyze tags rocksdbjavastatic% unity.% unity_test, $(MAKECMDGOALS))
@@ -1,6 +1,4 @@
 This is the list of all known third-party plugins for RocksDB. If something is missing, please open a pull request to add it.

 * [Dedupfs](https://github.com/ajkr/dedupfs): an example for plugin developers to reference
-* [HDFS](https://github.com/riversand963/rocksdb-hdfs-env): an Env used for interacting with HDFS. Migrated from main RocksDB repo
 * [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.
@@ -121,8 +121,6 @@ LzLabs is using RocksDB as a storage engine in their multi-database distributed
 ## Kafka
 [Kafka](https://kafka.apache.org/) is an open-source distributed event streaming platform, it uses RocksDB to store state in Kafka Streams: https://www.confluent.io/blog/how-to-tune-rocksdb-kafka-streams-state-stores-performance/.

-## Solana Labs
-[Solana](https://github.com/solana-labs/solana) is a fast, secure, scalable, and decentralized blockchain.  It uses RocksDB as the underlying storage for its ledger store.
-
 ## Others
 More databases using RocksDB can be found at [dbdb.io](https://dbdb.io/browse?embeds=rocksdb).
+
@@ -0,0 +1,74 @@
+version: 1.0.{build}
+
+image: Visual Studio 2019
+
+environment:
+  JAVA_HOME: C:\Program Files\Java\jdk1.8.0
+  THIRDPARTY_HOME: $(APPVEYOR_BUILD_FOLDER)\thirdparty
+  SNAPPY_HOME: $(THIRDPARTY_HOME)\snappy-1.1.7
+  SNAPPY_INCLUDE: $(SNAPPY_HOME);$(SNAPPY_HOME)\build
+  SNAPPY_LIB_DEBUG: $(SNAPPY_HOME)\build\Debug\snappy.lib
+  SNAPPY_LIB_RELEASE: $(SNAPPY_HOME)\build\Release\snappy.lib
+  LZ4_HOME: $(THIRDPARTY_HOME)\lz4-1.8.3
+  LZ4_INCLUDE: $(LZ4_HOME)\lib
+  LZ4_LIB_DEBUG: $(LZ4_HOME)\visual\VS2010\bin\x64_Debug\liblz4_static.lib
+  LZ4_LIB_RELEASE: $(LZ4_HOME)\visual\VS2010\bin\x64_Release\liblz4_static.lib
+  ZSTD_HOME: $(THIRDPARTY_HOME)\zstd-1.4.0
+  ZSTD_INCLUDE: $(ZSTD_HOME)\lib;$(ZSTD_HOME)\lib\dictBuilder
+  ZSTD_LIB_DEBUG: $(ZSTD_HOME)\build\VS2010\bin\x64_Debug\libzstd_static.lib
+  ZSTD_LIB_RELEASE: $(ZSTD_HOME)\build\VS2010\bin\x64_Release\libzstd_static.lib
+  matrix:
+    - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
+      CMAKE_GENERATOR: Visual Studio 14 Win64
+      DEV_ENV: C:\Program Files (x86)\Microsoft Visual Studio 14.0\Common7\IDE\devenv.com
+
+install:
+  - md %THIRDPARTY_HOME%
+  - echo "Building Snappy dependency..."
+  - cd %THIRDPARTY_HOME%
+  - curl --fail --silent --show-error --output snappy-1.1.7.zip --location https://github.com/google/snappy/archive/1.1.7.zip
+  - unzip snappy-1.1.7.zip
+  - cd snappy-1.1.7
+  - mkdir build
+  - cd build
+  - if DEFINED CMAKE_PLATEFORM_NAME (set "PLATEFORM_OPT=-A %CMAKE_PLATEFORM_NAME%")
+  - cmake .. -G "%CMAKE_GENERATOR%" %PLATEFORM_OPT%
+  - msbuild Snappy.sln /p:Configuration=Debug /p:Platform=x64
+  - msbuild Snappy.sln /p:Configuration=Release /p:Platform=x64
+  - echo "Building LZ4 dependency..."
+  - cd %THIRDPARTY_HOME%
+  - curl --fail --silent --show-error --output lz4-1.8.3.zip --location https://github.com/lz4/lz4/archive/v1.8.3.zip
+  - unzip lz4-1.8.3.zip
+  - cd lz4-1.8.3\visual\VS2010
+  - ps: $CMD="$Env:DEV_ENV"; & $CMD lz4.sln /upgrade
+  - msbuild lz4.sln /p:Configuration=Debug /p:Platform=x64
+  - msbuild lz4.sln /p:Configuration=Release /p:Platform=x64
+  - echo "Building ZStd dependency..."
+  - cd %THIRDPARTY_HOME%
+  - curl --fail --silent --show-error --output zstd-1.4.0.zip --location https://github.com/facebook/zstd/archive/v1.4.0.zip
+  - unzip zstd-1.4.0.zip
+  - cd zstd-1.4.0\build\VS2010
+  - ps: $CMD="$Env:DEV_ENV"; & $CMD zstd.sln /upgrade
+  - msbuild zstd.sln /p:Configuration=Debug /p:Platform=x64
+  - msbuild zstd.sln /p:Configuration=Release /p:Platform=x64
+
+before_build:
+  - md %APPVEYOR_BUILD_FOLDER%\build
+  - cd %APPVEYOR_BUILD_FOLDER%\build
+  - if DEFINED CMAKE_PLATEFORM_NAME (set "PLATEFORM_OPT=-A %CMAKE_PLATEFORM_NAME%")
+  - cmake .. -G "%CMAKE_GENERATOR%" %PLATEFORM_OPT% %CMAKE_OPT% -DCMAKE_BUILD_TYPE=Debug -DOPTDBG=1 -DPORTABLE=1 -DSNAPPY=1 -DLZ4=1 -DZSTD=1 -DXPRESS=1 -DJNI=1 -DWITH_ALL_TESTS=0
+  - cd ..
+
+build:
+  project: build\rocksdb.sln
+  parallel: true
+  verbosity: normal
+
+test:
+
+test_script:
+  - ps: build_tools\run_ci_db_test.ps1 -SuiteRun db_basic_test,env_basic_test -Concurrency 8
+
+on_failure:
+  - cmd: 7z a build-failed.zip %APPVEYOR_BUILD_FOLDER%\build\ && appveyor PushArtifact build-failed.zip
+
@@ -163,8 +163,9 @@ def generate_targets(repo_path, deps_map):
        src_mk.get("EXP_LIB_SOURCES", []) +
        src_mk.get("ANALYZER_LIB_SOURCES", []),
        [":rocksdb_lib"],
-        extra_test_libs=True
-        )
+        extra_external_deps=""" + [
+        ("googletest", None, "gtest"),
+    ]""")
    # rocksdb_tools_lib
    TARGETS.add_library(
        "rocksdb_tools_lib",
@@ -183,19 +184,12 @@ def generate_targets(repo_path, deps_map):
        src_mk.get("ANALYZER_LIB_SOURCES", [])
        + src_mk.get('STRESS_LIB_SOURCES', [])
        + ["test_util/testutil.cc"])
-    # bench binaries
-    for src in src_mk.get("MICROBENCH_SOURCES", []):
-        name =  src.rsplit('/',1)[1].split('.')[0] if '/' in src else src.split('.')[0]
-        TARGETS.add_binary(
-            name,
-            [src],
-            [],
-            extra_bench_libs=True
-            )
+
    print("Extra dependencies:\n{0}".format(json.dumps(deps_map)))

    # Dictionary test executable name -> relative source file path
    test_source_map = {}
+    print(src_mk)

    # c_test.c is added through TARGETS.add_c_test(). If there
    # are more than one .c test file, we need to extend
@@ -206,42 +200,6 @@ def generate_targets(repo_path, deps_map):
            return False
    TARGETS.add_c_test()

-    try:
-        with open(f"{repo_path}/buckifier/bench.json") as json_file:
-            fast_fancy_bench_config_list = json.load(json_file)
-            for config_dict in fast_fancy_bench_config_list:
-                clean_benchmarks = {}
-                benchmarks = config_dict['benchmarks']
-                for binary, benchmark_dict in benchmarks.items():
-                    clean_benchmarks[binary] = {}
-                    for benchmark, overloaded_metric_list in benchmark_dict.items():
-                        clean_benchmarks[binary][benchmark] = []
-                        for metric in overloaded_metric_list:
-                            if not isinstance(metric, dict):
-                                clean_benchmarks[binary][benchmark].append(metric)
-                TARGETS.add_fancy_bench_config(config_dict['name'], clean_benchmarks, False, config_dict['expected_runtime_one_iter'], config_dict['sl_iterations'], config_dict['regression_threshold'])
-
-        with open(f"{repo_path}/buckifier/bench-slow.json") as json_file:
-            slow_fancy_bench_config_list = json.load(json_file)
-            for config_dict in slow_fancy_bench_config_list:
-                clean_benchmarks = {}
-                benchmarks = config_dict['benchmarks']
-                for binary, benchmark_dict in benchmarks.items():
-                    clean_benchmarks[binary] = {}
-                    for benchmark, overloaded_metric_list in benchmark_dict.items():
-                        clean_benchmarks[binary][benchmark] = []
-                        for metric in overloaded_metric_list:
-                            if not isinstance(metric, dict):
-                                clean_benchmarks[binary][benchmark].append(metric)
-            for config_dict in slow_fancy_bench_config_list:
-                TARGETS.add_fancy_bench_config(config_dict['name']+"_slow", clean_benchmarks, True, config_dict['expected_runtime_one_iter'], config_dict['sl_iterations'], config_dict['regression_threshold'])
-    # it is better servicelab experiments break
-    # than rocksdb github ci
-    except Exception:
-        pass
-
-    TARGETS.add_test_header()
-
    for test_src in src_mk.get("TEST_MAIN_SOURCES", []):
        test = test_src.split('.c')[0].strip().split('/')[-1].strip()
        test_source_map[test] = test_src
@@ -255,21 +213,17 @@ def generate_targets(repo_path, deps_map):

            test_target_name = \
                test if not target_alias else test + "_" + target_alias
+            TARGETS.register_test(
+                test_target_name,
+                test_src,
+                test not in non_parallel_tests,
+                json.dumps(deps['extra_deps']),
+                json.dumps(deps['extra_compiler_flags']))

            if test in _EXPORTED_TEST_LIBS:
                test_library = "%s_lib" % test_target_name
-                TARGETS.add_library(test_library, [test_src], deps=[":rocksdb_test_lib"], extra_test_libs=True)
-                TARGETS.register_test(
-                    test_target_name,
-                    test_src,
-                    deps = json.dumps(deps['extra_deps'] + [':'+test_library]),
-                    extra_compiler_flags = json.dumps(deps['extra_compiler_flags']))
-            else:
-                TARGETS.register_test(
-                    test_target_name,
-                    test_src,
-                    deps = json.dumps(deps['extra_deps'] + [":rocksdb_test_lib"] ),
-                    extra_compiler_flags = json.dumps(deps['extra_compiler_flags']))
+                TARGETS.add_library(test_library, [test_src], [":rocksdb_test_lib"])
+    TARGETS.flush_tests()

    print(ColorString.info("Generated TARGETS Summary:"))
    print(ColorString.info("- %d libs" % TARGETS.total_lib))
@@ -10,7 +10,6 @@ except ImportError:
    from __builtin__ import object
    from __builtin__ import str
 import targets_cfg
-import pprint

 def pretty_list(lst, indent=8):
    if lst is None or len(lst) == 0:
@@ -41,73 +40,85 @@ class TARGETSBuilder(object):
        self.targets_file.close()

    def add_library(self, name, srcs, deps=None, headers=None,
-                    extra_external_deps="", link_whole=False,
-                     external_dependencies=None, extra_test_libs=False):
-        if headers is not None:
+                    extra_external_deps="", link_whole=False):
+        headers_attr_prefix = ""
+        if headers is None:
+            headers_attr_prefix = "auto_"
+            headers = "AutoHeaders.RECURSIVE_GLOB"
+        else:
            headers = "[" + pretty_list(headers) + "]"
        self.targets_file.write(targets_cfg.library_template.format(
            name=name,
            srcs=pretty_list(srcs),
+            headers_attr_prefix=headers_attr_prefix,
            headers=headers,
            deps=pretty_list(deps),
            extra_external_deps=extra_external_deps,
-            link_whole=link_whole,
-            external_dependencies=pretty_list(external_dependencies),
-            extra_test_libs=extra_test_libs
-            ).encode("utf-8"))
+            link_whole=link_whole).encode("utf-8"))
        self.total_lib = self.total_lib + 1

-    def add_rocksdb_library(self, name, srcs, headers=None,
-                            external_dependencies=None):
-        if headers is not None:
+    def add_rocksdb_library(self, name, srcs, headers=None):
+        headers_attr_prefix = ""
+        if headers is None:
+            headers_attr_prefix = "auto_"
+            headers = "AutoHeaders.RECURSIVE_GLOB"
+        else:
            headers = "[" + pretty_list(headers) + "]"
        self.targets_file.write(targets_cfg.rocksdb_library_template.format(
            name=name,
            srcs=pretty_list(srcs),
-            headers=headers,
-            external_dependencies=pretty_list(external_dependencies)
-            ).encode("utf-8")
-            )
+            headers_attr_prefix=headers_attr_prefix,
+            headers=headers).encode("utf-8"))
        self.total_lib = self.total_lib + 1

-    def add_binary(self, name, srcs, deps=None, extra_preprocessor_flags=None,extra_bench_libs=False):
+    def add_binary(self, name, srcs, deps=None):
        self.targets_file.write(targets_cfg.binary_template.format(
            name=name,
            srcs=pretty_list(srcs),
-            deps=pretty_list(deps),
-            extra_preprocessor_flags=pretty_list(extra_preprocessor_flags),
-            extra_bench_libs=extra_bench_libs,
-            ).encode("utf-8"))
+            deps=pretty_list(deps)).encode("utf-8"))
        self.total_bin = self.total_bin + 1

    def add_c_test(self):
        self.targets_file.write(b"""
-add_c_test_wrapper()
-""")
+cpp_binary(
+    name = "c_test_bin",
+    srcs = ["db/c_test.c"],
+    arch_preprocessor_flags = ROCKSDB_ARCH_PREPROCESSOR_FLAGS,
+    compiler_flags = ROCKSDB_COMPILER_FLAGS,
+    include_paths = ROCKSDB_INCLUDE_PATHS,
+    os_preprocessor_flags = ROCKSDB_OS_PREPROCESSOR_FLAGS,
+    preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS,
+    deps = [":rocksdb_test_lib"],
+) if not is_opt_mode else None

-    def add_test_header(self):
-        self.targets_file.write(b"""
-        # Generate a test rule for each entry in ROCKS_TESTS
-        # Do not build the tests in opt mode, since SyncPoint and other test code
-        # will not be included.
+custom_unittest(
+    name = "c_test",
+    command = [
+        native.package_name() + "/buckifier/rocks_test_runner.sh",
+        "$(location :{})".format("c_test_bin"),
+    ],
+    type = "simple",
+) if not is_opt_mode else None
 """)

-    def add_fancy_bench_config(self, name, bench_config, slow, expected_runtime, sl_iterations, regression_threshold):
-        self.targets_file.write(targets_cfg.fancy_bench_template.format(
-                    name=name,
-                    bench_config=pprint.pformat(bench_config),
-                    slow=slow,
-                    expected_runtime=expected_runtime,
-                    sl_iterations=sl_iterations,
-                    regression_threshold=regression_threshold
-                    ).encode("utf-8"))
-
    def register_test(self,
                      test_name,
                      src,
-                      deps,
+                      is_parallel,
+                      extra_deps,
                      extra_compiler_flags):
+        exec_mode = "serial"
+        if is_parallel:
+            exec_mode = "parallel"
+        self.tests_cfg += targets_cfg.test_cfg_template % (
+            test_name,
+            str(src),
+            str(exec_mode),
+            extra_deps,
+            extra_compiler_flags)

-        self.targets_file.write(targets_cfg.unittests_template.format(test_name=test_name,test_cc=str(src),deps=deps,
-            extra_compiler_flags=extra_compiler_flags).encode("utf-8"))
        self.total_test = self.total_test + 1
+
+    def flush_tests(self):
+        self.targets_file.write(targets_cfg.unittests_template.format(tests=self.tests_cfg).encode("utf-8"))
+        self.tests_cfg = ""
@@ -11,36 +11,220 @@ rocksdb_target_header_template = \
 # This file is a Facebook-specific integration for buck builds, so can
 # only be validated by Facebook employees.
 #
-# @noautodeps @nocodemods
-load("//rocks/buckifier:defs.bzl", "cpp_library_wrapper","rocks_cpp_library_wrapper","cpp_binary_wrapper","cpp_unittest_wrapper","fancy_bench_wrapper","add_c_test_wrapper")
+load("@fbcode_macros//build_defs:auto_headers.bzl", "AutoHeaders")
+load("@fbcode_macros//build_defs:cpp_library.bzl", "cpp_library")
+load(":defs.bzl", "test_binary")

+REPO_PATH = package_name() + "/"
+
+ROCKSDB_COMPILER_FLAGS_0 = [
+    "-fno-builtin-memcmp",
+    # Needed to compile in fbcode
+    "-Wno-expansion-to-defined",
+    # Added missing flags from output of build_detect_platform
+    "-Wnarrowing",
+    "-DROCKSDB_NO_DYNAMIC_EXTENSION",
+]
+
+ROCKSDB_EXTERNAL_DEPS = [
+    ("bzip2", None, "bz2"),
+    ("snappy", None, "snappy"),
+    ("zlib", None, "z"),
+    ("gflags", None, "gflags"),
+    ("lz4", None, "lz4"),
+    ("zstd", None, "zstd"),
+]
+
+ROCKSDB_OS_DEPS_0 = [
+    (
+        "linux",
+        [
+            "third-party//numa:numa",
+            "third-party//liburing:uring",
+            "third-party//tbb:tbb",
+        ],
+    ),
+    (
+        "macos",
+        ["third-party//tbb:tbb"],
+    ),
+]
+
+ROCKSDB_OS_PREPROCESSOR_FLAGS_0 = [
+    (
+        "linux",
+        [
+            "-DOS_LINUX",
+            "-DROCKSDB_FALLOCATE_PRESENT",
+            "-DROCKSDB_MALLOC_USABLE_SIZE",
+            "-DROCKSDB_PTHREAD_ADAPTIVE_MUTEX",
+            "-DROCKSDB_RANGESYNC_PRESENT",
+            "-DROCKSDB_SCHED_GETCPU_PRESENT",
+            "-DROCKSDB_IOURING_PRESENT",
+            "-DHAVE_SSE42",
+            "-DLIBURING",
+            "-DNUMA",
+            "-DROCKSDB_PLATFORM_POSIX",
+            "-DROCKSDB_LIB_IO_POSIX",
+            "-DTBB",
+        ],
+    ),
+    (
+        "macos",
+        [
+            "-DOS_MACOSX",
+            "-DROCKSDB_PLATFORM_POSIX",
+            "-DROCKSDB_LIB_IO_POSIX",
+            "-DTBB",
+        ],
+    ),
+    (
+        "windows",
+        [
+            "-DOS_WIN",
+            "-DWIN32",
+            "-D_MBCS",
+            "-DWIN64",
+            "-DNOMINMAX",
+        ],
+    ),
+]
+
+ROCKSDB_PREPROCESSOR_FLAGS = [
+    "-DROCKSDB_SUPPORT_THREAD_LOCAL",
+
+    # Flags to enable libs we include
+    "-DSNAPPY",
+    "-DZLIB",
+    "-DBZIP2",
+    "-DLZ4",
+    "-DZSTD",
+    "-DZSTD_STATIC_LINKING_ONLY",
+    "-DGFLAGS=gflags",
+
+    # Added missing flags from output of build_detect_platform
+    "-DROCKSDB_BACKTRACE",
+]
+
+# Directories with files for #include
+ROCKSDB_INCLUDE_PATHS = [
+    "",
+    "include",
+]
+
+ROCKSDB_ARCH_PREPROCESSOR_FLAGS = {{
+    "x86_64": [
+        "-DHAVE_PCLMUL",
+    ],
+}}
+
+build_mode = read_config("fbcode", "build_mode")
+
+is_opt_mode = build_mode.startswith("opt")
+
+# -DNDEBUG is added by default in opt mode in fbcode. But adding it twice
+# doesn't harm and avoid forgetting to add it.
+ROCKSDB_COMPILER_FLAGS = ROCKSDB_COMPILER_FLAGS_0 + (["-DNDEBUG"] if is_opt_mode else [])
+
+sanitizer = read_config("fbcode", "sanitizer")
+
+# Do not enable jemalloc if sanitizer presents. RocksDB will further detect
+# whether the binary is linked with jemalloc at runtime.
+ROCKSDB_OS_PREPROCESSOR_FLAGS = ROCKSDB_OS_PREPROCESSOR_FLAGS_0 + ([(
+    "linux",
+    ["-DROCKSDB_JEMALLOC"],
+)] if sanitizer == "" else [])
+
+ROCKSDB_OS_DEPS = ROCKSDB_OS_DEPS_0 + ([(
+    "linux",
+    ["third-party//jemalloc:headers"],
+)] if sanitizer == "" else [])
+
+ROCKSDB_LIB_DEPS = [
+    ":rocksdb_lib",
+    ":rocksdb_test_lib",
+] if not is_opt_mode else [":rocksdb_lib"]
 """


 library_template = """
-cpp_library_wrapper(name="{name}", srcs=[{srcs}], deps=[{deps}], headers={headers}, link_whole={link_whole}, extra_test_libs={extra_test_libs})
+cpp_library(
+    name = "{name}",
+    srcs = [{srcs}],
+    {headers_attr_prefix}headers = {headers},
+    arch_preprocessor_flags = ROCKSDB_ARCH_PREPROCESSOR_FLAGS,
+    compiler_flags = ROCKSDB_COMPILER_FLAGS,
+    include_paths = ROCKSDB_INCLUDE_PATHS,
+    link_whole = {link_whole},
+    os_deps = ROCKSDB_OS_DEPS,
+    os_preprocessor_flags = ROCKSDB_OS_PREPROCESSOR_FLAGS,
+    preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS,
+    exported_deps = [{deps}],
+    exported_external_deps = ROCKSDB_EXTERNAL_DEPS{extra_external_deps},
+)
 """

 rocksdb_library_template = """
-rocks_cpp_library_wrapper(name="{name}", srcs=[{srcs}], headers={headers})
-
+cpp_library(
+    name = "{name}",
+    srcs = [{srcs}],
+    {headers_attr_prefix}headers = {headers},
+    arch_preprocessor_flags = ROCKSDB_ARCH_PREPROCESSOR_FLAGS,
+    compiler_flags = ROCKSDB_COMPILER_FLAGS,
+    include_paths = ROCKSDB_INCLUDE_PATHS,
+    os_deps = ROCKSDB_OS_DEPS,
+    os_preprocessor_flags = ROCKSDB_OS_PREPROCESSOR_FLAGS,
+    preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS,
+    exported_deps = ROCKSDB_LIB_DEPS,
+    exported_external_deps = ROCKSDB_EXTERNAL_DEPS,
+)
 """

-
-
 binary_template = """
-cpp_binary_wrapper(name="{name}", srcs=[{srcs}], deps=[{deps}], extra_preprocessor_flags=[{extra_preprocessor_flags}], extra_bench_libs={extra_bench_libs})
+cpp_binary(
+    name = "{name}",
+    srcs = [{srcs}],
+    arch_preprocessor_flags = ROCKSDB_ARCH_PREPROCESSOR_FLAGS,
+    compiler_flags = ROCKSDB_COMPILER_FLAGS,
+    preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS,
+    include_paths = ROCKSDB_INCLUDE_PATHS,
+    deps = [{deps}],
+    external_deps = ROCKSDB_EXTERNAL_DEPS,
+)
+"""
+
+test_cfg_template = """    [
+        "%s",
+        "%s",
+        "%s",
+        %s,
+        %s,
+    ],
 """

 unittests_template = """
-cpp_unittest_wrapper(name="{test_name}",
-            srcs=["{test_cc}"],
-            deps={deps},
-            extra_compiler_flags={extra_compiler_flags})
-
-"""
-
-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})
+# [test_name, test_src, test_type, extra_deps, extra_compiler_flags]
+ROCKS_TESTS = [
+{tests}]

+# Generate a test rule for each entry in ROCKS_TESTS
+# Do not build the tests in opt mode, since SyncPoint and other test code
+# will not be included.
+[
+    cpp_unittest(
+        name = test_name,
+        srcs = [test_cc],
+        arch_preprocessor_flags = ROCKSDB_ARCH_PREPROCESSOR_FLAGS,
+        compiler_flags = ROCKSDB_COMPILER_FLAGS + extra_compiler_flags,
+        include_paths = ROCKSDB_INCLUDE_PATHS,
+        os_preprocessor_flags = ROCKSDB_OS_PREPROCESSOR_FLAGS,
+        preprocessor_flags = ROCKSDB_PREPROCESSOR_FLAGS,
+        deps = [":rocksdb_test_lib"] + extra_deps,
+        external_deps = ROCKSDB_EXTERNAL_DEPS + [
+            ("googletest", None, "gtest"),
+        ],
+    )
+    for test_name, test_cc, parallelism, extra_deps, extra_compiler_flags in ROCKS_TESTS
+    if not is_opt_mode
+]
 """
@@ -45,11 +45,11 @@ if test -z "$OUTPUT"; then
  exit 1
 fi

-# we depend on C++17, but should be compatible with newer standards
+# we depend on C++11, but should be compatible with newer standards
 if [ "$ROCKSDB_CXX_STANDARD" ]; then
  PLATFORM_CXXFLAGS="-std=$ROCKSDB_CXX_STANDARD"
 else
-  PLATFORM_CXXFLAGS="-std=c++17"
+  PLATFORM_CXXFLAGS="-std=c++11"
 fi

 # we currently depend on POSIX platform
@@ -58,11 +58,8 @@ COMMON_FLAGS="-DROCKSDB_PLATFORM_POSIX -DROCKSDB_LIB_IO_POSIX"
 # Default to fbcode gcc on internal fb machines
 if [ -z "$ROCKSDB_NO_FBCODE" -a -d /mnt/gvfs/third-party ]; then
    FBCODE_BUILD="true"
-    # If we're compiling with TSAN or shared lib, we need pic build
+    # If we're compiling with TSAN we need pic build
    PIC_BUILD=$COMPILE_WITH_TSAN
-    if [ "$LIB_MODE" == "shared" ]; then
-      PIC_BUILD=1
-    fi
    if [ -n "$ROCKSDB_FBCODE_BUILD_WITH_481" ]; then
      # we need this to build with MySQL. Don't use for other purposes.
      source "$PWD/build_tools/fbcode_config4.8.1.sh"
@@ -274,7 +271,7 @@ esac
 PLATFORM_CXXFLAGS="$PLATFORM_CXXFLAGS ${CXXFLAGS}"
 JAVA_LDFLAGS="$PLATFORM_LDFLAGS"
 JAVA_STATIC_LDFLAGS="$PLATFORM_LDFLAGS"
-JAVAC_ARGS="-source 8"
+JAVAC_ARGS="-source 7"

 if [ "$CROSS_COMPILE" = "true" -o "$FBCODE_BUILD" = "true" ]; then
    # Cross-compiling; do not try any compilation tests.
@@ -620,6 +617,22 @@ EOF
  fi
 fi

+# shall we use HDFS?
+
+if test "$USE_HDFS"; then
+  if test -z "$JAVA_HOME"; then
+    echo "JAVA_HOME has to be set for HDFS usage." >&2
+    exit 1
+  fi
+  HDFS_CCFLAGS="$HDFS_CCFLAGS -I$JAVA_HOME/include -I$JAVA_HOME/include/linux -DUSE_HDFS -I$HADOOP_HOME/include"
+  HDFS_LDFLAGS="$HDFS_LDFLAGS -lhdfs -L$JAVA_HOME/jre/lib/amd64 -L$HADOOP_HOME/lib/native"
+  HDFS_LDFLAGS="$HDFS_LDFLAGS -L$JAVA_HOME/jre/lib/amd64/server -L$GLIBC_RUNTIME_PATH/lib"
+  HDFS_LDFLAGS="$HDFS_LDFLAGS -ldl -lverify -ljava -ljvm"
+  COMMON_FLAGS="$COMMON_FLAGS $HDFS_CCFLAGS"
+  PLATFORM_LDFLAGS="$PLATFORM_LDFLAGS $HDFS_LDFLAGS"
+  JAVA_LDFLAGS="$JAVA_LDFLAGS $HDFS_LDFLAGS"
+fi
+
 if test "0$PORTABLE" -eq 0; then
  if test -n "`echo $TARGET_ARCHITECTURE | grep ^ppc64`"; then
    # Tune for this POWER processor, treating '+' models as base models
@@ -632,15 +645,12 @@ if test "0$PORTABLE" -eq 0; then
    COMMON_FLAGS="$COMMON_FLAGS"
  elif test -n "`echo $TARGET_ARCHITECTURE | grep ^s390x`"; then
    if echo 'int main() {}' | $CXX $PLATFORM_CXXFLAGS -x c++ \
-      -march=native - -o /dev/null 2>/dev/null; then
+      -fsyntax-only -march=native - -o /dev/null 2>/dev/null; then
      COMMON_FLAGS="$COMMON_FLAGS -march=native "
    else
      COMMON_FLAGS="$COMMON_FLAGS -march=z196 "
    fi
    COMMON_FLAGS="$COMMON_FLAGS"
-  elif test -n "`echo $TARGET_ARCHITECTURE | grep ^riscv64`"; then
-    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"
  elif [ "$TARGET_OS" == "AIX" ] || [ "$TARGET_OS" == "SunOS" ]; then
@@ -661,11 +671,6 @@ else
    COMMON_FLAGS="$COMMON_FLAGS -march=z196 "
  fi

-  if test -n "`echo $TARGET_ARCHITECTURE | grep ^riscv64`"; then
-    RISC_ISA=$(cat /proc/cpuinfo | grep isa | head -1 | cut --delimiter=: -f 2 | cut -b 2-)
-    COMMON_FLAGS="$COMMON_FLAGS -march=${RISC_ISA}"
-  fi
-
  if [[ "${PLATFORM}" == "OS_MACOSX" ]]; then
    # For portability compile for macOS 10.12 (2016) or newer
    COMMON_FLAGS="$COMMON_FLAGS -mmacosx-version-min=10.12"
@@ -805,8 +810,24 @@ if [ "$?" = 0 ]; then
  COMMON_FLAGS="$COMMON_FLAGS -DHAVE_UINT128_EXTENSION"
 fi

-# thread_local is part of C++11 and later (TODO: clean up this define)
-COMMON_FLAGS="$COMMON_FLAGS -DROCKSDB_SUPPORT_THREAD_LOCAL"
+# iOS doesn't support thread-local storage, but this check would erroneously
+# succeed because the cross-compiler flags are added by the Makefile, not this
+# script.
+if [ "$PLATFORM" != IOS ]; then
+  $CXX $COMMON_FLAGS -x c++ - -o test.o 2>/dev/null <<EOF
+  #if defined(_MSC_VER) && !defined(__thread)
+  #define __thread __declspec(thread)
+  #endif
+  int main() {
+    static __thread int tls;
+    (void)tls;
+  }
+EOF
+  if [ "$?" = 0 ]; then
+    COMMON_FLAGS="$COMMON_FLAGS -DROCKSDB_SUPPORT_THREAD_LOCAL"
+  fi
+fi
+

 if [ "$FBCODE_BUILD" != "true" -a "$PLATFORM" = OS_LINUX ]; then
  $CXX $COMMON_FLAGS $PLATFORM_SHARED_CFLAGS -x c++ -c - -o test_dl.o 2>/dev/null <<EOF
@@ -21,63 +21,85 @@ LIBGCC_LIBS=" -L $LIBGCC_BASE/lib"
 GLIBC_INCLUDE="$GLIBC_BASE/include"
 GLIBC_LIBS=" -L $GLIBC_BASE/lib"

-if test -z $PIC_BUILD; then
-  MAYBE_PIC=
-else
-  MAYBE_PIC=_pic
-fi
-
 # snappy
 SNAPPY_INCLUDE=" -I $SNAPPY_BASE/include/"
-SNAPPY_LIBS=" $SNAPPY_BASE/lib/libsnappy${MAYBE_PIC}.a"
+if test -z $PIC_BUILD; then
+  SNAPPY_LIBS=" $SNAPPY_BASE/lib/libsnappy.a"
+else
+  SNAPPY_LIBS=" $SNAPPY_BASE/lib/libsnappy_pic.a"
+fi
 CFLAGS+=" -DSNAPPY"

-# location of zlib headers and libraries
-ZLIB_INCLUDE=" -I $ZLIB_BASE/include/"
-ZLIB_LIBS=" $ZLIB_BASE/lib/libz${MAYBE_PIC}.a"
-CFLAGS+=" -DZLIB"
+if test -z $PIC_BUILD; then
+  # location of zlib headers and libraries
+  ZLIB_INCLUDE=" -I $ZLIB_BASE/include/"
+  ZLIB_LIBS=" $ZLIB_BASE/lib/libz.a"
+  CFLAGS+=" -DZLIB"

-# location of bzip headers and libraries
-BZIP_INCLUDE=" -I $BZIP2_BASE/include/"
-BZIP_LIBS=" $BZIP2_BASE/lib/libbz2${MAYBE_PIC}.a"
-CFLAGS+=" -DBZIP2"
+  # location of bzip headers and libraries
+  BZIP_INCLUDE=" -I $BZIP2_BASE/include/"
+  BZIP_LIBS=" $BZIP2_BASE/lib/libbz2.a"
+  CFLAGS+=" -DBZIP2"

-LZ4_INCLUDE=" -I $LZ4_BASE/include/"
-LZ4_LIBS=" $LZ4_BASE/lib/liblz4${MAYBE_PIC}.a"
-CFLAGS+=" -DLZ4"
+  LZ4_INCLUDE=" -I $LZ4_BASE/include/"
+  LZ4_LIBS=" $LZ4_BASE/lib/liblz4.a"
+  CFLAGS+=" -DLZ4"
+fi

 ZSTD_INCLUDE=" -I $ZSTD_BASE/include/"
-ZSTD_LIBS=" $ZSTD_BASE/lib/libzstd${MAYBE_PIC}.a"
+if test -z $PIC_BUILD; then
+  ZSTD_LIBS=" $ZSTD_BASE/lib/libzstd.a"
+else
+  ZSTD_LIBS=" $ZSTD_BASE/lib/libzstd_pic.a"
+fi
 CFLAGS+=" -DZSTD"

 # location of gflags headers and libraries
 GFLAGS_INCLUDE=" -I $GFLAGS_BASE/include/"
-GFLAGS_LIBS=" $GFLAGS_BASE/lib/libgflags${MAYBE_PIC}.a"
+if test -z $PIC_BUILD; then
+  GFLAGS_LIBS=" $GFLAGS_BASE/lib/libgflags.a"
+else
+  GFLAGS_LIBS=" $GFLAGS_BASE/lib/libgflags_pic.a"
+fi
 CFLAGS+=" -DGFLAGS=gflags"

 BENCHMARK_INCLUDE=" -I $BENCHMARK_BASE/include/"
-BENCHMARK_LIBS=" $BENCHMARK_BASE/lib/libbenchmark${MAYBE_PIC}.a"
+if test -z $PIC_BUILD; then
+  BENCHMARK_LIBS=" $BENCHMARK_BASE/lib/libbenchmark.a"
+else
+  BENCHMARK_LIBS=" $BENCHMARK_BASE/lib/libbenchmark_pic.a"
+fi

 # location of jemalloc
 JEMALLOC_INCLUDE=" -I $JEMALLOC_BASE/include/"
-JEMALLOC_LIB=" $JEMALLOC_BASE/lib/libjemalloc${MAYBE_PIC}.a"
+JEMALLOC_LIB=" $JEMALLOC_BASE/lib/libjemalloc.a"

-# location of numa
-NUMA_INCLUDE=" -I $NUMA_BASE/include/"
-NUMA_LIB=" $NUMA_BASE/lib/libnuma${MAYBE_PIC}.a"
-CFLAGS+=" -DNUMA"
+if test -z $PIC_BUILD; then
+  # location of numa
+  NUMA_INCLUDE=" -I $NUMA_BASE/include/"
+  NUMA_LIB=" $NUMA_BASE/lib/libnuma.a"
+  CFLAGS+=" -DNUMA"

-# location of libunwind
-LIBUNWIND="$LIBUNWIND_BASE/lib/libunwind${MAYBE_PIC}.a"
+  # location of libunwind
+  LIBUNWIND="$LIBUNWIND_BASE/lib/libunwind.a"
+fi

 # location of TBB
 TBB_INCLUDE=" -isystem $TBB_BASE/include/"
-TBB_LIBS="$TBB_BASE/lib/libtbb${MAYBE_PIC}.a"
+if test -z $PIC_BUILD; then
+  TBB_LIBS="$TBB_BASE/lib/libtbb.a"
+else
+  TBB_LIBS="$TBB_BASE/lib/libtbb_pic.a"
+fi
 CFLAGS+=" -DTBB"

 # location of LIBURING
 LIBURING_INCLUDE=" -isystem $LIBURING_BASE/include/"
-LIBURING_LIBS="$LIBURING_BASE/lib/liburing${MAYBE_PIC}.a"
+if test -z $PIC_BUILD; then
+  LIBURING_LIBS="$LIBURING_BASE/lib/liburing.a"
+else
+  LIBURING_LIBS="$LIBURING_BASE/lib/liburing_pic.a"
+fi
 CFLAGS+=" -DLIBURING"

 test "$USE_SSE" || USE_SSE=1
@@ -1561,7 +1561,7 @@ sub save_stdin_stdout_stderr {
 	::die_bug("Can't dup STDERR: $!");
    open $Global::original_stdin, "<&", "STDIN" or
 	::die_bug("Can't dup STDIN: $!");
-    $Global::is_terminal = (-t $Global::original_stderr) && !$ENV{'CIRCLECI'} && !$ENV{'TRAVIS'};
+    $Global::is_terminal = (-t $Global::original_stderr);
 }

 sub enough_file_handles {
@@ -258,6 +258,7 @@ common_in_mem_args="--db=/dev/shm/rocksdb \
    --value_size=100 \
    --compression_type=none \
    --compression_ratio=1 \
+    --hard_rate_limit=2 \
    --write_buffer_size=134217728 \
    --max_write_buffer_number=4 \
    --level0_file_num_compaction_trigger=8 \
@@ -106,14 +106,12 @@ SHM="TEST_TMPDIR=/dev/shm/rocksdb"
 NON_SHM="TMPD=/tmp/rocksdb_test_tmp"
 GCC_481="ROCKSDB_FBCODE_BUILD_WITH_481=1"
 ASAN="COMPILE_WITH_ASAN=1"
-ASAN_TEST_OPTIONS="ASAN_OPTIONS=detect_stack_use_after_return=1"
 CLANG="USE_CLANG=1"
 TSAN="COMPILE_WITH_TSAN=1"
 UBSAN="COMPILE_WITH_UBSAN=1"
-ASAN_CRASH="ASAN_OPTIONS=disable_coredump=0:detect_stack_use_after_return=1"
-TSAN_CRASH="TSAN_OPTIONS=disable_coredump=0 CRASH_TEST_EXT_ARGS=\\\"--compression_type=zstd --log2_keys_per_lock=22\\\""
+ASAN_CRASH="ASAN_OPTIONS=disable_coredump=0"
+TSAN_CRASH="CRASH_TEST_EXT_ARGS=\\\"--compression_type=zstd --log2_keys_per_lock=22\\\""
 NON_TSAN_CRASH="CRASH_TEST_EXT_ARGS=--compression_type=zstd"
-UBSAN_CRASH="UBSAN_OPTIONS=disable_coredump=0"
 DISABLE_JEMALLOC="DISABLE_JEMALLOC=1"
 HTTP_PROXY="https_proxy=http://fwdproxy.29.prn1:8080 http_proxy=http://fwdproxy.29.prn1:8080 ftp_proxy=http://fwdproxy.29.prn1:8080"
 SETUP_JAVA_ENV="export $HTTP_PROXY; export JAVA_HOME=/usr/local/jdk-8u60-64/; export PATH=\$JAVA_HOME/bin:\$PATH"
@@ -598,7 +596,7 @@ ASAN_TEST_COMMANDS="[
            $CLEANUP_ENV,
            {
                \"name\":\"Test RocksDB debug under ASAN\",
-\"shell\":\"cd $WORKING_DIR; set -o pipefail && $SHM $ASAN $ASAN_TEST_OPTIONS $DEBUG $SKIP_FORMAT_CHECKS make $PARALLELISM asan_check || $CONTRUN_NAME=asan_check $TASK_CREATION_TOOL\",
+\"shell\":\"cd $WORKING_DIR; set -o pipefail && $SHM $ASAN $DEBUG $SKIP_FORMAT_CHECKS make $PARALLELISM asan_check || $CONTRUN_NAME=asan_check $TASK_CREATION_TOOL\",
                \"user\":\"root\",
                $PARSER
            }
@@ -762,7 +760,7 @@ UBSAN_CRASH_TEST_COMMANDS="[
            {
                \"name\":\"Build and run RocksDB debug ubsan_crash_test\",
                \"timeout\": 86400,
-                \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $UBSAN_CRASH $NON_TSAN_CRASH $CLANG $SKIP_FORMAT_CHECKS make $PARALLELISM ubsan_crash_test || $CONTRUN_NAME=ubsan_crash_test $TASK_CREATION_TOOL\",
+                \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH $CLANG $SKIP_FORMAT_CHECKS make $PARALLELISM ubsan_crash_test || $CONTRUN_NAME=ubsan_crash_test $TASK_CREATION_TOOL\",
                \"user\":\"root\",
                $PARSER
            },
@@ -786,7 +784,7 @@ UBSAN_BLACKBOX_CRASH_TEST_COMMANDS="[
            {
                \"name\":\"Build and run RocksDB debug blackbox ubsan_crash_test\",
                \"timeout\": 86400,
-                \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $UBSAN_CRASH $NON_TSAN_CRASH $CLANG $SKIP_FORMAT_CHECKS make $PARALLELISM blackbox_ubsan_crash_test || $CONTRUN_NAME=blackbox_ubsan_crash_test $TASK_CREATION_TOOL\",
+                \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH $CLANG $SKIP_FORMAT_CHECKS make $PARALLELISM blackbox_ubsan_crash_test || $CONTRUN_NAME=blackbox_ubsan_crash_test $TASK_CREATION_TOOL\",
                \"user\":\"root\",
                $PARSER
            },
@@ -810,7 +808,7 @@ UBSAN_WHITEBOX_CRASH_TEST_COMMANDS="[
            {
                \"name\":\"Build and run RocksDB debug whitebox ubsan_crash_test\",
                \"timeout\": 86400,
-                \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $UBSAN_CRASH $NON_TSAN_CRASH $CLANG $SKIP_FORMAT_CHECKS make $PARALLELISM whitebox_ubsan_crash_test || $CONTRUN_NAME=whitebox_ubsan_crash_test $TASK_CREATION_TOOL\",
+                \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH $CLANG $SKIP_FORMAT_CHECKS make $PARALLELISM whitebox_ubsan_crash_test || $CONTRUN_NAME=whitebox_ubsan_crash_test $TASK_CREATION_TOOL\",
                \"user\":\"root\",
                $PARSER
            },
@@ -834,7 +832,7 @@ UBSAN_CRASH_TEST_WITH_ATOMIC_FLUSH_COMMANDS="[
            {
                \"name\":\"Build and run RocksDB debug ubsan_crash_test_with_atomic_flush\",
                \"timeout\": 86400,
-                \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $UBSAN_CRASH $NON_TSAN_CRASH $CLANG $SKIP_FORMAT_CHECKS make $PARALLELISM ubsan_crash_test_with_atomic_flush || $CONTRUN_NAME=ubsan_crash_test_with_atomic_flush $TASK_CREATION_TOOL\",
+                \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH $CLANG $SKIP_FORMAT_CHECKS make $PARALLELISM ubsan_crash_test_with_atomic_flush || $CONTRUN_NAME=ubsan_crash_test_with_atomic_flush $TASK_CREATION_TOOL\",
                \"user\":\"root\",
                $PARSER
            },
@@ -858,7 +856,7 @@ UBSAN_CRASH_TEST_WITH_TXN_COMMANDS="[
            {
                \"name\":\"Build and run RocksDB debug ubsan_crash_test_with_txn\",
                \"timeout\": 86400,
-                \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $UBSAN_CRASH $NON_TSAN_CRASH $CLANG $SKIP_FORMAT_CHECKS make $PARALLELISM ubsan_crash_test_with_txn || $CONTRUN_NAME=ubsan_crash_test_with_txn $TASK_CREATION_TOOL\",
+                \"shell\":\"cd $WORKING_DIR; $SHM $DEBUG $NON_TSAN_CRASH $CLANG $SKIP_FORMAT_CHECKS make $PARALLELISM ubsan_crash_test_with_txn || $CONTRUN_NAME=ubsan_crash_test_with_txn $TASK_CREATION_TOOL\",
                \"user\":\"root\",
                $PARSER
            },
@@ -79,52 +79,31 @@ static class std::shared_ptr<ROCKSDB_NAMESPACE::SecondaryCache> secondary_cache;
 DEFINE_bool(use_clock_cache, false, "");

 // ## BEGIN stress_cache_key sub-tool options ##
-// See class StressCacheKey below.
 DEFINE_bool(stress_cache_key, false,
            "If true, run cache key stress test instead");
-DEFINE_uint32(
-    sck_files_per_day, 2500000,
-    "(-stress_cache_key) Simulated files generated per simulated day");
-// NOTE: Giving each run a specified lifetime, rather than e.g. "until
-// first collision" ensures equal skew from start-up, when collisions are
-// less likely.
-DEFINE_uint32(sck_days_per_run, 90,
+DEFINE_uint32(sck_files_per_day, 2500000,
+              "(-stress_cache_key) Simulated files generated per day");
+DEFINE_uint32(sck_duration, 90,
              "(-stress_cache_key) Number of days to simulate in each run");
-// NOTE: The number of observed collisions directly affects the relative
-// accuracy of the predicted probabilities. 15 observations should be well
-// within factor-of-2 accuracy.
 DEFINE_uint32(
    sck_min_collision, 15,
    "(-stress_cache_key) Keep running until this many collisions seen");
-// sck_file_size_mb can be thought of as average file size. The simulation is
-// not precise enough to care about the distribution of file sizes; other
-// simulations (https://github.com/pdillinger/unique_id/tree/main/monte_carlo)
-// indicate the distribution only makes a small difference (e.g. < 2x factor)
 DEFINE_uint32(
    sck_file_size_mb, 32,
    "(-stress_cache_key) Simulated file size in MiB, for accounting purposes");
 DEFINE_uint32(sck_reopen_nfiles, 100,
-              "(-stress_cache_key) Simulate DB re-open average every n files");
-DEFINE_uint32(sck_restarts_per_day, 24,
-              "(-stress_cache_key) Average simulated process restarts per day "
-              "(across DBs)");
+              "(-stress_cache_key) Re-opens DB average every n files");
 DEFINE_uint32(
-    sck_db_count, 100,
-    "(-stress_cache_key) Parallel DBs in simulation sharing a block cache");
-DEFINE_uint32(
-    sck_table_bits, 20,
-    "(-stress_cache_key) Log2 number of tracked (live) files (across DBs)");
-// sck_keep_bits being well below full 128 bits amplifies the collision
-// probability so that the true probability can be estimated through observed
-// collisions. (More explanation below.)
-DEFINE_uint32(
-    sck_keep_bits, 50,
-    "(-stress_cache_key) Number of bits to keep from each cache key (<= 64)");
-// sck_randomize is used to validate whether cache key is performing "better
-// than random." Even with this setting, file offsets are not randomized.
+    sck_restarts_per_day, 24,
+    "(-stress_cache_key) Simulated process restarts per day (across DBs)");
+DEFINE_uint32(sck_db_count, 100,
+              "(-stress_cache_key) Parallel DBs in operation");
+DEFINE_uint32(sck_table_bits, 20,
+              "(-stress_cache_key) Log2 number of tracked files");
+DEFINE_uint32(sck_keep_bits, 50,
+              "(-stress_cache_key) Number of cache key bits to keep");
 DEFINE_bool(sck_randomize, false,
            "(-stress_cache_key) Randomize (hash) cache key");
-// See https://github.com/facebook/rocksdb/pull/9058
 DEFINE_bool(sck_footer_unique_id, false,
            "(-stress_cache_key) Simulate using proposed footer unique id");
 // ## END stress_cache_key sub-tool options ##
@@ -510,9 +489,8 @@ class CacheBench {
      timer.Start();
      Slice key = gen.GetRand(thread->rnd, max_key_, max_log_);
      uint64_t random_op = thread->rnd.Next();
-      Cache::CreateCallback create_cb = [](const void* buf, size_t size,
-                                           void** out_obj,
-                                           size_t* charge) -> Status {
+      Cache::CreateCallback create_cb =
+          [](void* buf, size_t size, void** out_obj, size_t* charge) -> Status {
        *out_obj = reinterpret_cast<void*>(new char[size]);
        memcpy(*out_obj, buf, size);
        *charge = size;
@@ -605,97 +583,20 @@ class CacheBench {
  }
 };

-// cache_bench -stress_cache_key is an independent embedded tool for
-// estimating the probability of CacheKey collisions through simulation.
-// At a high level, it simulates generating SST files over many months,
-// keeping them in the DB and/or cache for some lifetime while staying
-// under resource caps, and checking for any cache key collisions that
-// arise among the set of live files. For efficient simulation, we make
-// some simplifying "pessimistic" assumptions (that only increase the
-// chance of the simulation reporting a collision relative to the chance
-// of collision in practice):
-// * Every generated file has a cache entry for every byte offset in the
-// file (contiguous range of cache keys)
-// * All of every file is cached for its entire lifetime. (Here "lifetime"
-// is technically the union of DB and Cache lifetime, though we only
-// model a generous DB lifetime, where space usage is always maximized.
-// In a effective Cache, lifetime in cache can only substantially exceed
-// lifetime in DB if there is little cache activity; cache activity is
-// required to hit cache key collisions.)
-//
-// It would be possible to track an exact set of cache key ranges for the
-// set of live files, but we would have no hope of observing collisions
-// (overlap in live files) in our simulation. We need to employ some way
-// of amplifying collision probability that allows us to predict the real
-// collision probability by extrapolation from observed collisions. Our
-// basic approach is to reduce each cache key range down to some smaller
-// number of bits, and limiting to bits that are shared over the whole
-// range.  Now we can observe collisions using a set of smaller stripped-down
-// (reduced) cache keys. Let's do some case analysis to understand why this
-// works:
-// * No collision in reduced key - because the reduction is a pure function
-// this implies no collision in the full keys
-// * Collision detected between two reduced keys - either
-//   * The reduction has dropped some structured uniqueness info (from one of
-// session counter or file number; file offsets are never materialized here).
-// This can only artificially inflate the observed and extrapolated collision
-// probabilities. We only have to worry about this in designing the reduction.
-//   * The reduction has preserved all the structured uniqueness in the cache
-// key, which means either
-//     * REJECTED: We have a uniqueness bug in generating cache keys, where
-// structured uniqueness info should have been different but isn't. In such a
-// case, increasing by 1 the number of bits kept after reduction would not
-// reduce observed probabilities by half. (In our observations, the
-// probabilities are reduced approximately by half.)
-//     * ACCEPTED: The lost unstructured uniqueness in the key determines the
-// probability that an observed collision would imply an overlap in ranges.
-// In short, dropping n bits from key would increase collision probability by
-// 2**n, assuming those n bits have full entropy in unstructured uniqueness.
-//
-// But we also have to account for the key ranges based on file size. If file
-// sizes are roughly 2**b offsets, using XOR in 128-bit cache keys for
-// "ranges", we know from other simulations (see
-// https://github.com/pdillinger/unique_id/) that that's roughly equivalent to
-// (less than 2x higher collision probability) using a cache key of size
-// 128 - b bits for the whole file. (This is the only place we make an
-// "optimistic" assumption, which is more than offset by the real
-// implementation stripping off 2 lower bits from block byte offsets for cache
-// keys. The simulation assumes byte offsets, which is net pessimistic.)
-//
-// So to accept the extrapolation as valid, we need to be confident that all
-// "lost" bits, excluding those covered by file offset, are full entropy.
-// Recall that we have assumed (verifiably, safely) that other structured data
-// (file number and session counter) are kept, not lost. Based on the
-// implementation comments for OffsetableCacheKey, the only potential hole here
-// is that we only have ~103 bits of entropy in "all new" session IDs, and in
-// extreme cases, there might be only 1 DB ID. However, because the upper ~39
-// bits of session ID are hashed, the combination of file number and file
-// offset only has to add to 25 bits (or more) to ensure full entropy in
-// unstructured uniqueness lost in the reduction. Typical file size of 32MB
-// suffices (at least for simulation purposes where we assume each file offset
-// occupies a cache key).
-//
-// Example results in comments on OffsetableCacheKey.
+// TODO: better description (see PR #9126 for some info)
 class StressCacheKey {
 public:
  void Run() {
    if (FLAGS_sck_footer_unique_id) {
-      // Proposed footer unique IDs are DB-independent and session-independent
-      // (but process-dependent) which is most easily simulated here by
-      // assuming 1 DB and (later below) no session resets without process
-      // reset.
      FLAGS_sck_db_count = 1;
    }

-    // Describe the simulated workload
    uint64_t mb_per_day =
        uint64_t{FLAGS_sck_files_per_day} * FLAGS_sck_file_size_mb;
    printf("Total cache or DBs size: %gTiB  Writing %g MiB/s or %gTiB/day\n",
           FLAGS_sck_file_size_mb / 1024.0 / 1024.0 *
               std::pow(2.0, FLAGS_sck_table_bits),
           mb_per_day / 86400.0, mb_per_day / 1024.0 / 1024.0);
-    // For extrapolating probability of any collisions from a number of
-    // observed collisions
    multiplier_ = std::pow(2.0, 128 - FLAGS_sck_keep_bits) /
                  (FLAGS_sck_file_size_mb * 1024.0 * 1024.0);
    printf(
@@ -705,9 +606,6 @@ class StressCacheKey {
    restart_nfiles_ = FLAGS_sck_files_per_day / FLAGS_sck_restarts_per_day;
    double without_ejection =
        std::pow(1.414214, FLAGS_sck_keep_bits) / FLAGS_sck_files_per_day;
-    // This should be a lower bound for -sck_randomize, usually a terribly
-    // rough lower bound.
-    // If observation is worse than this, then something has gone wrong.
    printf(
        "Without ejection, expect random collision after %g days (%g "
        "corrected)\n",
@@ -715,36 +613,30 @@ class StressCacheKey {
    double with_full_table =
        std::pow(2.0, FLAGS_sck_keep_bits - FLAGS_sck_table_bits) /
        FLAGS_sck_files_per_day;
-    // This is an alternate lower bound for -sck_randomize, usually pretty
-    // accurate. Our cache keys should usually perform "better than random"
-    // but always no worse. (If observation is substantially worse than this,
-    // then something has gone wrong.)
    printf(
        "With ejection and full table, expect random collision after %g "
        "days (%g corrected)\n",
        with_full_table, with_full_table * multiplier_);
    collisions_ = 0;

-    // Run until sufficient number of observed collisions.
    for (int i = 1; collisions_ < FLAGS_sck_min_collision; i++) {
      RunOnce();
      if (collisions_ == 0) {
        printf(
            "No collisions after %d x %u days                              "
            "                   \n",
-            i, FLAGS_sck_days_per_run);
+            i, FLAGS_sck_duration);
      } else {
-        double est = 1.0 * i * FLAGS_sck_days_per_run / collisions_;
+        double est = 1.0 * i * FLAGS_sck_duration / collisions_;
        printf("%" PRIu64
               " collisions after %d x %u days, est %g days between (%g "
               "corrected)        \n",
-               collisions_, i, FLAGS_sck_days_per_run, est, est * multiplier_);
+               collisions_, i, FLAGS_sck_duration, est, est * multiplier_);
      }
    }
  }

  void RunOnce() {
-    // Re-initialized simulated state
    const size_t db_count = FLAGS_sck_db_count;
    dbs_.reset(new TableProperties[db_count]{});
    const size_t table_mask = (size_t{1} << FLAGS_sck_table_bits) - 1;
@@ -752,11 +644,7 @@ class StressCacheKey {
    if (FLAGS_sck_keep_bits > 64) {
      FLAGS_sck_keep_bits = 64;
    }
-
-    // Details of which bits are dropped in reduction
    uint32_t shift_away = 64 - FLAGS_sck_keep_bits;
-    // Shift away fewer potential file number bits (b) than potential
-    // session counter bits (a).
    uint32_t shift_away_b = shift_away / 3;
    uint32_t shift_away_a = shift_away - shift_away_b;

@@ -767,78 +655,62 @@ class StressCacheKey {
    Random64 r{std::random_device{}()};

    uint64_t max_file_count =
-        uint64_t{FLAGS_sck_files_per_day} * FLAGS_sck_days_per_run;
-    uint64_t file_size = FLAGS_sck_file_size_mb * uint64_t{1024} * 1024U;
+        uint64_t{FLAGS_sck_files_per_day} * FLAGS_sck_duration;
+    uint64_t file_count = 0;
    uint32_t report_count = 0;
    uint32_t collisions_this_run = 0;
-    size_t db_i = 0;
-
-    for (uint64_t file_count = 1; file_count <= max_file_count;
-         ++file_count, ++db_i) {
-      // Round-robin through DBs (this faster than %)
+    // Round robin through DBs
+    for (size_t db_i = 0;; ++db_i) {
      if (db_i >= db_count) {
        db_i = 0;
      }
-      // Any other periodic actions before simulating next file
+      if (file_count >= max_file_count) {
+        break;
+      }
      if (!FLAGS_sck_footer_unique_id && r.OneIn(FLAGS_sck_reopen_nfiles)) {
        ResetSession(db_i);
      } else if (r.OneIn(restart_nfiles_)) {
        ResetProcess();
      }
-      // Simulate next file
      OffsetableCacheKey ock;
      dbs_[db_i].orig_file_number += 1;
-      // skip some file numbers for other file kinds, except in footer unique
-      // ID, orig_file_number here tracks process-wide generated SST file
-      // count.
-      if (!FLAGS_sck_footer_unique_id) {
+      // skip some file numbers, unless 1 DB so that that can simulate
+      // better (DB-independent) unique IDs
+      if (db_count > 1) {
        dbs_[db_i].orig_file_number += (r.Next() & 3);
      }
-      bool is_stable;
-      BlockBasedTable::SetupBaseCacheKey(&dbs_[db_i], /* ignored */ "",
-                                         /* ignored */ 42, file_size, &ock,
-                                         &is_stable);
-      assert(is_stable);
-      // Get a representative cache key, which later we analytically generalize
-      // to a range.
+      BlockBasedTable::SetupBaseCacheKey(&dbs_[db_i], "", 42, 42, &ock);
      CacheKey ck = ock.WithOffset(0);
-      uint64_t reduced_key;
+      uint64_t stripped;
      if (FLAGS_sck_randomize) {
-        reduced_key = GetSliceHash64(ck.AsSlice()) >> shift_away;
+        stripped = GetSliceHash64(ck.AsSlice()) >> shift_away;
      } else if (FLAGS_sck_footer_unique_id) {
-        // Special case: keep only file number, not session counter
        uint32_t a = DecodeFixed32(ck.AsSlice().data() + 4) >> shift_away_a;
        uint32_t b = DecodeFixed32(ck.AsSlice().data() + 12) >> shift_away_b;
-        reduced_key = (uint64_t{a} << 32) + b;
+        stripped = (uint64_t{a} << 32) + b;
      } else {
-        // Try to keep file number and session counter (shift away other bits)
        uint32_t a = DecodeFixed32(ck.AsSlice().data()) << shift_away_a;
        uint32_t b = DecodeFixed32(ck.AsSlice().data() + 12) >> shift_away_b;
-        reduced_key = (uint64_t{a} << 32) + b;
+        stripped = (uint64_t{a} << 32) + b;
      }
-      if (reduced_key == 0) {
-        // Unlikely, but we need to exclude tracking this value because we
-        // use it to mean "empty" in table. This case is OK as long as we
-        // don't hit it often.
+      if (stripped == 0) {
+        // Unlikely, but we need to exclude tracking this value
        printf("Hit Zero!                                                  \n");
-        file_count--;
        continue;
      }
-      uint64_t h =
-          NPHash64(reinterpret_cast<char*>(&reduced_key), sizeof(reduced_key));
-      // Skew expected lifetimes, for high variance (super-Poisson) variance
-      // in actual lifetimes.
+      file_count++;
+      uint64_t h = NPHash64(reinterpret_cast<char*>(&stripped), 8);
+      // Skew lifetimes
      size_t pos =
          std::min(Lower32of64(h) & table_mask, Upper32of64(h) & table_mask);
-      if (table_[pos] == reduced_key) {
+      if (table_[pos] == stripped) {
        collisions_this_run++;
-        // Our goal is to predict probability of no collisions, not expected
-        // number of collisions. To make the distinction, we have to get rid
-        // of observing correlated collisions, which this takes care of:
+        // To predict probability of no collisions, we have to get rid of
+        // correlated collisions, which this takes care of:
        ResetProcess();
      } else {
-        // Replace (end of lifetime for file that was in this slot)
-        table_[pos] = reduced_key;
+        // Replace
+        table_[pos] = stripped;
      }

      if (++report_count == FLAGS_sck_files_per_day) {
@@ -876,8 +748,6 @@ class StressCacheKey {
      ResetSession(i);
    }
    if (FLAGS_sck_footer_unique_id) {
-      // For footer unique ID, this tracks process-wide generated SST file
-      // count.
      dbs_[0].orig_file_number = 0;
    }
  }
@@ -35,8 +35,7 @@ CacheKey CacheKey::CreateUniqueForCacheLifetime(Cache *cache) {
 CacheKey CacheKey::CreateUniqueForProcessLifetime() {
  // To avoid colliding with CreateUniqueForCacheLifetime, assuming
  // Cache::NewId counts up from zero, here we count down from UINT64_MAX.
-  // If this ever becomes a point of contention, we could sub-divide the
-  // space and use CoreLocalArray.
+  // If this ever becomes a point of contention, we could use CoreLocalArray.
  static std::atomic<uint64_t> counter{UINT64_MAX};
  uint64_t id = counter.fetch_sub(1, std::memory_order_relaxed);
  // Ensure we don't collide with CreateUniqueForCacheLifetime
@@ -119,10 +118,9 @@ CacheKey CacheKey::CreateUniqueForProcessLifetime() {
 // "structured" uniqueness hasn't been cloned. Using a static
 // SemiStructuredUniqueIdGen for db_session_ids, this means we only get an
 // "all new" session id when a new process uses RocksDB. (Between processes,
-// we don't know if a DB or other persistent storage has been cloned. We
-// assume that if VM hot cloning is used, subsequently generated SST files
-// do not interact.) Within a process, only the session_lower of the
-// db_session_id changes incrementally ("structured" uniqueness).
+// we don't know if a DB or other persistent storage has been cloned.) Within
+// a process, only the session_lower of the db_session_id changes
+// incrementally ("structured" uniqueness).
 //
 // This basically means that our offsets, counters and file numbers allow us
 // to do somewhat "better than random" (birthday paradox) while in the
@@ -170,83 +168,12 @@ CacheKey CacheKey::CreateUniqueForProcessLifetime() {
 // data from the last 180 days is in cache, but NOT the other assumption
 // for the 1 in a trillion estimate above).
 //
+// Conclusion: Burning through session IDs, particularly "all new" IDs that
+// only arise when a new process is started, is the only way to have a
+// plausible chance of cache key collision. When processes live for hours
+// or days, the chance of a cache key collision seems more plausibly due
+// to bad hardware than to bad luck in random session ID data.
 //
-// Collision probability estimation through simulation:
-// A tool ./cache_bench -stress_cache_key broadly simulates host-wide cache
-// activity over many months, by making some pessimistic simplifying
-// assumptions. See class StressCacheKey in cache_bench_tool.cc for details.
-// Here is some sample output with
-// `./cache_bench -stress_cache_key -sck_keep_bits=40`:
-//
-//   Total cache or DBs size: 32TiB  Writing 925.926 MiB/s or 76.2939TiB/day
-//   Multiply by 9.22337e+18 to correct for simulation losses (but still
-//   assume whole file cached)
-//
-// These come from default settings of 2.5M files per day of 32 MB each, and
-// `-sck_keep_bits=40` means that to represent a single file, we are only
-// keeping 40 bits of the 128-bit (base) cache key.  With file size of 2**25
-// contiguous keys (pessimistic), our simulation is about 2\*\*(128-40-25) or
-// about 9 billion billion times more prone to collision than reality.
-//
-// More default assumptions, relatively pessimistic:
-// * 100 DBs in same process (doesn't matter much)
-// * Re-open DB in same process (new session ID related to old session ID) on
-// average every 100 files generated
-// * Restart process (all new session IDs unrelated to old) 24 times per day
-//
-// After enough data, we get a result at the end (-sck_keep_bits=40):
-//
-//   (keep 40 bits)  17 collisions after 2 x 90 days, est 10.5882 days between
-//                   (9.76592e+19 corrected)
-//
-// If we believe the (pessimistic) simulation and the mathematical
-// extrapolation, we would need to run a billion machines all for 97 billion
-// days to expect a cache key collision. To help verify that our extrapolation
-// ("corrected") is robust, we can make our simulation more precise with
-// `-sck_keep_bits=41` and `42`, which takes more running time to get enough
-// collision data:
-//
-//   (keep 41 bits)  16 collisions after 4 x 90 days, est 22.5 days between
-//                   (1.03763e+20 corrected)
-//   (keep 42 bits)  19 collisions after 10 x 90 days, est 47.3684 days between
-//                   (1.09224e+20 corrected)
-//
-// The extrapolated prediction is very close. If anything, we might have some
-// very small losses of structured data (see class StressCacheKey in
-// cache_bench_tool.cc) leading to more accurate & more attractive prediction
-// with more bits kept.
-//
-// With the `-sck_randomize` option, we can see that typical workloads like
-// above have lower collision probability than "random" cache keys (note:
-// offsets still non-randomized) by a modest amount (roughly 20x less collision
-// prone than random), which should make us reasonably comfortable even in
-// "degenerate" cases (e.g. repeatedly launch a process to generate 1 file
-// with SstFileWriter):
-//
-//   (rand 40 bits) 197 collisions after 1 x 90 days, est 0.456853 days between
-//                  (4.21372e+18 corrected)
-//
-// We can see that with more frequent process restarts (all new session IDs),
-// we get closer to the "random" cache key performance:
-//
-//   (-sck_restarts_per_day=5000): 140 collisions after 1 x 90 days, ...
-//                  (5.92931e+18 corrected)
-//
-// Other tests have been run to validate other conditions behave as expected,
-// never behaving "worse than random" unless we start chopping off structured
-// data.
-//
-//
-// Conclusion: Even in extreme cases, rapidly burning through "all new" IDs
-// that only arise when a new process is started, the chance of any cache key
-// collisions in a giant fleet of machines is negligible. Especially when
-// processes live for hours or days, the chance of a cache key collision is
-// likely more plausibly due to bad hardware than to bad luck in random
-// session ID data. Software defects are surely more likely to cause corruption
-// than both of those.
-//
-// TODO: Nevertheless / regardless, an efficient way to detect (and thus
-// quantify) block cache corruptions, including collisions, should be added.
 OffsetableCacheKey::OffsetableCacheKey(const std::string &db_id,
                                       const std::string &db_session_id,
                                       uint64_t file_number,
@@ -687,7 +687,7 @@ Status ClockCacheShard::Insert(const Slice& key, uint32_t hash, void* value,
  Status s;
  if (out_handle != nullptr) {
    if (handle == nullptr) {
-      s = Status::Incomplete("Insert failed due to CLOCK cache being full.");
+      s = Status::Incomplete("Insert failed due to LRU cache being full.");
    } else {
      *out_handle = reinterpret_cast<Cache::Handle*>(handle);
    }
@@ -432,9 +432,8 @@ class LRUSecondaryCacheTest : public LRUCacheTest {

  static Cache::CacheItemHelper helper_fail_;

-  Cache::CreateCallback test_item_creator = [&](const void* buf, size_t size,
-                                                void** out_obj,
-                                                size_t* charge) -> Status {
+  Cache::CreateCallback test_item_creator =
+      [&](void* buf, size_t size, void** out_obj, size_t* charge) -> Status {
    if (fail_create_) {
      return Status::NotSupported();
    }
@@ -512,12 +511,10 @@ TEST_F(LRUSecondaryCacheTest, BasicFailTest) {

  Random rnd(301);
  std::string str1 = rnd.RandomString(1020);
-  auto item1 = std::make_unique<TestItem>(str1.data(), str1.length());
-  ASSERT_TRUE(cache->Insert("k1", item1.get(), nullptr, str1.length())
-                  .IsInvalidArgument());
-  ASSERT_OK(cache->Insert("k1", item1.get(), &LRUSecondaryCacheTest::helper_,
+  TestItem* item1 = new TestItem(str1.data(), str1.length());
+  ASSERT_NOK(cache->Insert("k1", item1, nullptr, str1.length()));
+  ASSERT_OK(cache->Insert("k1", item1, &LRUSecondaryCacheTest::helper_,
                          str1.length()));
-  item1.release();  // Appease clang-analyze "potential memory leak"

  Cache::Handle* handle;
  handle = cache->Lookup("k2", nullptr, test_item_creator, Cache::Priority::LOW,
@@ -1,168 +0,0 @@
-//  Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-#include "cache/lru_secondary_cache.h"
-
-#include <memory>
-
-#include "memory/memory_allocator.h"
-#include "util/compression.h"
-#include "util/string_util.h"
-
-namespace ROCKSDB_NAMESPACE {
-
-namespace {
-
-void DeletionCallback(const Slice& /*key*/, void* obj) {
-  delete reinterpret_cast<CacheAllocationPtr*>(obj);
-  obj = nullptr;
-}
-
-}  // namespace
-
-LRUSecondaryCache::LRUSecondaryCache(
-    size_t capacity, int num_shard_bits, bool strict_capacity_limit,
-    double high_pri_pool_ratio,
-    std::shared_ptr<MemoryAllocator> memory_allocator, bool use_adaptive_mutex,
-    CacheMetadataChargePolicy metadata_charge_policy,
-    CompressionType compression_type, uint32_t compress_format_version)
-    : cache_options_(capacity, num_shard_bits, strict_capacity_limit,
-                     high_pri_pool_ratio, memory_allocator, use_adaptive_mutex,
-                     metadata_charge_policy, compression_type,
-                     compress_format_version) {
-  cache_ = NewLRUCache(capacity, num_shard_bits, strict_capacity_limit,
-                       high_pri_pool_ratio, memory_allocator,
-                       use_adaptive_mutex, metadata_charge_policy);
-}
-
-LRUSecondaryCache::~LRUSecondaryCache() { cache_.reset(); }
-
-std::unique_ptr<SecondaryCacheResultHandle> LRUSecondaryCache::Lookup(
-    const Slice& key, const Cache::CreateCallback& create_cb, bool /*wait*/) {
-  std::unique_ptr<SecondaryCacheResultHandle> handle;
-  Cache::Handle* lru_handle = cache_->Lookup(key);
-  if (lru_handle == nullptr) {
-    return handle;
-  }
-
-  CacheAllocationPtr* ptr =
-      reinterpret_cast<CacheAllocationPtr*>(cache_->Value(lru_handle));
-  void* value = nullptr;
-  size_t charge = 0;
-  Status s;
-
-  if (cache_options_.compression_type == kNoCompression) {
-    s = create_cb(ptr->get(), cache_->GetCharge(lru_handle), &value, &charge);
-  } else {
-    UncompressionContext uncompression_context(cache_options_.compression_type);
-    UncompressionInfo uncompression_info(uncompression_context,
-                                         UncompressionDict::GetEmptyDict(),
-                                         cache_options_.compression_type);
-
-    size_t uncompressed_size = 0;
-    CacheAllocationPtr uncompressed;
-    uncompressed = UncompressData(
-        uncompression_info, (char*)ptr->get(), cache_->GetCharge(lru_handle),
-        &uncompressed_size, cache_options_.compress_format_version,
-        cache_options_.memory_allocator.get());
-
-    if (!uncompressed) {
-      cache_->Release(lru_handle, true);
-      return handle;
-    }
-    s = create_cb(uncompressed.get(), uncompressed_size, &value, &charge);
-  }
-
-  if (!s.ok()) {
-    cache_->Release(lru_handle, true);
-    return handle;
-  }
-
-  handle.reset(new LRUSecondaryCacheResultHandle(value, charge));
-  cache_->Release(lru_handle);
-  return handle;
-}
-
-Status LRUSecondaryCache::Insert(const Slice& key, void* value,
-                                 const Cache::CacheItemHelper* helper) {
-  size_t size = (*helper->size_cb)(value);
-  CacheAllocationPtr ptr =
-      AllocateBlock(size, cache_options_.memory_allocator.get());
-
-  Status s = (*helper->saveto_cb)(value, 0, size, ptr.get());
-  if (!s.ok()) {
-    return s;
-  }
-  Slice val(ptr.get(), size);
-
-  std::string compressed_val;
-  if (cache_options_.compression_type != kNoCompression) {
-    CompressionOptions compression_opts;
-    CompressionContext compression_context(cache_options_.compression_type);
-    uint64_t sample_for_compression = 0;
-    CompressionInfo compression_info(
-        compression_opts, compression_context, CompressionDict::GetEmptyDict(),
-        cache_options_.compression_type, sample_for_compression);
-
-    bool success =
-        CompressData(val, compression_info,
-                     cache_options_.compress_format_version, &compressed_val);
-
-    if (!success) {
-      return Status::Corruption("Error compressing value.");
-    }
-
-    val = Slice(compressed_val);
-    size = compressed_val.size();
-    ptr = AllocateBlock(size, cache_options_.memory_allocator.get());
-    memcpy(ptr.get(), compressed_val.data(), size);
-  }
-
-  CacheAllocationPtr* buf = new CacheAllocationPtr(std::move(ptr));
-
-  return cache_->Insert(key, buf, size, DeletionCallback);
-}
-
-void LRUSecondaryCache::Erase(const Slice& key) { cache_->Erase(key); }
-
-std::string LRUSecondaryCache::GetPrintableOptions() const {
-  std::string ret;
-  ret.reserve(20000);
-  const int kBufferSize = 200;
-  char buffer[kBufferSize];
-  ret.append(cache_->GetPrintableOptions());
-  snprintf(buffer, kBufferSize, "    compression_type : %s\n",
-           CompressionTypeToString(cache_options_.compression_type).c_str());
-  ret.append(buffer);
-  snprintf(buffer, kBufferSize, "    compression_type : %d\n",
-           cache_options_.compress_format_version);
-  ret.append(buffer);
-  return ret;
-}
-
-std::shared_ptr<SecondaryCache> NewLRUSecondaryCache(
-    size_t capacity, int num_shard_bits, bool strict_capacity_limit,
-    double high_pri_pool_ratio,
-    std::shared_ptr<MemoryAllocator> memory_allocator, bool use_adaptive_mutex,
-    CacheMetadataChargePolicy metadata_charge_policy,
-    CompressionType compression_type, uint32_t compress_format_version) {
-  return std::make_shared<LRUSecondaryCache>(
-      capacity, num_shard_bits, strict_capacity_limit, high_pri_pool_ratio,
-      memory_allocator, use_adaptive_mutex, metadata_charge_policy,
-      compression_type, compress_format_version);
-}
-
-std::shared_ptr<SecondaryCache> NewLRUSecondaryCache(
-    const LRUSecondaryCacheOptions& opts) {
-  // The secondary_cache is disabled for this LRUCache instance.
-  assert(opts.secondary_cache == nullptr);
-  return NewLRUSecondaryCache(
-      opts.capacity, opts.num_shard_bits, opts.strict_capacity_limit,
-      opts.high_pri_pool_ratio, opts.memory_allocator, opts.use_adaptive_mutex,
-      opts.metadata_charge_policy, opts.compression_type,
-      opts.compress_format_version);
-}
-
-}  // namespace ROCKSDB_NAMESPACE
@@ -1,85 +0,0 @@
-// Copyright (c) 2011-present, Facebook, Inc. All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-#pragma once
-
-#include <memory>
-
-#include "cache/lru_cache.h"
-#include "memory/memory_allocator.h"
-#include "rocksdb/secondary_cache.h"
-#include "rocksdb/slice.h"
-#include "rocksdb/status.h"
-#include "util/compression.h"
-
-namespace ROCKSDB_NAMESPACE {
-
-class LRUSecondaryCacheResultHandle : public SecondaryCacheResultHandle {
- public:
-  LRUSecondaryCacheResultHandle(void* value, size_t size)
-      : value_(value), size_(size) {}
-  virtual ~LRUSecondaryCacheResultHandle() override = default;
-
-  LRUSecondaryCacheResultHandle(const LRUSecondaryCacheResultHandle&) = delete;
-  LRUSecondaryCacheResultHandle& operator=(
-      const LRUSecondaryCacheResultHandle&) = delete;
-
-  bool IsReady() override { return true; }
-
-  void Wait() override {}
-
-  void* Value() override { return value_; }
-
-  size_t Size() override { return size_; }
-
- private:
-  void* value_;
-  size_t size_;
-};
-
-// The LRUSecondaryCache is a concrete implementation of
-// rocksdb::SecondaryCache.
-//
-// Users can also cast a pointer to it and call methods on
-// it directly, especially custom methods that may be added
-// in the future.  For example -
-// std::unique_ptr<rocksdb::SecondaryCache> cache =
-//      NewLRUSecondaryCache(opts);
-// static_cast<LRUSecondaryCache*>(cache.get())->Erase(key);
-
-class LRUSecondaryCache : public SecondaryCache {
- public:
-  LRUSecondaryCache(
-      size_t capacity, int num_shard_bits, bool strict_capacity_limit,
-      double high_pri_pool_ratio,
-      std::shared_ptr<MemoryAllocator> memory_allocator = nullptr,
-      bool use_adaptive_mutex = kDefaultToAdaptiveMutex,
-      CacheMetadataChargePolicy metadata_charge_policy =
-          kDontChargeCacheMetadata,
-      CompressionType compression_type = CompressionType::kLZ4Compression,
-      uint32_t compress_format_version = 2);
-  virtual ~LRUSecondaryCache() override;
-
-  const char* Name() const override { return "LRUSecondaryCache"; }
-
-  Status Insert(const Slice& key, void* value,
-                const Cache::CacheItemHelper* helper) override;
-
-  std::unique_ptr<SecondaryCacheResultHandle> Lookup(
-      const Slice& key, const Cache::CreateCallback& create_cb,
-      bool /*wait*/) override;
-
-  void Erase(const Slice& key) override;
-
-  void WaitAll(std::vector<SecondaryCacheResultHandle*> /*handles*/) override {}
-
-  std::string GetPrintableOptions() const override;
-
- private:
-  std::shared_ptr<Cache> cache_;
-  LRUSecondaryCacheOptions cache_options_;
-};
-
-}  // namespace ROCKSDB_NAMESPACE
@@ -1,597 +0,0 @@
-//  Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-#include "cache/lru_secondary_cache.h"
-
-#include <algorithm>
-#include <cstdint>
-
-#include "memory/jemalloc_nodump_allocator.h"
-#include "memory/memory_allocator.h"
-#include "test_util/testharness.h"
-#include "test_util/testutil.h"
-#include "util/compression.h"
-#include "util/random.h"
-
-namespace ROCKSDB_NAMESPACE {
-
-class LRUSecondaryCacheTest : public testing::Test {
- public:
-  LRUSecondaryCacheTest() : fail_create_(false) {}
-  ~LRUSecondaryCacheTest() {}
-
- protected:
-  class TestItem {
-   public:
-    TestItem(const char* buf, size_t size) : buf_(new char[size]), size_(size) {
-      memcpy(buf_.get(), buf, size);
-    }
-    ~TestItem() {}
-
-    char* Buf() { return buf_.get(); }
-    size_t Size() { return size_; }
-
-   private:
-    std::unique_ptr<char[]> buf_;
-    size_t size_;
-  };
-
-  static size_t SizeCallback(void* obj) {
-    return reinterpret_cast<TestItem*>(obj)->Size();
-  }
-
-  static Status SaveToCallback(void* from_obj, size_t from_offset,
-                               size_t length, void* out) {
-    TestItem* item = reinterpret_cast<TestItem*>(from_obj);
-    const char* buf = item->Buf();
-    EXPECT_EQ(length, item->Size());
-    EXPECT_EQ(from_offset, 0);
-    memcpy(out, buf, length);
-    return Status::OK();
-  }
-
-  static void DeletionCallback(const Slice& /*key*/, void* obj) {
-    delete reinterpret_cast<TestItem*>(obj);
-    obj = nullptr;
-  }
-
-  static Cache::CacheItemHelper helper_;
-
-  static Status SaveToCallbackFail(void* /*obj*/, size_t /*offset*/,
-                                   size_t /*size*/, void* /*out*/) {
-    return Status::NotSupported();
-  }
-
-  static Cache::CacheItemHelper helper_fail_;
-
-  Cache::CreateCallback test_item_creator = [&](const void* buf, size_t size,
-                                                void** out_obj,
-                                                size_t* charge) -> Status {
-    if (fail_create_) {
-      return Status::NotSupported();
-    }
-    *out_obj = reinterpret_cast<void*>(new TestItem((char*)buf, size));
-    *charge = size;
-    return Status::OK();
-  };
-
-  void SetFailCreate(bool fail) { fail_create_ = fail; }
-
-  void BasicTest(bool sec_cache_is_compressed, bool use_jemalloc) {
-    LRUSecondaryCacheOptions opts;
-    opts.capacity = 2048;
-    opts.num_shard_bits = 0;
-    opts.metadata_charge_policy = kDontChargeCacheMetadata;
-
-    if (sec_cache_is_compressed) {
-      if (!LZ4_Supported()) {
-        ROCKSDB_GTEST_SKIP("This test requires LZ4 support.");
-        opts.compression_type = CompressionType::kNoCompression;
-      }
-    } else {
-      opts.compression_type = CompressionType::kNoCompression;
-    }
-
-    if (use_jemalloc) {
-      JemallocAllocatorOptions jopts;
-      std::shared_ptr<MemoryAllocator> allocator;
-      std::string msg;
-      if (JemallocNodumpAllocator::IsSupported(&msg)) {
-        Status s = NewJemallocNodumpAllocator(jopts, &allocator);
-        if (s.ok()) {
-          opts.memory_allocator = allocator;
-        }
-      } else {
-        ROCKSDB_GTEST_BYPASS("JEMALLOC not supported");
-      }
-    }
-    std::shared_ptr<SecondaryCache> cache = NewLRUSecondaryCache(opts);
-
-    // Lookup an non-existent key.
-    std::unique_ptr<SecondaryCacheResultHandle> handle0 =
-        cache->Lookup("k0", test_item_creator, true);
-    ASSERT_EQ(handle0, nullptr);
-
-    Random rnd(301);
-    // Insert and Lookup the first item.
-    std::string str1;
-    test::CompressibleString(&rnd, 0.25, 1000, &str1);
-    TestItem item1(str1.data(), str1.length());
-    ASSERT_OK(cache->Insert("k1", &item1, &LRUSecondaryCacheTest::helper_));
-    std::unique_ptr<SecondaryCacheResultHandle> handle1 =
-        cache->Lookup("k1", test_item_creator, true);
-    ASSERT_NE(handle1, nullptr);
-    // delete reinterpret_cast<TestItem*>(handle1->Value());
-    std::unique_ptr<TestItem> val1 =
-        std::unique_ptr<TestItem>(static_cast<TestItem*>(handle1->Value()));
-    ASSERT_NE(val1, nullptr);
-    ASSERT_EQ(memcmp(val1->Buf(), item1.Buf(), item1.Size()), 0);
-
-    // Insert and Lookup the second item.
-    std::string str2;
-    test::CompressibleString(&rnd, 0.5, 1000, &str2);
-    TestItem item2(str2.data(), str2.length());
-    ASSERT_OK(cache->Insert("k2", &item2, &LRUSecondaryCacheTest::helper_));
-    std::unique_ptr<SecondaryCacheResultHandle> handle2 =
-        cache->Lookup("k2", test_item_creator, true);
-    ASSERT_NE(handle2, nullptr);
-    std::unique_ptr<TestItem> val2 =
-        std::unique_ptr<TestItem>(static_cast<TestItem*>(handle2->Value()));
-    ASSERT_NE(val2, nullptr);
-    ASSERT_EQ(memcmp(val2->Buf(), item2.Buf(), item2.Size()), 0);
-
-    // Lookup the first item again to make sure it is still in the cache.
-    std::unique_ptr<SecondaryCacheResultHandle> handle1_1 =
-        cache->Lookup("k1", test_item_creator, true);
-    ASSERT_NE(handle1_1, nullptr);
-    std::unique_ptr<TestItem> val1_1 =
-        std::unique_ptr<TestItem>(static_cast<TestItem*>(handle1_1->Value()));
-    ASSERT_NE(val1_1, nullptr);
-    ASSERT_EQ(memcmp(val1_1->Buf(), item1.Buf(), item1.Size()), 0);
-
-    std::vector<SecondaryCacheResultHandle*> handles = {handle1.get(),
-                                                        handle2.get()};
-    cache->WaitAll(handles);
-
-    cache->Erase("k1");
-    handle1 = cache->Lookup("k1", test_item_creator, true);
-    ASSERT_EQ(handle1, nullptr);
-
-    cache.reset();
-  }
-
-  void FailsTest(bool sec_cache_is_compressed) {
-    LRUSecondaryCacheOptions secondary_cache_opts;
-    if (sec_cache_is_compressed) {
-      if (!LZ4_Supported()) {
-        ROCKSDB_GTEST_SKIP("This test requires LZ4 support.");
-        secondary_cache_opts.compression_type = CompressionType::kNoCompression;
-      }
-    } else {
-      secondary_cache_opts.compression_type = CompressionType::kNoCompression;
-    }
-
-    secondary_cache_opts.capacity = 1100;
-    secondary_cache_opts.num_shard_bits = 0;
-    secondary_cache_opts.metadata_charge_policy = kDontChargeCacheMetadata;
-    std::shared_ptr<SecondaryCache> cache =
-        NewLRUSecondaryCache(secondary_cache_opts);
-
-    // Insert and Lookup the first item.
-    Random rnd(301);
-    std::string str1(rnd.RandomString(1000));
-    TestItem item1(str1.data(), str1.length());
-    ASSERT_OK(cache->Insert("k1", &item1, &LRUSecondaryCacheTest::helper_));
-    std::unique_ptr<SecondaryCacheResultHandle> handle1 =
-        cache->Lookup("k1", test_item_creator, true);
-    ASSERT_NE(handle1, nullptr);
-    std::unique_ptr<TestItem> val1 =
-        std::unique_ptr<TestItem>(static_cast<TestItem*>(handle1->Value()));
-    ASSERT_NE(val1, nullptr);
-    ASSERT_EQ(memcmp(val1->Buf(), item1.Buf(), item1.Size()), 0);
-
-    // Insert and Lookup the second item.
-    std::string str2(rnd.RandomString(200));
-    TestItem item2(str2.data(), str2.length());
-    // k1 is evicted.
-    ASSERT_OK(cache->Insert("k2", &item2, &LRUSecondaryCacheTest::helper_));
-    std::unique_ptr<SecondaryCacheResultHandle> handle1_1 =
-        cache->Lookup("k1", test_item_creator, true);
-    ASSERT_EQ(handle1_1, nullptr);
-    std::unique_ptr<SecondaryCacheResultHandle> handle2 =
-        cache->Lookup("k2", test_item_creator, true);
-    ASSERT_NE(handle2, nullptr);
-    std::unique_ptr<TestItem> val2 =
-        std::unique_ptr<TestItem>(static_cast<TestItem*>(handle2->Value()));
-    ASSERT_NE(val2, nullptr);
-    ASSERT_EQ(memcmp(val2->Buf(), item2.Buf(), item2.Size()), 0);
-
-    // Create Fails.
-    SetFailCreate(true);
-    std::unique_ptr<SecondaryCacheResultHandle> handle2_1 =
-        cache->Lookup("k2", test_item_creator, true);
-    ASSERT_EQ(handle2_1, nullptr);
-
-    // Save Fails.
-    std::string str3 = rnd.RandomString(10);
-    TestItem item3(str3.data(), str3.length());
-    ASSERT_NOK(
-        cache->Insert("k3", &item3, &LRUSecondaryCacheTest::helper_fail_));
-
-    cache.reset();
-  }
-
-  void BasicIntegrationTest(bool sec_cache_is_compressed) {
-    LRUSecondaryCacheOptions secondary_cache_opts;
-
-    if (sec_cache_is_compressed) {
-      if (!LZ4_Supported()) {
-        ROCKSDB_GTEST_SKIP("This test requires LZ4 support.");
-        secondary_cache_opts.compression_type = CompressionType::kNoCompression;
-      }
-    } else {
-      secondary_cache_opts.compression_type = CompressionType::kNoCompression;
-    }
-
-    secondary_cache_opts.capacity = 2300;
-    secondary_cache_opts.num_shard_bits = 0;
-    secondary_cache_opts.metadata_charge_policy = kDontChargeCacheMetadata;
-    std::shared_ptr<SecondaryCache> secondary_cache =
-        NewLRUSecondaryCache(secondary_cache_opts);
-    LRUCacheOptions lru_cache_opts(1024, 0, false, 0.5, nullptr,
-                                   kDefaultToAdaptiveMutex,
-                                   kDontChargeCacheMetadata);
-    lru_cache_opts.secondary_cache = secondary_cache;
-    std::shared_ptr<Cache> cache = NewLRUCache(lru_cache_opts);
-    std::shared_ptr<Statistics> stats = CreateDBStatistics();
-
-    Random rnd(301);
-
-    std::string str1 = rnd.RandomString(1010);
-    std::string str1_clone{str1};
-    TestItem* item1 = new TestItem(str1.data(), str1.length());
-    ASSERT_OK(cache->Insert("k1", item1, &LRUSecondaryCacheTest::helper_,
-                            str1.length()));
-
-    std::string str2 = rnd.RandomString(1020);
-    TestItem* item2 = new TestItem(str2.data(), str2.length());
-    // After Insert, lru cache contains k2 and secondary cache contains k1.
-    ASSERT_OK(cache->Insert("k2", item2, &LRUSecondaryCacheTest::helper_,
-                            str2.length()));
-
-    std::string str3 = rnd.RandomString(1020);
-    TestItem* item3 = new TestItem(str3.data(), str3.length());
-    // After Insert, lru cache contains k3 and secondary cache contains k1 and
-    // k2
-    ASSERT_OK(cache->Insert("k3", item3, &LRUSecondaryCacheTest::helper_,
-                            str3.length()));
-
-    Cache::Handle* handle;
-    handle =
-        cache->Lookup("k3", &LRUSecondaryCacheTest::helper_, test_item_creator,
-                      Cache::Priority::LOW, true, stats.get());
-    ASSERT_NE(handle, nullptr);
-    TestItem* val3 = static_cast<TestItem*>(cache->Value(handle));
-    ASSERT_NE(val3, nullptr);
-    ASSERT_EQ(memcmp(val3->Buf(), item3->Buf(), item3->Size()), 0);
-    cache->Release(handle);
-
-    // Lookup an non-existent key.
-    handle =
-        cache->Lookup("k0", &LRUSecondaryCacheTest::helper_, test_item_creator,
-                      Cache::Priority::LOW, true, stats.get());
-    ASSERT_EQ(handle, nullptr);
-
-    // This Lookup should promote k1 and demote k3, so k2 is evicted from the
-    // secondary cache. The lru cache contains k1 and secondary cache contains
-    // k3. item1 was Free(), so it cannot be compared against the item1.
-    handle =
-        cache->Lookup("k1", &LRUSecondaryCacheTest::helper_, test_item_creator,
-                      Cache::Priority::LOW, true, stats.get());
-    ASSERT_NE(handle, nullptr);
-    TestItem* val1_1 = static_cast<TestItem*>(cache->Value(handle));
-    ASSERT_NE(val1_1, nullptr);
-    ASSERT_EQ(memcmp(val1_1->Buf(), str1_clone.data(), str1_clone.size()), 0);
-    cache->Release(handle);
-
-    handle =
-        cache->Lookup("k2", &LRUSecondaryCacheTest::helper_, test_item_creator,
-                      Cache::Priority::LOW, true, stats.get());
-    ASSERT_EQ(handle, nullptr);
-
-    cache.reset();
-    secondary_cache.reset();
-  }
-
-  void BasicIntegrationFailTest(bool sec_cache_is_compressed) {
-    LRUSecondaryCacheOptions secondary_cache_opts;
-
-    if (sec_cache_is_compressed) {
-      if (!LZ4_Supported()) {
-        ROCKSDB_GTEST_SKIP("This test requires LZ4 support.");
-        secondary_cache_opts.compression_type = CompressionType::kNoCompression;
-      }
-    } else {
-      secondary_cache_opts.compression_type = CompressionType::kNoCompression;
-    }
-
-    secondary_cache_opts.capacity = 2048;
-    secondary_cache_opts.num_shard_bits = 0;
-    secondary_cache_opts.metadata_charge_policy = kDontChargeCacheMetadata;
-    std::shared_ptr<SecondaryCache> secondary_cache =
-        NewLRUSecondaryCache(secondary_cache_opts);
-
-    LRUCacheOptions opts(1024, 0, false, 0.5, nullptr, kDefaultToAdaptiveMutex,
-                         kDontChargeCacheMetadata);
-    opts.secondary_cache = secondary_cache;
-    std::shared_ptr<Cache> cache = NewLRUCache(opts);
-
-    Random rnd(301);
-    std::string str1 = rnd.RandomString(1020);
-    auto item1 =
-        std::unique_ptr<TestItem>(new TestItem(str1.data(), str1.length()));
-    ASSERT_NOK(cache->Insert("k1", item1.get(), nullptr, str1.length()));
-    ASSERT_OK(cache->Insert("k1", item1.get(), &LRUSecondaryCacheTest::helper_,
-                            str1.length()));
-    item1.release();  // Appease clang-analyze "potential memory leak"
-
-    Cache::Handle* handle;
-    handle = cache->Lookup("k2", nullptr, test_item_creator,
-                           Cache::Priority::LOW, true);
-    ASSERT_EQ(handle, nullptr);
-    handle = cache->Lookup("k2", &LRUSecondaryCacheTest::helper_,
-                           test_item_creator, Cache::Priority::LOW, false);
-    ASSERT_EQ(handle, nullptr);
-
-    cache.reset();
-    secondary_cache.reset();
-  }
-
-  void IntegrationSaveFailTest(bool sec_cache_is_compressed) {
-    LRUSecondaryCacheOptions secondary_cache_opts;
-
-    if (sec_cache_is_compressed) {
-      if (!LZ4_Supported()) {
-        ROCKSDB_GTEST_SKIP("This test requires LZ4 support.");
-        secondary_cache_opts.compression_type = CompressionType::kNoCompression;
-      }
-    } else {
-      secondary_cache_opts.compression_type = CompressionType::kNoCompression;
-    }
-
-    secondary_cache_opts.capacity = 2048;
-    secondary_cache_opts.num_shard_bits = 0;
-    secondary_cache_opts.metadata_charge_policy = kDontChargeCacheMetadata;
-
-    std::shared_ptr<SecondaryCache> secondary_cache =
-        NewLRUSecondaryCache(secondary_cache_opts);
-
-    LRUCacheOptions opts(1024, 0, false, 0.5, nullptr, kDefaultToAdaptiveMutex,
-                         kDontChargeCacheMetadata);
-    opts.secondary_cache = secondary_cache;
-    std::shared_ptr<Cache> cache = NewLRUCache(opts);
-
-    Random rnd(301);
-    std::string str1 = rnd.RandomString(1020);
-    TestItem* item1 = new TestItem(str1.data(), str1.length());
-    ASSERT_OK(cache->Insert("k1", item1, &LRUSecondaryCacheTest::helper_fail_,
-                            str1.length()));
-    std::string str2 = rnd.RandomString(1020);
-    TestItem* item2 = new TestItem(str2.data(), str2.length());
-    // k1 should be demoted to the secondary cache.
-    ASSERT_OK(cache->Insert("k2", item2, &LRUSecondaryCacheTest::helper_fail_,
-                            str2.length()));
-
-    Cache::Handle* handle;
-    handle = cache->Lookup("k2", &LRUSecondaryCacheTest::helper_fail_,
-                           test_item_creator, Cache::Priority::LOW, true);
-    ASSERT_NE(handle, nullptr);
-    cache->Release(handle);
-    // This lookup should fail, since k1 demotion would have failed
-    handle = cache->Lookup("k1", &LRUSecondaryCacheTest::helper_fail_,
-                           test_item_creator, Cache::Priority::LOW, true);
-    ASSERT_EQ(handle, nullptr);
-    // Since k1 didn't get promoted, k2 should still be in cache
-    handle = cache->Lookup("k2", &LRUSecondaryCacheTest::helper_fail_,
-                           test_item_creator, Cache::Priority::LOW, true);
-    ASSERT_NE(handle, nullptr);
-    cache->Release(handle);
-
-    cache.reset();
-    secondary_cache.reset();
-  }
-
-  void IntegrationCreateFailTest(bool sec_cache_is_compressed) {
-    LRUSecondaryCacheOptions secondary_cache_opts;
-
-    if (sec_cache_is_compressed) {
-      if (!LZ4_Supported()) {
-        ROCKSDB_GTEST_SKIP("This test requires LZ4 support.");
-        secondary_cache_opts.compression_type = CompressionType::kNoCompression;
-      }
-    } else {
-      secondary_cache_opts.compression_type = CompressionType::kNoCompression;
-    }
-
-    secondary_cache_opts.capacity = 2048;
-    secondary_cache_opts.num_shard_bits = 0;
-    secondary_cache_opts.metadata_charge_policy = kDontChargeCacheMetadata;
-
-    std::shared_ptr<SecondaryCache> secondary_cache =
-        NewLRUSecondaryCache(secondary_cache_opts);
-
-    LRUCacheOptions opts(1024, 0, false, 0.5, nullptr, kDefaultToAdaptiveMutex,
-                         kDontChargeCacheMetadata);
-    opts.secondary_cache = secondary_cache;
-    std::shared_ptr<Cache> cache = NewLRUCache(opts);
-
-    Random rnd(301);
-    std::string str1 = rnd.RandomString(1020);
-    TestItem* item1 = new TestItem(str1.data(), str1.length());
-    ASSERT_OK(cache->Insert("k1", item1, &LRUSecondaryCacheTest::helper_,
-                            str1.length()));
-
-    std::string str2 = rnd.RandomString(1020);
-    TestItem* item2 = new TestItem(str2.data(), str2.length());
-    // k1 should be demoted to the secondary cache.
-    ASSERT_OK(cache->Insert("k2", item2, &LRUSecondaryCacheTest::helper_,
-                            str2.length()));
-
-    Cache::Handle* handle;
-    SetFailCreate(true);
-    handle = cache->Lookup("k2", &LRUSecondaryCacheTest::helper_,
-                           test_item_creator, Cache::Priority::LOW, true);
-    ASSERT_NE(handle, nullptr);
-    cache->Release(handle);
-    // This lookup should fail, since k1 creation would have failed
-    handle = cache->Lookup("k1", &LRUSecondaryCacheTest::helper_,
-                           test_item_creator, Cache::Priority::LOW, true);
-    ASSERT_EQ(handle, nullptr);
-    // Since k1 didn't get promoted, k2 should still be in cache
-    handle = cache->Lookup("k2", &LRUSecondaryCacheTest::helper_,
-                           test_item_creator, Cache::Priority::LOW, true);
-    ASSERT_NE(handle, nullptr);
-    cache->Release(handle);
-
-    cache.reset();
-    secondary_cache.reset();
-  }
-
-  void IntegrationFullCapacityTest(bool sec_cache_is_compressed) {
-    LRUSecondaryCacheOptions secondary_cache_opts;
-
-    if (sec_cache_is_compressed) {
-      if (!LZ4_Supported()) {
-        ROCKSDB_GTEST_SKIP("This test requires LZ4 support.");
-        secondary_cache_opts.compression_type = CompressionType::kNoCompression;
-      }
-    } else {
-      secondary_cache_opts.compression_type = CompressionType::kNoCompression;
-    }
-
-    secondary_cache_opts.capacity = 2048;
-    secondary_cache_opts.num_shard_bits = 0;
-    secondary_cache_opts.metadata_charge_policy = kDontChargeCacheMetadata;
-
-    std::shared_ptr<SecondaryCache> secondary_cache =
-        NewLRUSecondaryCache(secondary_cache_opts);
-
-    LRUCacheOptions opts(1024, 0, /*_strict_capacity_limit=*/true, 0.5, nullptr,
-                         kDefaultToAdaptiveMutex, kDontChargeCacheMetadata);
-    opts.secondary_cache = secondary_cache;
-    std::shared_ptr<Cache> cache = NewLRUCache(opts);
-
-    Random rnd(301);
-    std::string str1 = rnd.RandomString(1020);
-    TestItem* item1 = new TestItem(str1.data(), str1.length());
-    ASSERT_OK(cache->Insert("k1", item1, &LRUSecondaryCacheTest::helper_,
-                            str1.length()));
-    std::string str2 = rnd.RandomString(1020);
-    TestItem* item2 = new TestItem(str2.data(), str2.length());
-    // k1 should be demoted to the secondary cache.
-    ASSERT_OK(cache->Insert("k2", item2, &LRUSecondaryCacheTest::helper_,
-                            str2.length()));
-
-    Cache::Handle* handle;
-    handle = cache->Lookup("k2", &LRUSecondaryCacheTest::helper_,
-                           test_item_creator, Cache::Priority::LOW, true);
-    ASSERT_NE(handle, nullptr);
-    // k1 promotion should fail due to the block cache being at capacity,
-    // but the lookup should still succeed
-    Cache::Handle* handle2;
-    handle2 = cache->Lookup("k1", &LRUSecondaryCacheTest::helper_,
-                            test_item_creator, Cache::Priority::LOW, true);
-    ASSERT_NE(handle2, nullptr);
-    // Since k1 didn't get inserted, k2 should still be in cache
-    cache->Release(handle);
-    cache->Release(handle2);
-    handle = cache->Lookup("k2", &LRUSecondaryCacheTest::helper_,
-                           test_item_creator, Cache::Priority::LOW, true);
-    ASSERT_NE(handle, nullptr);
-    cache->Release(handle);
-
-    cache.reset();
-    secondary_cache.reset();
-  }
-
- private:
-  bool fail_create_;
-};
-
-Cache::CacheItemHelper LRUSecondaryCacheTest::helper_(
-    LRUSecondaryCacheTest::SizeCallback, LRUSecondaryCacheTest::SaveToCallback,
-    LRUSecondaryCacheTest::DeletionCallback);
-
-Cache::CacheItemHelper LRUSecondaryCacheTest::helper_fail_(
-    LRUSecondaryCacheTest::SizeCallback,
-    LRUSecondaryCacheTest::SaveToCallbackFail,
-    LRUSecondaryCacheTest::DeletionCallback);
-
-TEST_F(LRUSecondaryCacheTest, BasicTestWithNoCompression) {
-  BasicTest(false, false);
-}
-
-TEST_F(LRUSecondaryCacheTest, BasicTestWithMemoryAllocatorAndNoCompression) {
-  BasicTest(false, true);
-}
-
-TEST_F(LRUSecondaryCacheTest, BasicTestWithCompression) {
-  BasicTest(true, false);
-}
-
-TEST_F(LRUSecondaryCacheTest, BasicTestWithMemoryAllocatorAndCompression) {
-  BasicTest(true, true);
-}
-
-TEST_F(LRUSecondaryCacheTest, FailsTestWithNoCompression) { FailsTest(false); }
-
-TEST_F(LRUSecondaryCacheTest, FailsTestWithCompression) { FailsTest(true); }
-
-TEST_F(LRUSecondaryCacheTest, BasicIntegrationTestWithNoCompression) {
-  BasicIntegrationTest(false);
-}
-
-TEST_F(LRUSecondaryCacheTest, BasicIntegrationTestWithCompression) {
-  BasicIntegrationTest(true);
-}
-
-TEST_F(LRUSecondaryCacheTest, BasicIntegrationFailTestWithNoCompression) {
-  BasicIntegrationFailTest(false);
-}
-
-TEST_F(LRUSecondaryCacheTest, BasicIntegrationFailTestWithCompression) {
-  BasicIntegrationFailTest(true);
-}
-
-TEST_F(LRUSecondaryCacheTest, IntegrationSaveFailTestWithNoCompression) {
-  IntegrationSaveFailTest(false);
-}
-
-TEST_F(LRUSecondaryCacheTest, IntegrationSaveFailTestWithCompression) {
-  IntegrationSaveFailTest(true);
-}
-
-TEST_F(LRUSecondaryCacheTest, IntegrationCreateFailTestWithNoCompression) {
-  IntegrationCreateFailTest(false);
-}
-
-TEST_F(LRUSecondaryCacheTest, IntegrationCreateFailTestWithCompression) {
-  IntegrationCreateFailTest(true);
-}
-
-TEST_F(LRUSecondaryCacheTest, IntegrationFullCapacityTestWithNoCompression) {
-  IntegrationFullCapacityTest(false);
-}
-
-TEST_F(LRUSecondaryCacheTest, IntegrationFullCapacityTestWithCompression) {
-  IntegrationFullCapacityTest(true);
-}
-
-}  // namespace ROCKSDB_NAMESPACE
-
-int main(int argc, char** argv) {
-  ::testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}
@@ -1,87 +0,0 @@
-# This file is used by Meta-internal infrastructure as well as by Makefile
-
-# When included from Makefile, there are rules to build DB_STRESS_CMD. When
-# used directly with `make -f crashtest.mk ...` there will be no rules to
-# build DB_STRESS_CMD so it must exist prior.
-DB_STRESS_CMD?=./db_stress
-
-include python.mk
-
-CRASHTEST_MAKE=$(MAKE) -f crash_test.mk
-CRASHTEST_PY=$(PYTHON) -u tools/db_crashtest.py --stress_cmd=$(DB_STRESS_CMD)
-
-.PHONY: crash_test crash_test_with_atomic_flush crash_test_with_txn \
-	crash_test_with_best_efforts_recovery crash_test_with_ts \
-	blackbox_crash_test blackbox_crash_test_with_atomic_flush \
-	blackbox_crash_test_with_txn blackbox_crash_test_with_ts \
-	blackbox_crash_test_with_best_efforts_recovery \
-	whitebox_crash_test whitebox_crash_test_with_atomic_flush \
-	whitebox_crash_test_with_txn whitebox_crash_test_with_ts \
-	blackbox_crash_test_with_multiops_wc_txn \
-	blackbox_crash_test_with_multiops_wp_txn
-
-crash_test: $(DB_STRESS_CMD)
-# Do not parallelize
-	$(CRASHTEST_MAKE) whitebox_crash_test
-	$(CRASHTEST_MAKE) blackbox_crash_test
-
-crash_test_with_atomic_flush: $(DB_STRESS_CMD)
-# Do not parallelize
-	$(CRASHTEST_MAKE) whitebox_crash_test_with_atomic_flush
-	$(CRASHTEST_MAKE) blackbox_crash_test_with_atomic_flush
-
-crash_test_with_txn: $(DB_STRESS_CMD)
-# Do not parallelize
-	$(CRASHTEST_MAKE) whitebox_crash_test_with_txn
-	$(CRASHTEST_MAKE) blackbox_crash_test_with_txn
-
-crash_test_with_best_efforts_recovery: blackbox_crash_test_with_best_efforts_recovery
-
-crash_test_with_ts: $(DB_STRESS_CMD)
-# Do not parallelize
-	$(CRASHTEST_MAKE) whitebox_crash_test_with_ts
-	$(CRASHTEST_MAKE) blackbox_crash_test_with_ts
-
-blackbox_crash_test: $(DB_STRESS_CMD)
-	$(CRASHTEST_PY) --simple blackbox $(CRASH_TEST_EXT_ARGS)
-	$(CRASHTEST_PY) blackbox $(CRASH_TEST_EXT_ARGS)
-
-blackbox_crash_test_with_atomic_flush: $(DB_STRESS_CMD)
-	$(CRASHTEST_PY) --cf_consistency blackbox $(CRASH_TEST_EXT_ARGS)
-
-blackbox_crash_test_with_txn: $(DB_STRESS_CMD)
-	$(CRASHTEST_PY) --txn blackbox $(CRASH_TEST_EXT_ARGS)
-
-blackbox_crash_test_with_best_efforts_recovery: $(DB_STRESS_CMD)
-	$(CRASHTEST_PY) --test_best_efforts_recovery blackbox $(CRASH_TEST_EXT_ARGS)
-
-blackbox_crash_test_with_ts: $(DB_STRESS_CMD)
-	$(CRASHTEST_PY) --enable_ts blackbox $(CRASH_TEST_EXT_ARGS)
-
-blackbox_crash_test_with_multiops_wc_txn: $(DB_STRESS_CMD)
-	$(PYTHON) -u tools/db_crashtest.py --test_multiops_txn --write_policy write_committed blackbox $(CRASH_TEST_EXT_ARGS)
-
-blackbox_crash_test_with_multiops_wp_txn: $(DB_STRESS_CMD)
-	$(PYTHON) -u tools/db_crashtest.py --test_multiops_txn --write_policy write_prepared blackbox $(CRASH_TEST_EXT_ARGS)
-
-ifeq ($(CRASH_TEST_KILL_ODD),)
-  CRASH_TEST_KILL_ODD=888887
-endif
-
-whitebox_crash_test: $(DB_STRESS_CMD)
-	$(CRASHTEST_PY) --simple whitebox --random_kill_odd \
-      $(CRASH_TEST_KILL_ODD) $(CRASH_TEST_EXT_ARGS)
-	$(CRASHTEST_PY) whitebox  --random_kill_odd \
-      $(CRASH_TEST_KILL_ODD) $(CRASH_TEST_EXT_ARGS)
-
-whitebox_crash_test_with_atomic_flush: $(DB_STRESS_CMD)
-	$(CRASHTEST_PY) --cf_consistency whitebox  --random_kill_odd \
-      $(CRASH_TEST_KILL_ODD) $(CRASH_TEST_EXT_ARGS)
-
-whitebox_crash_test_with_txn: $(DB_STRESS_CMD)
-	$(CRASHTEST_PY) --txn whitebox --random_kill_odd \
-      $(CRASH_TEST_KILL_ODD) $(CRASH_TEST_EXT_ARGS)
-
-whitebox_crash_test_with_ts: $(DB_STRESS_CMD)
-	$(CRASHTEST_PY) --enable_ts whitebox --random_kill_odd \
-      $(CRASH_TEST_KILL_ODD) $(CRASH_TEST_EXT_ARGS)
@@ -148,10 +148,9 @@ Status BlobFileReader::ReadHeader(const RandomAccessFileReader* file_reader,
    constexpr uint64_t read_offset = 0;
    constexpr size_t read_size = BlobLogHeader::kSize;

-    // TODO: rate limit reading headers from blob files.
-    const Status s = ReadFromFile(file_reader, read_offset, read_size,
-                                  statistics, &header_slice, &buf, &aligned_buf,
-                                  Env::IO_TOTAL /* rate_limiter_priority */);
+    const Status s =
+        ReadFromFile(file_reader, read_offset, read_size, statistics,
+                     &header_slice, &buf, &aligned_buf);
    if (!s.ok()) {
      return s;
    }
@@ -199,10 +198,9 @@ Status BlobFileReader::ReadFooter(const RandomAccessFileReader* file_reader,
    const uint64_t read_offset = file_size - BlobLogFooter::kSize;
    constexpr size_t read_size = BlobLogFooter::kSize;

-    // TODO: rate limit reading footers from blob files.
-    const Status s = ReadFromFile(file_reader, read_offset, read_size,
-                                  statistics, &footer_slice, &buf, &aligned_buf,
-                                  Env::IO_TOTAL /* rate_limiter_priority */);
+    const Status s =
+        ReadFromFile(file_reader, read_offset, read_size, statistics,
+                     &footer_slice, &buf, &aligned_buf);
    if (!s.ok()) {
      return s;
    }
@@ -232,8 +230,7 @@ Status BlobFileReader::ReadFooter(const RandomAccessFileReader* file_reader,
 Status BlobFileReader::ReadFromFile(const RandomAccessFileReader* file_reader,
                                    uint64_t read_offset, size_t read_size,
                                    Statistics* statistics, Slice* slice,
-                                    Buffer* buf, AlignedBuf* aligned_buf,
-                                    Env::IOPriority rate_limiter_priority) {
+                                    Buffer* buf, AlignedBuf* aligned_buf) {
  assert(slice);
  assert(buf);
  assert(aligned_buf);
@@ -248,13 +245,13 @@ Status BlobFileReader::ReadFromFile(const RandomAccessFileReader* file_reader,
    constexpr char* scratch = nullptr;

    s = file_reader->Read(IOOptions(), read_offset, read_size, slice, scratch,
-                          aligned_buf, rate_limiter_priority);
+                          aligned_buf);
  } else {
    buf->reset(new char[read_size]);
    constexpr AlignedBuf* aligned_scratch = nullptr;

    s = file_reader->Read(IOOptions(), read_offset, read_size, slice,
-                          buf->get(), aligned_scratch, rate_limiter_priority);
+                          buf->get(), aligned_scratch);
  }

  if (!s.ok()) {
@@ -326,8 +323,7 @@ Status BlobFileReader::GetBlob(const ReadOptions& read_options,

    prefetched = prefetch_buffer->TryReadFromCache(
        IOOptions(), file_reader_.get(), record_offset,
-        static_cast<size_t>(record_size), &record_slice, &s,
-        read_options.rate_limiter_priority, for_compaction);
+        static_cast<size_t>(record_size), &record_slice, &s, for_compaction);
    if (!s.ok()) {
      return s;
    }
@@ -338,8 +334,7 @@ Status BlobFileReader::GetBlob(const ReadOptions& read_options,

    const Status s = ReadFromFile(file_reader_.get(), record_offset,
                                  static_cast<size_t>(record_size), statistics_,
-                                  &record_slice, &buf, &aligned_buf,
-                                  read_options.rate_limiter_priority);
+                                  &record_slice, &buf, &aligned_buf);
    if (!s.ok()) {
      return s;
    }
@@ -429,8 +424,7 @@ void BlobFileReader::MultiGetBlob(
  }
  TEST_SYNC_POINT("BlobFileReader::MultiGetBlob:ReadFromFile");
  s = file_reader_->MultiRead(IOOptions(), read_reqs.data(), read_reqs.size(),
-                              direct_io ? &aligned_buf : nullptr,
-                              read_options.rate_limiter_priority);
+                              direct_io ? &aligned_buf : nullptr);
  if (!s.ok()) {
    for (auto& req : read_reqs) {
      req.status.PermitUncheckedError();
@@ -83,8 +83,7 @@ class BlobFileReader {
  static Status ReadFromFile(const RandomAccessFileReader* file_reader,
                             uint64_t read_offset, size_t read_size,
                             Statistics* statistics, Slice* slice, Buffer* buf,
-                             AlignedBuf* aligned_buf,
-                             Env::IOPriority rate_limiter_priority);
+                             AlignedBuf* aligned_buf);

  static Status VerifyBlob(const Slice& record_slice, const Slice& user_key,
                           uint64_t value_size);
@@ -28,10 +28,8 @@ Status BlobLogSequentialReader::ReadSlice(uint64_t size, Slice* slice,
  assert(file_);

  StopWatch read_sw(clock_, statistics_, BLOB_DB_BLOB_FILE_READ_MICROS);
-  // TODO: rate limit `BlobLogSequentialReader` reads (it appears unused?)
-  Status s =
-      file_->Read(IOOptions(), next_byte_, static_cast<size_t>(size), slice,
-                  buf, nullptr, Env::IO_TOTAL /* rate_limiter_priority */);
+  Status s = file_->Read(IOOptions(), next_byte_, static_cast<size_t>(size),
+                         slice, buf, nullptr);
  next_byte_ += size;
  if (!s.ok()) {
    return s;
@@ -694,21 +694,18 @@ TEST_F(DBBlobBasicTest, Properties) {
  constexpr char key3[] = "key3";
  constexpr size_t key3_size = sizeof(key3) - 1;

-  constexpr char blob[] = "00000000000000";
+  constexpr char blob[] = "0000000000";
  constexpr size_t blob_size = sizeof(blob) - 1;

-  constexpr char longer_blob[] = "00000000000000000000";
-  constexpr size_t longer_blob_size = sizeof(longer_blob) - 1;
-
  ASSERT_OK(Put(key1, blob));
-  ASSERT_OK(Put(key2, longer_blob));
+  ASSERT_OK(Put(key2, blob));
  ASSERT_OK(Flush());

  constexpr size_t first_blob_file_expected_size =
      BlobLogHeader::kSize +
      BlobLogRecord::CalculateAdjustmentForRecordHeader(key1_size) + blob_size +
-      BlobLogRecord::CalculateAdjustmentForRecordHeader(key2_size) +
-      longer_blob_size + BlobLogFooter::kSize;
+      BlobLogRecord::CalculateAdjustmentForRecordHeader(key2_size) + blob_size +
+      BlobLogFooter::kSize;

  ASSERT_OK(Put(key3, blob));
  ASSERT_OK(Flush());
@@ -750,12 +747,7 @@ TEST_F(DBBlobBasicTest, Properties) {
  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), begin, end));

  constexpr size_t expected_garbage_size =
-      BlobLogRecord::CalculateAdjustmentForRecordHeader(key2_size) +
-      longer_blob_size;
-
-  constexpr double expected_space_amp =
-      static_cast<double>(total_expected_size) /
-      (total_expected_size - expected_garbage_size);
+      BlobLogRecord::CalculateAdjustmentForRecordHeader(key2_size) + blob_size;

  // Blob file stats
  std::string blob_stats;
@@ -765,7 +757,7 @@ TEST_F(DBBlobBasicTest, Properties) {
  oss << "Number of blob files: 2\nTotal size of blob files: "
      << total_expected_size
      << "\nTotal size of garbage in blob files: " << expected_garbage_size
-      << "\nBlob file space amplification: " << expected_space_amp << '\n';
+      << '\n';

  ASSERT_EQ(blob_stats, oss.str());
 }
@@ -512,7 +512,8 @@ TEST_F(DBBlobCompactionTest, TrackGarbage) {
  ASSERT_EQ(blob_files.size(), 2);

  {
-    const auto& meta = blob_files.front();
+    auto it = blob_files.begin();
+    const auto& meta = it->second;
    assert(meta);

    constexpr uint64_t first_expected_bytes =
@@ -542,7 +543,8 @@ TEST_F(DBBlobCompactionTest, TrackGarbage) {
  }

  {
-    const auto& meta = blob_files.back();
+    auto it = blob_files.rbegin();
+    const auto& meta = it->second;
    assert(meta);

    constexpr uint64_t new_first_expected_bytes =
@@ -318,7 +318,6 @@ Status BuildTable(

    // TODO Also check the IO status when create the Iterator.

-    TEST_SYNC_POINT("BuildTable:BeforeOutputValidation");
    if (s.ok() && !empty) {
      // Verify that the table is usable
      // We set for_compaction to false and don't OptimizeForCompactionTableRead
@@ -35,7 +35,7 @@
 #include "rocksdb/status.h"
 #include "rocksdb/table.h"
 #include "rocksdb/universal_compaction.h"
-#include "rocksdb/utilities/backup_engine.h"
+#include "rocksdb/utilities/backupable_db.h"
 #include "rocksdb/utilities/checkpoint.h"
 #include "rocksdb/utilities/db_ttl.h"
 #include "rocksdb/utilities/memory_util.h"
@@ -47,8 +47,8 @@
 #include "rocksdb/write_batch.h"
 #include "utilities/merge_operators.h"

+using ROCKSDB_NAMESPACE::BackupableDBOptions;
 using ROCKSDB_NAMESPACE::BackupEngine;
-using ROCKSDB_NAMESPACE::BackupEngineOptions;
 using ROCKSDB_NAMESPACE::BackupID;
 using ROCKSDB_NAMESPACE::BackupInfo;
 using ROCKSDB_NAMESPACE::BatchResult;
@@ -189,8 +189,8 @@ struct rocksdb_transaction_options_t {
 struct rocksdb_transaction_t {
  Transaction* rep;
 };
-struct rocksdb_backup_engine_options_t {
-  BackupEngineOptions rep;
+struct rocksdb_backupable_db_options_t {
+  BackupableDBOptions rep;
 };
 struct rocksdb_checkpoint_t {
  Checkpoint* rep;
@@ -290,10 +290,45 @@ struct rocksdb_filterpolicy_t : public FilterPolicy {
  void* state_;
  void (*destructor_)(void*);
  const char* (*name_)(void*);
+  char* (*create_)(
+      void*,
+      const char* const* key_array, const size_t* key_length_array,
+      int num_keys,
+      size_t* filter_length);
+  unsigned char (*key_match_)(
+      void*,
+      const char* key, size_t length,
+      const char* filter, size_t filter_length);
+  void (*delete_filter_)(
+      void*,
+      const char* filter, size_t filter_length);

  ~rocksdb_filterpolicy_t() override { (*destructor_)(state_); }

  const char* Name() const override { return (*name_)(state_); }
+
+  void CreateFilter(const Slice* keys, int n, std::string* dst) const override {
+    std::vector<const char*> key_pointers(n);
+    std::vector<size_t> key_sizes(n);
+    for (int i = 0; i < n; i++) {
+      key_pointers[i] = keys[i].data();
+      key_sizes[i] = keys[i].size();
+    }
+    size_t len;
+    char* filter = (*create_)(state_, &key_pointers[0], &key_sizes[0], n, &len);
+    dst->append(filter, len);
+
+    if (delete_filter_ != nullptr) {
+      (*delete_filter_)(state_, filter, len);
+    } else {
+      free(filter);
+    }
+  }
+
+  bool KeyMayMatch(const Slice& key, const Slice& filter) const override {
+    return (*key_match_)(state_, key.data(), key.size(),
+                         filter.data(), filter.size());
+  }
 };

 struct rocksdb_mergeoperator_t : public MergeOperator {
@@ -512,11 +547,12 @@ rocksdb_t* rocksdb_open_as_secondary(const rocksdb_options_t* options,
 rocksdb_backup_engine_t* rocksdb_backup_engine_open(
    const rocksdb_options_t* options, const char* path, char** errptr) {
  BackupEngine* be;
-  if (SaveError(errptr, BackupEngine::Open(
-                            options->rep.env,
-                            BackupEngineOptions(path, nullptr, true,
-                                                options->rep.info_log.get()),
-                            &be))) {
+  if (SaveError(errptr, BackupEngine::Open(options->rep.env,
+                                           BackupableDBOptions(path,
+                                                               nullptr,
+                                                               true,
+                                                               options->rep.info_log.get()),
+                                           &be))) {
    return nullptr;
  }
  rocksdb_backup_engine_t* result = new rocksdb_backup_engine_t;
@@ -525,7 +561,7 @@ rocksdb_backup_engine_t* rocksdb_backup_engine_open(
 }

 rocksdb_backup_engine_t* rocksdb_backup_engine_open_opts(
-    const rocksdb_backup_engine_options_t* options, rocksdb_env_t* env,
+    const rocksdb_backupable_db_options_t* options, rocksdb_env_t* env,
    char** errptr) {
  BackupEngine* be;
  if (SaveError(errptr, BackupEngine::Open(options->rep, env->rep, &be))) {
@@ -632,125 +668,125 @@ void rocksdb_backup_engine_close(rocksdb_backup_engine_t* be) {
  delete be;
 }

-rocksdb_backup_engine_options_t* rocksdb_backup_engine_options_create(
+rocksdb_backupable_db_options_t* rocksdb_backupable_db_options_create(
    const char* backup_dir) {
-  return new rocksdb_backup_engine_options_t{
-      BackupEngineOptions(std::string(backup_dir))};
+  return new rocksdb_backupable_db_options_t{
+      BackupableDBOptions(std::string(backup_dir))};
 }

-void rocksdb_backup_engine_options_set_backup_dir(
-    rocksdb_backup_engine_options_t* options, const char* backup_dir) {
+void rocksdb_backupable_db_options_set_backup_dir(
+    rocksdb_backupable_db_options_t* options, const char* backup_dir) {
  options->rep.backup_dir = std::string(backup_dir);
 }

-void rocksdb_backup_engine_options_set_env(
-    rocksdb_backup_engine_options_t* options, rocksdb_env_t* env) {
+void rocksdb_backupable_db_options_set_env(
+    rocksdb_backupable_db_options_t* options, rocksdb_env_t* env) {
  options->rep.backup_env = (env ? env->rep : nullptr);
 }

-void rocksdb_backup_engine_options_set_share_table_files(
-    rocksdb_backup_engine_options_t* options, unsigned char val) {
+void rocksdb_backupable_db_options_set_share_table_files(
+    rocksdb_backupable_db_options_t* options, unsigned char val) {
  options->rep.share_table_files = val;
 }

-unsigned char rocksdb_backup_engine_options_get_share_table_files(
-    rocksdb_backup_engine_options_t* options) {
+unsigned char rocksdb_backupable_db_options_get_share_table_files(
+    rocksdb_backupable_db_options_t* options) {
  return options->rep.share_table_files;
 }

-void rocksdb_backup_engine_options_set_sync(
-    rocksdb_backup_engine_options_t* options, unsigned char val) {
+void rocksdb_backupable_db_options_set_sync(
+    rocksdb_backupable_db_options_t* options, unsigned char val) {
  options->rep.sync = val;
 }

-unsigned char rocksdb_backup_engine_options_get_sync(
-    rocksdb_backup_engine_options_t* options) {
+unsigned char rocksdb_backupable_db_options_get_sync(
+    rocksdb_backupable_db_options_t* options) {
  return options->rep.sync;
 }

-void rocksdb_backup_engine_options_set_destroy_old_data(
-    rocksdb_backup_engine_options_t* options, unsigned char val) {
+void rocksdb_backupable_db_options_set_destroy_old_data(
+    rocksdb_backupable_db_options_t* options, unsigned char val) {
  options->rep.destroy_old_data = val;
 }

-unsigned char rocksdb_backup_engine_options_get_destroy_old_data(
-    rocksdb_backup_engine_options_t* options) {
+unsigned char rocksdb_backupable_db_options_get_destroy_old_data(
+    rocksdb_backupable_db_options_t* options) {
  return options->rep.destroy_old_data;
 }

-void rocksdb_backup_engine_options_set_backup_log_files(
-    rocksdb_backup_engine_options_t* options, unsigned char val) {
+void rocksdb_backupable_db_options_set_backup_log_files(
+    rocksdb_backupable_db_options_t* options, unsigned char val) {
  options->rep.backup_log_files = val;
 }

-unsigned char rocksdb_backup_engine_options_get_backup_log_files(
-    rocksdb_backup_engine_options_t* options) {
+unsigned char rocksdb_backupable_db_options_get_backup_log_files(
+    rocksdb_backupable_db_options_t* options) {
  return options->rep.backup_log_files;
 }

-void rocksdb_backup_engine_options_set_backup_rate_limit(
-    rocksdb_backup_engine_options_t* options, uint64_t limit) {
+void rocksdb_backupable_db_options_set_backup_rate_limit(
+    rocksdb_backupable_db_options_t* options, uint64_t limit) {
  options->rep.backup_rate_limit = limit;
 }

-uint64_t rocksdb_backup_engine_options_get_backup_rate_limit(
-    rocksdb_backup_engine_options_t* options) {
+uint64_t rocksdb_backupable_db_options_get_backup_rate_limit(
+    rocksdb_backupable_db_options_t* options) {
  return options->rep.backup_rate_limit;
 }

-void rocksdb_backup_engine_options_set_restore_rate_limit(
-    rocksdb_backup_engine_options_t* options, uint64_t limit) {
+void rocksdb_backupable_db_options_set_restore_rate_limit(
+    rocksdb_backupable_db_options_t* options, uint64_t limit) {
  options->rep.restore_rate_limit = limit;
 }

-uint64_t rocksdb_backup_engine_options_get_restore_rate_limit(
-    rocksdb_backup_engine_options_t* options) {
+uint64_t rocksdb_backupable_db_options_get_restore_rate_limit(
+    rocksdb_backupable_db_options_t* options) {
  return options->rep.restore_rate_limit;
 }

-void rocksdb_backup_engine_options_set_max_background_operations(
-    rocksdb_backup_engine_options_t* options, int val) {
+void rocksdb_backupable_db_options_set_max_background_operations(
+    rocksdb_backupable_db_options_t* options, int val) {
  options->rep.max_background_operations = val;
 }

-int rocksdb_backup_engine_options_get_max_background_operations(
-    rocksdb_backup_engine_options_t* options) {
+int rocksdb_backupable_db_options_get_max_background_operations(
+    rocksdb_backupable_db_options_t* options) {
  return options->rep.max_background_operations;
 }

-void rocksdb_backup_engine_options_set_callback_trigger_interval_size(
-    rocksdb_backup_engine_options_t* options, uint64_t size) {
+void rocksdb_backupable_db_options_set_callback_trigger_interval_size(
+    rocksdb_backupable_db_options_t* options, uint64_t size) {
  options->rep.callback_trigger_interval_size = size;
 }

-uint64_t rocksdb_backup_engine_options_get_callback_trigger_interval_size(
-    rocksdb_backup_engine_options_t* options) {
+uint64_t rocksdb_backupable_db_options_get_callback_trigger_interval_size(
+    rocksdb_backupable_db_options_t* options) {
  return options->rep.callback_trigger_interval_size;
 }

-void rocksdb_backup_engine_options_set_max_valid_backups_to_open(
-    rocksdb_backup_engine_options_t* options, int val) {
+void rocksdb_backupable_db_options_set_max_valid_backups_to_open(
+    rocksdb_backupable_db_options_t* options, int val) {
  options->rep.max_valid_backups_to_open = val;
 }

-int rocksdb_backup_engine_options_get_max_valid_backups_to_open(
-    rocksdb_backup_engine_options_t* options) {
+int rocksdb_backupable_db_options_get_max_valid_backups_to_open(
+    rocksdb_backupable_db_options_t* options) {
  return options->rep.max_valid_backups_to_open;
 }

-void rocksdb_backup_engine_options_set_share_files_with_checksum_naming(
-    rocksdb_backup_engine_options_t* options, int val) {
+void rocksdb_backupable_db_options_set_share_files_with_checksum_naming(
+    rocksdb_backupable_db_options_t* options, int val) {
  options->rep.share_files_with_checksum_naming =
-      static_cast<BackupEngineOptions::ShareFilesNaming>(val);
+      static_cast<BackupableDBOptions::ShareFilesNaming>(val);
 }

-int rocksdb_backup_engine_options_get_share_files_with_checksum_naming(
-    rocksdb_backup_engine_options_t* options) {
+int rocksdb_backupable_db_options_get_share_files_with_checksum_naming(
+    rocksdb_backupable_db_options_t* options) {
  return static_cast<int>(options->rep.share_files_with_checksum_naming);
 }

-void rocksdb_backup_engine_options_destroy(
-    rocksdb_backup_engine_options_t* options) {
+void rocksdb_backupable_db_options_destroy(
+    rocksdb_backupable_db_options_t* options) {
  delete options;
 }

@@ -2297,6 +2333,11 @@ void rocksdb_block_based_options_set_data_block_hash_ratio(
  options->rep.data_block_hash_table_util_ratio = v;
 }

+void rocksdb_block_based_options_set_hash_index_allow_collision(
+    rocksdb_block_based_table_options_t* options, unsigned char v) {
+  options->rep.hash_index_allow_collision = v;
+}
+
 void rocksdb_block_based_options_set_cache_index_and_filter_blocks(
    rocksdb_block_based_table_options_t* options, unsigned char v) {
  options->rep.cache_index_and_filter_blocks = v;
@@ -2765,6 +2806,9 @@ int rocksdb_options_get_level0_stop_writes_trigger(rocksdb_options_t* opt) {
  return opt->rep.level0_stop_writes_trigger;
 }

+void rocksdb_options_set_max_mem_compaction_level(rocksdb_options_t* /*opt*/,
+                                                  int /*n*/) {}
+
 void rocksdb_options_set_wal_recovery_mode(rocksdb_options_t* opt,int mode) {
  opt->rep.wal_recovery_mode = static_cast<WALRecoveryMode>(mode);
 }
@@ -2915,6 +2959,10 @@ size_t rocksdb_options_get_manifest_preallocation_size(rocksdb_options_t* opt) {
  return opt->rep.manifest_preallocation_size;
 }

+// noop
+void rocksdb_options_set_purge_redundant_kvs_while_flush(
+    rocksdb_options_t* /*opt*/, unsigned char /*v*/) {}
+
 void rocksdb_options_set_use_direct_reads(rocksdb_options_t* opt,
                                          unsigned char v) {
  opt->rep.use_direct_reads = v;
@@ -2961,6 +3009,16 @@ unsigned char rocksdb_options_get_is_fd_close_on_exec(rocksdb_options_t* opt) {
  return opt->rep.is_fd_close_on_exec;
 }

+void rocksdb_options_set_skip_log_error_on_recovery(
+    rocksdb_options_t* opt, unsigned char v) {
+  opt->rep.skip_log_error_on_recovery = v;
+}
+
+unsigned char rocksdb_options_get_skip_log_error_on_recovery(
+    rocksdb_options_t* opt) {
+  return opt->rep.skip_log_error_on_recovery;
+}
+
 void rocksdb_options_set_stats_dump_period_sec(
    rocksdb_options_t* opt, unsigned int v) {
  opt->rep.stats_dump_period_sec = v;
@@ -3172,6 +3230,15 @@ int rocksdb_options_get_max_background_compactions(rocksdb_options_t* opt) {
  return opt->rep.max_background_compactions;
 }

+void rocksdb_options_set_base_background_compactions(rocksdb_options_t* opt,
+                                                     int n) {
+  opt->rep.base_background_compactions = n;
+}
+
+int rocksdb_options_get_base_background_compactions(rocksdb_options_t* opt) {
+  return opt->rep.base_background_compactions;
+}
+
 void rocksdb_options_set_max_background_flushes(rocksdb_options_t* opt, int n) {
  opt->rep.max_background_flushes = n;
 }
@@ -3213,6 +3280,22 @@ size_t rocksdb_options_get_recycle_log_file_num(rocksdb_options_t* opt) {
  return opt->rep.recycle_log_file_num;
 }

+void rocksdb_options_set_soft_rate_limit(rocksdb_options_t* opt, double v) {
+  opt->rep.soft_rate_limit = v;
+}
+
+double rocksdb_options_get_soft_rate_limit(rocksdb_options_t* opt) {
+  return opt->rep.soft_rate_limit;
+}
+
+void rocksdb_options_set_hard_rate_limit(rocksdb_options_t* opt, double v) {
+  opt->rep.hard_rate_limit = v;
+}
+
+double rocksdb_options_get_hard_rate_limit(rocksdb_options_t* opt) {
+  return opt->rep.hard_rate_limit;
+}
+
 void rocksdb_options_set_soft_pending_compaction_bytes_limit(rocksdb_options_t* opt, size_t v) {
  opt->rep.soft_pending_compaction_bytes_limit = v;
 }
@@ -3231,6 +3314,16 @@ size_t rocksdb_options_get_hard_pending_compaction_bytes_limit(
  return opt->rep.hard_pending_compaction_bytes_limit;
 }

+void rocksdb_options_set_rate_limit_delay_max_milliseconds(
+    rocksdb_options_t* opt, unsigned int v) {
+  opt->rep.rate_limit_delay_max_milliseconds = v;
+}
+
+unsigned int rocksdb_options_get_rate_limit_delay_max_milliseconds(
+    rocksdb_options_t* opt) {
+  return opt->rep.rate_limit_delay_max_milliseconds;
+}
+
 void rocksdb_options_set_max_manifest_file_size(
    rocksdb_options_t* opt, size_t v) {
  opt->rep.max_manifest_file_size = v;
@@ -3249,6 +3342,11 @@ int rocksdb_options_get_table_cache_numshardbits(rocksdb_options_t* opt) {
  return opt->rep.table_cache_numshardbits;
 }

+void rocksdb_options_set_table_cache_remove_scan_count_limit(
+    rocksdb_options_t* /*opt*/, int /*v*/) {
+  // this option is deprecated
+}
+
 void rocksdb_options_set_arena_block_size(
    rocksdb_options_t* opt, size_t v) {
  opt->rep.arena_block_size = v;
@@ -3439,14 +3537,6 @@ unsigned char rocksdb_options_get_manual_wal_flush(rocksdb_options_t* opt) {
  return opt->rep.manual_wal_flush;
 }

-void rocksdb_options_set_wal_compression(rocksdb_options_t* opt, int val) {
-  opt->rep.wal_compression = static_cast<CompressionType>(val);
-}
-
-int rocksdb_options_get_wal_compression(rocksdb_options_t* opt) {
-  return opt->rep.wal_compression;
-}
-
 rocksdb_ratelimiter_t* rocksdb_ratelimiter_create(
    int64_t rate_bytes_per_sec,
    int64_t refill_period_us,
@@ -3739,6 +3829,32 @@ void rocksdb_comparator_destroy(rocksdb_comparator_t* cmp) {
  delete cmp;
 }

+rocksdb_filterpolicy_t* rocksdb_filterpolicy_create(
+    void* state,
+    void (*destructor)(void*),
+    char* (*create_filter)(
+        void*,
+        const char* const* key_array, const size_t* key_length_array,
+        int num_keys,
+        size_t* filter_length),
+    unsigned char (*key_may_match)(
+        void*,
+        const char* key, size_t length,
+        const char* filter, size_t filter_length),
+    void (*delete_filter)(
+        void*,
+        const char* filter, size_t filter_length),
+    const char* (*name)(void*)) {
+  rocksdb_filterpolicy_t* result = new rocksdb_filterpolicy_t;
+  result->state_ = state;
+  result->destructor_ = destructor;
+  result->create_ = create_filter;
+  result->key_match_ = key_may_match;
+  result->delete_filter_ = delete_filter;
+  result->name_ = name;
+  return result;
+}
+
 void rocksdb_filterpolicy_destroy(rocksdb_filterpolicy_t* filter) {
  delete filter;
 }
@@ -3752,8 +3868,12 @@ rocksdb_filterpolicy_t* rocksdb_filterpolicy_create_bloom_format(
    const FilterPolicy* rep_;
    ~Wrapper() override { delete rep_; }
    const char* Name() const override { return rep_->Name(); }
-    const char* CompatibilityName() const override {
-      return rep_->CompatibilityName();
+    void CreateFilter(const Slice* keys, int n,
+                      std::string* dst) const override {
+      return rep_->CreateFilter(keys, n, dst);
+    }
+    bool KeyMayMatch(const Slice& key, const Slice& filter) const override {
+      return rep_->KeyMayMatch(key, filter);
    }
    // No need to override GetFilterBitsBuilder if this one is overridden
    ROCKSDB_NAMESPACE::FilterBitsBuilder* GetBuilderWithContext(
@@ -3770,6 +3890,7 @@ rocksdb_filterpolicy_t* rocksdb_filterpolicy_create_bloom_format(
  Wrapper* wrapper = new Wrapper;
  wrapper->rep_ = NewBloomFilterPolicy(bits_per_key, original_format);
  wrapper->state_ = nullptr;
+  wrapper->delete_filter_ = nullptr;
  wrapper->destructor_ = &Wrapper::DoNothing;
  return wrapper;
 }
@@ -3792,8 +3913,12 @@ rocksdb_filterpolicy_t* rocksdb_filterpolicy_create_ribbon_format(
    const FilterPolicy* rep_;
    ~Wrapper() override { delete rep_; }
    const char* Name() const override { return rep_->Name(); }
-    const char* CompatibilityName() const override {
-      return rep_->CompatibilityName();
+    void CreateFilter(const Slice* keys, int n,
+                      std::string* dst) const override {
+      return rep_->CreateFilter(keys, n, dst);
+    }
+    bool KeyMayMatch(const Slice& key, const Slice& filter) const override {
+      return rep_->KeyMayMatch(key, filter);
    }
    ROCKSDB_NAMESPACE::FilterBitsBuilder* GetBuilderWithContext(
        const ROCKSDB_NAMESPACE::FilterBuildingContext& context)
@@ -3810,6 +3935,7 @@ rocksdb_filterpolicy_t* rocksdb_filterpolicy_create_ribbon_format(
  wrapper->rep_ =
      NewRibbonFilterPolicy(bloom_equivalent_bits_per_key, bloom_before_level);
  wrapper->state_ = nullptr;
+  wrapper->delete_filter_ = nullptr;
  wrapper->destructor_ = &Wrapper::DoNothing;
  return wrapper;
 }
@@ -4322,11 +4448,6 @@ rocksdb_sstfilewriter_t* rocksdb_sstfilewriter_create(
  return writer;
 }

-void rocksdb_create_dir_if_missing(rocksdb_env_t* env, const char* path,
-                                   char** errptr) {
-  SaveError(errptr, env->rep->CreateDirIfMissing(std::string(path)));
-}
-
 rocksdb_sstfilewriter_t* rocksdb_sstfilewriter_create_with_comparator(
    const rocksdb_envoptions_t* env, const rocksdb_options_t* io_options,
    const rocksdb_comparator_t* /*comparator*/) {
@@ -225,6 +225,39 @@ static const char* CmpName(void* arg) {
  return "foo";
 }

+// Custom filter policy
+static unsigned char fake_filter_result = 1;
+static void FilterDestroy(void* arg) { (void)arg; }
+static const char* FilterName(void* arg) {
+  (void)arg;
+  return "TestFilter";
+}
+static char* FilterCreate(
+    void* arg,
+    const char* const* key_array, const size_t* key_length_array,
+    int num_keys,
+    size_t* filter_length) {
+  (void)arg;
+  (void)key_array;
+  (void)key_length_array;
+  (void)num_keys;
+  *filter_length = 4;
+  char* result = malloc(4);
+  memcpy(result, "fake", 4);
+  return result;
+}
+static unsigned char FilterKeyMatch(
+    void* arg,
+    const char* key, size_t length,
+    const char* filter, size_t filter_length) {
+  (void)arg;
+  (void)key;
+  (void)length;
+  CheckCondition(filter_length == 4);
+  CheckCondition(memcmp(filter, "fake", 4) == 0);
+  return fake_filter_result;
+}
+
 // Custom compaction filter
 static void CFilterDestroy(void* arg) { (void)arg; }
 static const char* CFilterName(void* arg) {
@@ -446,10 +479,6 @@ int main(int argc, char** argv) {
  cmp = rocksdb_comparator_create(NULL, CmpDestroy, CmpCompare, CmpName);
  dbpath = rocksdb_dbpath_create(dbpathname, 1024 * 1024);
  env = rocksdb_create_default_env();
-
-  rocksdb_create_dir_if_missing(env, GetTempDir(), &err);
-  CheckNoError(err);
-
  cache = rocksdb_cache_create_lru(100000);

  options = rocksdb_options_create();
@@ -460,6 +489,7 @@ int main(int argc, char** argv) {
  rocksdb_options_set_write_buffer_size(options, 100000);
  rocksdb_options_set_paranoid_checks(options, 1);
  rocksdb_options_set_max_open_files(options, 10);
+  rocksdb_options_set_base_background_compactions(options, 1);

  table_options = rocksdb_block_based_options_create();
  rocksdb_block_based_options_set_block_cache(table_options, cache);
@@ -1041,15 +1071,18 @@ int main(int argc, char** argv) {
  }

  StartPhase("filter");
-  for (run = 1; run <= 4; run++) {
-    // run=0 uses custom filter (not currently supported)
+  for (run = 0; run <= 4; run++) {
+    // run=0 uses custom filter
    // run=1 uses old block-based bloom filter
    // run=2 run uses full bloom filter
    // run=3 uses Ribbon
    // run=4 uses Ribbon-Bloom hybrid configuration
    CheckNoError(err);
    rocksdb_filterpolicy_t* policy;
-    if (run == 1) {
+    if (run == 0) {
+      policy = rocksdb_filterpolicy_create(NULL, FilterDestroy, FilterCreate,
+                                           FilterKeyMatch, NULL, FilterName);
+    } else if (run == 1) {
      policy = rocksdb_filterpolicy_create_bloom(8.0);
    } else if (run == 2) {
      policy = rocksdb_filterpolicy_create_bloom_full(8.0);
@@ -1084,8 +1117,19 @@ int main(int argc, char** argv) {
    }
    rocksdb_compact_range(db, NULL, 0, NULL, 0);

+    fake_filter_result = 1;
    CheckGet(db, roptions, "foo", "foovalue");
    CheckGet(db, roptions, "bar", "barvalue");
+    if (run == 0) {
+      // Must not find value when custom filter returns false
+      fake_filter_result = 0;
+      CheckGet(db, roptions, "foo", NULL);
+      CheckGet(db, roptions, "bar", NULL);
+      fake_filter_result = 1;
+
+      CheckGet(db, roptions, "foo", "foovalue");
+      CheckGet(db, roptions, "bar", "barvalue");
+    }

    {
      // Query some keys not added to identify Bloom filter implementation
@@ -1098,6 +1142,7 @@ int main(int argc, char** argv) {
      int i;
      char keybuf[100];
      for (i = 0; i < keys_to_query; i++) {
+        fake_filter_result = i % 2;
        snprintf(keybuf, sizeof(keybuf), "no%020d", i);
        CheckGet(db, roptions, keybuf, NULL);
      }
@@ -1107,10 +1152,10 @@ int main(int argc, char** argv) {
      if (run == 0) {
        // Due to half true, half false with fake filter result
        CheckCondition(hits == keys_to_query / 2);
-      } else if (run == 1 || run == 2 || run == 4) {
-        // For run == 1, block-based Bloom is no longer available in public
-        // API; attempting to enable it enables full Bloom instead.
-        //
+      } else if (run == 1) {
+        // Essentially a fingerprint of the block-based Bloom schema
+        CheckCondition(hits == 241);
+      } else if (run == 2 || run == 4) {
        // Essentially a fingerprint of full Bloom schema, format_version=5
        CheckCondition(hits == 188);
      } else {
@@ -1596,6 +1641,9 @@ int main(int argc, char** argv) {
    rocksdb_options_set_max_background_compactions(o, 3);
    CheckCondition(3 == rocksdb_options_get_max_background_compactions(o));

+    rocksdb_options_set_base_background_compactions(o, 4);
+    CheckCondition(4 == rocksdb_options_get_base_background_compactions(o));
+
    rocksdb_options_set_max_background_flushes(o, 5);
    CheckCondition(5 == rocksdb_options_get_max_background_flushes(o));

@@ -1611,6 +1659,12 @@ int main(int argc, char** argv) {
    rocksdb_options_set_recycle_log_file_num(o, 9);
    CheckCondition(9 == rocksdb_options_get_recycle_log_file_num(o));

+    rocksdb_options_set_soft_rate_limit(o, 2.0);
+    CheckCondition(2.0 == rocksdb_options_get_soft_rate_limit(o));
+
+    rocksdb_options_set_hard_rate_limit(o, 4.0);
+    CheckCondition(4.0 == rocksdb_options_get_hard_rate_limit(o));
+
    rocksdb_options_set_soft_pending_compaction_bytes_limit(o, 10);
    CheckCondition(10 ==
                   rocksdb_options_get_soft_pending_compaction_bytes_limit(o));
@@ -1619,6 +1673,10 @@ int main(int argc, char** argv) {
    CheckCondition(11 ==
                   rocksdb_options_get_hard_pending_compaction_bytes_limit(o));

+    rocksdb_options_set_rate_limit_delay_max_milliseconds(o, 1);
+    CheckCondition(1 ==
+                   rocksdb_options_get_rate_limit_delay_max_milliseconds(o));
+
    rocksdb_options_set_max_manifest_file_size(o, 12);
    CheckCondition(12 == rocksdb_options_get_max_manifest_file_size(o));

@@ -1656,6 +1714,9 @@ int main(int argc, char** argv) {
    rocksdb_options_set_is_fd_close_on_exec(o, 1);
    CheckCondition(1 == rocksdb_options_get_is_fd_close_on_exec(o));

+    rocksdb_options_set_skip_log_error_on_recovery(o, 1);
+    CheckCondition(1 == rocksdb_options_get_skip_log_error_on_recovery(o));
+
    rocksdb_options_set_stats_dump_period_sec(o, 18);
    CheckCondition(18 == rocksdb_options_get_stats_dump_period_sec(o));

@@ -1744,9 +1805,6 @@ int main(int argc, char** argv) {
    rocksdb_options_set_manual_wal_flush(o, 1);
    CheckCondition(1 == rocksdb_options_get_manual_wal_flush(o));

-    rocksdb_options_set_wal_compression(o, 1);
-    CheckCondition(1 == rocksdb_options_get_wal_compression(o));
-
    /* Blob Options */
    rocksdb_options_set_enable_blob_files(o, 1);
    CheckCondition(1 == rocksdb_options_get_enable_blob_files(o));
@@ -1818,15 +1876,20 @@ int main(int argc, char** argv) {
    CheckCondition(123456 == rocksdb_options_get_max_subcompactions(copy));
    CheckCondition(2 == rocksdb_options_get_max_background_jobs(copy));
    CheckCondition(3 == rocksdb_options_get_max_background_compactions(copy));
+    CheckCondition(4 == rocksdb_options_get_base_background_compactions(copy));
    CheckCondition(5 == rocksdb_options_get_max_background_flushes(copy));
    CheckCondition(6 == rocksdb_options_get_max_log_file_size(copy));
    CheckCondition(7 == rocksdb_options_get_log_file_time_to_roll(copy));
    CheckCondition(8 == rocksdb_options_get_keep_log_file_num(copy));
    CheckCondition(9 == rocksdb_options_get_recycle_log_file_num(copy));
+    CheckCondition(2.0 == rocksdb_options_get_soft_rate_limit(copy));
+    CheckCondition(4.0 == rocksdb_options_get_hard_rate_limit(copy));
    CheckCondition(
        10 == rocksdb_options_get_soft_pending_compaction_bytes_limit(copy));
    CheckCondition(
        11 == rocksdb_options_get_hard_pending_compaction_bytes_limit(copy));
+    CheckCondition(1 ==
+                   rocksdb_options_get_rate_limit_delay_max_milliseconds(copy));
    CheckCondition(12 == rocksdb_options_get_max_manifest_file_size(copy));
    CheckCondition(13 == rocksdb_options_get_table_cache_numshardbits(copy));
    CheckCondition(14 == rocksdb_options_get_arena_block_size(copy));
@@ -1840,6 +1903,7 @@ int main(int argc, char** argv) {
    CheckCondition(
        1 == rocksdb_options_get_use_direct_io_for_flush_and_compaction(copy));
    CheckCondition(1 == rocksdb_options_get_is_fd_close_on_exec(copy));
+    CheckCondition(1 == rocksdb_options_get_skip_log_error_on_recovery(copy));
    CheckCondition(18 == rocksdb_options_get_stats_dump_period_sec(copy));
    CheckCondition(5 == rocksdb_options_get_stats_persist_period_sec(copy));
    CheckCondition(1 == rocksdb_options_get_advise_random_on_open(copy));
@@ -2020,6 +2084,10 @@ int main(int argc, char** argv) {
    CheckCondition(13 == rocksdb_options_get_max_background_compactions(copy));
    CheckCondition(3 == rocksdb_options_get_max_background_compactions(o));

+    rocksdb_options_set_base_background_compactions(copy, 14);
+    CheckCondition(14 == rocksdb_options_get_base_background_compactions(copy));
+    CheckCondition(4 == rocksdb_options_get_base_background_compactions(o));
+
    rocksdb_options_set_max_background_flushes(copy, 15);
    CheckCondition(15 == rocksdb_options_get_max_background_flushes(copy));
    CheckCondition(5 == rocksdb_options_get_max_background_flushes(o));
@@ -2040,6 +2108,14 @@ int main(int argc, char** argv) {
    CheckCondition(19 == rocksdb_options_get_recycle_log_file_num(copy));
    CheckCondition(9 == rocksdb_options_get_recycle_log_file_num(o));

+    rocksdb_options_set_soft_rate_limit(copy, 4.0);
+    CheckCondition(4.0 == rocksdb_options_get_soft_rate_limit(copy));
+    CheckCondition(2.0 == rocksdb_options_get_soft_rate_limit(o));
+
+    rocksdb_options_set_hard_rate_limit(copy, 2.0);
+    CheckCondition(2.0 == rocksdb_options_get_hard_rate_limit(copy));
+    CheckCondition(4.0 == rocksdb_options_get_hard_rate_limit(o));
+
    rocksdb_options_set_soft_pending_compaction_bytes_limit(copy, 110);
    CheckCondition(
        110 == rocksdb_options_get_soft_pending_compaction_bytes_limit(copy));
@@ -2052,6 +2128,12 @@ int main(int argc, char** argv) {
    CheckCondition(11 ==
                   rocksdb_options_get_hard_pending_compaction_bytes_limit(o));

+    rocksdb_options_set_rate_limit_delay_max_milliseconds(copy, 0);
+    CheckCondition(0 ==
+                   rocksdb_options_get_rate_limit_delay_max_milliseconds(copy));
+    CheckCondition(1 ==
+                   rocksdb_options_get_rate_limit_delay_max_milliseconds(o));
+
    rocksdb_options_set_max_manifest_file_size(copy, 112);
    CheckCondition(112 == rocksdb_options_get_max_manifest_file_size(copy));
    CheckCondition(12 == rocksdb_options_get_max_manifest_file_size(o));
@@ -2103,6 +2185,10 @@ int main(int argc, char** argv) {
    CheckCondition(0 == rocksdb_options_get_is_fd_close_on_exec(copy));
    CheckCondition(1 == rocksdb_options_get_is_fd_close_on_exec(o));

+    rocksdb_options_set_skip_log_error_on_recovery(copy, 0);
+    CheckCondition(0 == rocksdb_options_get_skip_log_error_on_recovery(copy));
+    CheckCondition(1 == rocksdb_options_get_skip_log_error_on_recovery(o));
+
    rocksdb_options_set_stats_dump_period_sec(copy, 218);
    CheckCondition(218 == rocksdb_options_get_stats_dump_period_sec(copy));
    CheckCondition(18 == rocksdb_options_get_stats_dump_period_sec(o));
@@ -2450,51 +2536,51 @@ int main(int argc, char** argv) {

  StartPhase("backupable_db_option");
  {
-    rocksdb_backup_engine_options_t* bdo;
-    bdo = rocksdb_backup_engine_options_create("path");
+    rocksdb_backupable_db_options_t* bdo;
+    bdo = rocksdb_backupable_db_options_create("path");

-    rocksdb_backup_engine_options_set_share_table_files(bdo, 1);
+    rocksdb_backupable_db_options_set_share_table_files(bdo, 1);
    CheckCondition(1 ==
-                   rocksdb_backup_engine_options_get_share_table_files(bdo));
+                   rocksdb_backupable_db_options_get_share_table_files(bdo));

-    rocksdb_backup_engine_options_set_sync(bdo, 1);
-    CheckCondition(1 == rocksdb_backup_engine_options_get_sync(bdo));
+    rocksdb_backupable_db_options_set_sync(bdo, 1);
+    CheckCondition(1 == rocksdb_backupable_db_options_get_sync(bdo));

-    rocksdb_backup_engine_options_set_destroy_old_data(bdo, 1);
+    rocksdb_backupable_db_options_set_destroy_old_data(bdo, 1);
    CheckCondition(1 ==
-                   rocksdb_backup_engine_options_get_destroy_old_data(bdo));
+                   rocksdb_backupable_db_options_get_destroy_old_data(bdo));

-    rocksdb_backup_engine_options_set_backup_log_files(bdo, 1);
+    rocksdb_backupable_db_options_set_backup_log_files(bdo, 1);
    CheckCondition(1 ==
-                   rocksdb_backup_engine_options_get_backup_log_files(bdo));
+                   rocksdb_backupable_db_options_get_backup_log_files(bdo));

-    rocksdb_backup_engine_options_set_backup_rate_limit(bdo, 123);
+    rocksdb_backupable_db_options_set_backup_rate_limit(bdo, 123);
    CheckCondition(123 ==
-                   rocksdb_backup_engine_options_get_backup_rate_limit(bdo));
+                   rocksdb_backupable_db_options_get_backup_rate_limit(bdo));

-    rocksdb_backup_engine_options_set_restore_rate_limit(bdo, 37);
+    rocksdb_backupable_db_options_set_restore_rate_limit(bdo, 37);
    CheckCondition(37 ==
-                   rocksdb_backup_engine_options_get_restore_rate_limit(bdo));
+                   rocksdb_backupable_db_options_get_restore_rate_limit(bdo));

-    rocksdb_backup_engine_options_set_max_background_operations(bdo, 20);
+    rocksdb_backupable_db_options_set_max_background_operations(bdo, 20);
    CheckCondition(
-        20 == rocksdb_backup_engine_options_get_max_background_operations(bdo));
+        20 == rocksdb_backupable_db_options_get_max_background_operations(bdo));

-    rocksdb_backup_engine_options_set_callback_trigger_interval_size(bdo, 9000);
+    rocksdb_backupable_db_options_set_callback_trigger_interval_size(bdo, 9000);
    CheckCondition(
        9000 ==
-        rocksdb_backup_engine_options_get_callback_trigger_interval_size(bdo));
+        rocksdb_backupable_db_options_get_callback_trigger_interval_size(bdo));

-    rocksdb_backup_engine_options_set_max_valid_backups_to_open(bdo, 40);
+    rocksdb_backupable_db_options_set_max_valid_backups_to_open(bdo, 40);
    CheckCondition(
-        40 == rocksdb_backup_engine_options_get_max_valid_backups_to_open(bdo));
+        40 == rocksdb_backupable_db_options_get_max_valid_backups_to_open(bdo));

-    rocksdb_backup_engine_options_set_share_files_with_checksum_naming(bdo, 2);
+    rocksdb_backupable_db_options_set_share_files_with_checksum_naming(bdo, 2);
    CheckCondition(
-        2 == rocksdb_backup_engine_options_get_share_files_with_checksum_naming(
+        2 == rocksdb_backupable_db_options_get_share_files_with_checksum_naming(
                 bdo));

-    rocksdb_backup_engine_options_destroy(bdo);
+    rocksdb_backupable_db_options_destroy(bdo);
  }

  StartPhase("compression_options");
@@ -1164,12 +1164,12 @@ Compaction* ColumnFamilyData::CompactRange(
    int output_level, const CompactRangeOptions& compact_range_options,
    const InternalKey* begin, const InternalKey* end,
    InternalKey** compaction_end, bool* conflict,
-    uint64_t max_file_num_to_ignore, const std::string& trim_ts) {
+    uint64_t max_file_num_to_ignore) {
  auto* result = compaction_picker_->CompactRange(
      GetName(), mutable_cf_options, mutable_db_options,
      current_->storage_info(), input_level, output_level,
      compact_range_options, begin, end, compaction_end, conflict,
-      max_file_num_to_ignore, trim_ts);
+      max_file_num_to_ignore);
  if (result != nullptr) {
    result->SetInputVersion(current_);
  }
@@ -1562,20 +1562,6 @@ ColumnFamilyData* ColumnFamilySet::CreateColumnFamily(
  return new_cfd;
 }

-// REQUIRES: DB mutex held
-void ColumnFamilySet::FreeDeadColumnFamilies() {
-  autovector<ColumnFamilyData*> to_delete;
-  for (auto cfd = dummy_cfd_->next_; cfd != dummy_cfd_; cfd = cfd->next_) {
-    if (cfd->refs_.load(std::memory_order_relaxed) == 0) {
-      to_delete.push_back(cfd);
-    }
-  }
-  for (auto cfd : to_delete) {
-    // this is very rare, so it's not a problem that we do it under a mutex
-    delete cfd;
-  }
-}
-
 // under a DB mutex AND from a write thread
 void ColumnFamilySet::RemoveColumnFamily(ColumnFamilyData* cfd) {
  auto cfd_iter = column_family_data_.find(cfd->GetID());
@@ -413,8 +413,7 @@ class ColumnFamilyData {
                           const CompactRangeOptions& compact_range_options,
                           const InternalKey* begin, const InternalKey* end,
                           InternalKey** compaction_end, bool* manual_conflict,
-                           uint64_t max_file_num_to_ignore,
-                           const std::string& trim_ts);
+                           uint64_t max_file_num_to_ignore);

  CompactionPicker* compaction_picker() { return compaction_picker_.get(); }
  // thread-safe
@@ -520,9 +519,10 @@ class ColumnFamilyData {
  ThreadLocalPtr* TEST_GetLocalSV() { return local_sv_.get(); }
  WriteBufferManager* write_buffer_mgr() { return write_buffer_manager_; }

+  static const uint32_t kDummyColumnFamilyDataId;
+
 private:
  friend class ColumnFamilySet;
-  static const uint32_t kDummyColumnFamilyDataId;
  ColumnFamilyData(uint32_t id, const std::string& name,
                   Version* dummy_versions, Cache* table_cache,
                   WriteBufferManager* write_buffer_manager,
@@ -628,10 +628,8 @@ class ColumnFamilyData {
 // held and it needs to be executed from the write thread. SetDropped() also
 // guarantees that it will be called only from single-threaded LogAndApply(),
 // but this condition is not that important.
-// * Iteration -- hold DB mutex, but you can release it in the body of
-// iteration. If you release DB mutex in body, reference the column
-// family before the mutex and unreference after you unlock, since the column
-// family might get dropped when the DB mutex is released
+// * Iteration -- hold DB mutex. If you want to release the DB mutex in the
+// body of the iteration, wrap in a RefedColumnFamilySet.
 // * GetDefault() -- thread safe
 // * GetColumnFamily() -- either inside of DB mutex or from a write thread
 // * GetNextColumnFamilyID(), GetMaxColumnFamily(), UpdateMaxColumnFamily(),
@@ -643,17 +641,12 @@ class ColumnFamilySet {
   public:
    explicit iterator(ColumnFamilyData* cfd)
        : current_(cfd) {}
+    // NOTE: minimum operators for for-loop iteration
    iterator& operator++() {
-      // dropped column families might still be included in this iteration
-      // (we're only removing them when client drops the last reference to the
-      // column family).
-      // dummy is never dead, so this will never be infinite
-      do {
-        current_ = current_->next_;
-      } while (current_->refs_.load(std::memory_order_relaxed) == 0);
+      current_ = current_->next_;
      return *this;
    }
-    bool operator!=(const iterator& other) {
+    bool operator!=(const iterator& other) const {
      return this->current_ != other.current_;
    }
    ColumnFamilyData* operator*() { return current_; }
@@ -692,10 +685,6 @@ class ColumnFamilySet {
  iterator begin() { return iterator(dummy_cfd_->next_); }
  iterator end() { return iterator(dummy_cfd_); }

-  // REQUIRES: DB mutex held
-  // Don't call while iterating over ColumnFamilySet
-  void FreeDeadColumnFamilies();
-
  Cache* get_table_cache() { return table_cache_; }

  WriteBufferManager* write_buffer_manager() { return write_buffer_manager_; }
@@ -738,6 +727,55 @@ class ColumnFamilySet {
  std::string db_session_id_;
 };

+// A wrapper for ColumnFamilySet that supports releasing DB mutex during each
+// iteration over the iterator, because the cfd is Refed and Unrefed during
+// each iteration to prevent concurrent CF drop from destroying it (until
+// Unref).
+class RefedColumnFamilySet {
+ public:
+  explicit RefedColumnFamilySet(ColumnFamilySet* cfs) : wrapped_(cfs) {}
+
+  class iterator {
+   public:
+    explicit iterator(ColumnFamilySet::iterator wrapped) : wrapped_(wrapped) {
+      MaybeRef(*wrapped_);
+    }
+    ~iterator() { MaybeUnref(*wrapped_); }
+    inline void MaybeRef(ColumnFamilyData* cfd) {
+      if (cfd->GetID() != ColumnFamilyData::kDummyColumnFamilyDataId) {
+        cfd->Ref();
+      }
+    }
+    inline void MaybeUnref(ColumnFamilyData* cfd) {
+      if (cfd->GetID() != ColumnFamilyData::kDummyColumnFamilyDataId) {
+        cfd->UnrefAndTryDelete();
+      }
+    }
+    // NOTE: minimum operators for for-loop iteration
+    inline iterator& operator++() {
+      ColumnFamilyData* old = *wrapped_;
+      ++wrapped_;
+      // Can only unref & potentially free cfd after accessing its next_
+      MaybeUnref(old);
+      MaybeRef(*wrapped_);
+      return *this;
+    }
+    inline bool operator!=(const iterator& other) const {
+      return this->wrapped_ != other.wrapped_;
+    }
+    inline ColumnFamilyData* operator*() { return *wrapped_; }
+
+   private:
+    ColumnFamilySet::iterator wrapped_;
+  };
+
+  iterator begin() { return iterator(wrapped_->begin()); }
+  iterator end() { return iterator(wrapped_->end()); }
+
+ private:
+  ColumnFamilySet* wrapped_;
+};
+
 // We use ColumnFamilyMemTablesImpl to provide WriteBatch a way to access
 // memtables of different column families (specified by ID in the write batch)
 class ColumnFamilyMemTablesImpl : public ColumnFamilyMemTables {
@@ -138,9 +138,6 @@ TEST_F(CompactFilesTest, MultipleLevel) {
    collector->ClearFlushedFiles();
    ASSERT_OK(db->Put(WriteOptions(), ToString(i), ""));
    ASSERT_OK(db->Flush(FlushOptions()));
-    // Ensure background work is fully finished including listener callbacks
-    // before accessing listener state.
-    ASSERT_OK(static_cast_with_check<DBImpl>(db)->TEST_WaitForBackgroundWork());
    auto l0_files = collector->GetFlushedFiles();
    ASSERT_OK(db->CompactFiles(CompactionOptions(), l0_files, i));

@@ -299,9 +296,6 @@ TEST_F(CompactFilesTest, CapturingPendingFiles) {
    ASSERT_OK(db->Flush(FlushOptions()));
  }

-  // Ensure background work is fully finished including listener callbacks
-  // before accessing listener state.
-  ASSERT_OK(static_cast_with_check<DBImpl>(db)->TEST_WaitForBackgroundWork());
  auto l0_files = collector->GetFlushedFiles();
  EXPECT_EQ(5, l0_files.size());

@@ -420,9 +414,6 @@ TEST_F(CompactFilesTest, SentinelCompressionType) {
    ASSERT_OK(db->Put(WriteOptions(), "key", "val"));
    ASSERT_OK(db->Flush(FlushOptions()));

-    // Ensure background work is fully finished including listener callbacks
-    // before accessing listener state.
-    ASSERT_OK(static_cast_with_check<DBImpl>(db)->TEST_WaitForBackgroundWork());
    auto l0_files = collector->GetFlushedFiles();
    ASSERT_EQ(1, l0_files.size());

@@ -213,8 +213,8 @@ Compaction::Compaction(
    uint32_t _output_path_id, CompressionType _compression,
    CompressionOptions _compression_opts, Temperature _output_temperature,
    uint32_t _max_subcompactions, std::vector<FileMetaData*> _grandparents,
-    bool _manual_compaction, const std::string& _trim_ts, double _score,
-    bool _deletion_compaction, CompactionReason _compaction_reason)
+    bool _manual_compaction, double _score, bool _deletion_compaction,
+    CompactionReason _compaction_reason)
    : input_vstorage_(vstorage),
      start_level_(_inputs[0].level),
      output_level_(_output_level),
@@ -237,7 +237,6 @@ Compaction::Compaction(
      bottommost_level_(IsBottommostLevel(output_level_, vstorage, inputs_)),
      is_full_compaction_(IsFullCompaction(vstorage, inputs_)),
      is_manual_compaction_(_manual_compaction),
-      trim_ts_(_trim_ts),
      is_trivial_move_(false),
      compaction_reason_(_compaction_reason),
      notify_on_compaction_completion_(false) {
@@ -278,9 +277,9 @@ Compaction::~Compaction() {

 bool Compaction::InputCompressionMatchesOutput() const {
  int base_level = input_vstorage_->base_level();
-  bool matches =
-      (GetCompressionType(input_vstorage_, mutable_cf_options_, start_level_,
-                          base_level) == output_compression_);
+  bool matches = (GetCompressionType(immutable_options_, input_vstorage_,
+                                     mutable_cf_options_, start_level_,
+                                     base_level) == output_compression_);
  if (matches) {
    TEST_SYNC_POINT("Compaction::InputCompressionMatchesOutput:Matches");
    return true;
@@ -319,8 +318,7 @@ bool Compaction::IsTrivialMove() const {
  // Used in universal compaction, where trivial move can be done if the
  // input files are non overlapping
  if ((mutable_cf_options_.compaction_options_universal.allow_trivial_move) &&
-      (output_level_ != 0) &&
-      (cfd_->ioptions()->compaction_style == kCompactionStyleUniversal)) {
+      (output_level_ != 0)) {
    return is_trivial_move_;
  }

@@ -79,8 +79,8 @@ class Compaction {
             CompressionOptions compression_opts,
             Temperature output_temperature, uint32_t max_subcompactions,
             std::vector<FileMetaData*> grandparents,
-             bool manual_compaction = false, const std::string& trim_ts = "",
-             double score = -1, bool deletion_compaction = false,
+             bool manual_compaction = false, double score = -1,
+             bool deletion_compaction = false,
             CompactionReason compaction_reason = CompactionReason::kUnknown);

  // No copying allowed
@@ -208,8 +208,6 @@ class Compaction {
  // Was this compaction triggered manually by the client?
  bool is_manual_compaction() const { return is_manual_compaction_; }

-  std::string trim_ts() const { return trim_ts_; }
-
  // Used when allow_trivial_move option is set in
  // Universal compaction. If all the input files are
  // non overlapping, then is_trivial_move_ variable
@@ -294,7 +292,7 @@ class Compaction {

  int GetInputBaseLevel() const;

-  CompactionReason compaction_reason() const { return compaction_reason_; }
+  CompactionReason compaction_reason() { return compaction_reason_; }

  const std::vector<FileMetaData*>& grandparents() const {
    return grandparents_;
@@ -387,9 +385,6 @@ class Compaction {
  // Is this compaction requested by the client?
  const bool is_manual_compaction_;

-  // The data with timestamp > trim_ts_ will be removed
-  const std::string trim_ts_;
-
  // True if we can do trivial move in Universal multi level
  // compaction
  bool is_trivial_move_;
@@ -1164,17 +1164,12 @@ uint64_t CompactionIterator::ComputeBlobGarbageCollectionCutoffFileNumber(

  const auto& blob_files = storage_info->GetBlobFiles();

-  const size_t cutoff_index = static_cast<size_t>(
-      compaction->blob_garbage_collection_age_cutoff() * blob_files.size());
+  auto it = blob_files.begin();
+  std::advance(
+      it, compaction->blob_garbage_collection_age_cutoff() * blob_files.size());

-  if (cutoff_index >= blob_files.size()) {
-    return std::numeric_limits<uint64_t>::max();
-  }
-
-  const auto& meta = blob_files[cutoff_index];
-  assert(meta);
-
-  return meta->GetBlobFileNumber();
+  return it != blob_files.end() ? it->first
+                                : std::numeric_limits<uint64_t>::max();
 }

 std::unique_ptr<BlobFetcher> CompactionIterator::CreateBlobFetcherIfNeeded(
@@ -139,7 +139,9 @@ class CompactionIterator {
      return compaction_->immutable_options()->allow_ingest_behind;
    }

-    bool preserve_deletes() const override { return false; }
+    bool preserve_deletes() const override {
+      return compaction_->immutable_options()->preserve_deletes;
+    }

    bool allow_mmap_reads() const override {
      return compaction_->immutable_options()->allow_mmap_reads;
@@ -1079,7 +1079,7 @@ INSTANTIATE_TEST_CASE_P(CompactionIteratorWithAllowIngestBehindTestInstance,
 class CompactionIteratorTsGcTest : public CompactionIteratorTest {
 public:
  CompactionIteratorTsGcTest()
-      : CompactionIteratorTest(test::BytewiseComparatorWithU64TsWrapper()) {}
+      : CompactionIteratorTest(test::ComparatorWithU64Ts()) {}
 };

 TEST_P(CompactionIteratorTsGcTest, NoKeyEligibleForGC) {
@@ -31,7 +31,6 @@
 #include "db/dbformat.h"
 #include "db/error_handler.h"
 #include "db/event_helpers.h"
-#include "db/history_trimming_iterator.h"
 #include "db/log_reader.h"
 #include "db/log_writer.h"
 #include "db/memtable.h"
@@ -196,10 +195,6 @@ struct CompactionJob::SubcompactionState {
  // within the same compaction job.
  const uint32_t sub_job_id;

-  // Notify on sub-compaction completion only if listener was notified on
-  // sub-compaction begin.
-  bool notify_on_subcompaction_completion = false;
-
  SubcompactionState(Compaction* c, Slice* _start, Slice* _end, uint64_t size,
                     uint32_t _sub_job_id)
      : compaction(c),
@@ -430,8 +425,7 @@ CompactionJob::CompactionJob(
    const std::atomic<int>* manual_compaction_paused,
    const std::atomic<bool>* manual_compaction_canceled,
    const std::string& db_id, const std::string& db_session_id,
-    std::string full_history_ts_low, std::string trim_ts,
-    BlobFileCompletionCallback* blob_callback)
+    std::string full_history_ts_low, BlobFileCompletionCallback* blob_callback)
    : compact_(new CompactionState(compaction)),
      compaction_stats_(compaction->compaction_reason(), 1),
      db_options_(db_options),
@@ -470,7 +464,6 @@ CompactionJob::CompactionJob(
      measure_io_stats_(measure_io_stats),
      thread_pri_(thread_pri),
      full_history_ts_low_(std::move(full_history_ts_low)),
-      trim_ts_(std::move(trim_ts)),
      blob_callback_(blob_callback) {
  assert(compaction_job_stats_ != nullptr);
  assert(log_buffer_ != nullptr);
@@ -970,14 +963,11 @@ Status CompactionJob::Install(const MutableCFOptions& mutable_cf_options) {

  const auto& blob_files = vstorage->GetBlobFiles();
  if (!blob_files.empty()) {
-    assert(blob_files.front());
-    assert(blob_files.back());
-
-    ROCKS_LOG_BUFFER(
-        log_buffer_,
-        "[%s] Blob file summary: head=%" PRIu64 ", tail=%" PRIu64 "\n",
-        column_family_name.c_str(), blob_files.front()->GetBlobFileNumber(),
-        blob_files.back()->GetBlobFileNumber());
+    ROCKS_LOG_BUFFER(log_buffer_,
+                     "[%s] Blob file summary: head=%" PRIu64 ", tail=%" PRIu64
+                     "\n",
+                     column_family_name.c_str(), blob_files.begin()->first,
+                     blob_files.rbegin()->first);
  }

  UpdateCompactionJobStats(stats);
@@ -1024,11 +1014,8 @@ Status CompactionJob::Install(const MutableCFOptions& mutable_cf_options) {
  stream.EndArray();

  if (!blob_files.empty()) {
-    assert(blob_files.front());
-    stream << "blob_file_head" << blob_files.front()->GetBlobFileNumber();
-
-    assert(blob_files.back());
-    stream << "blob_file_tail" << blob_files.back()->GetBlobFileNumber();
+    stream << "blob_file_head" << blob_files.begin()->first;
+    stream << "blob_file_tail" << blob_files.rbegin()->first;
  }

  CleanupCompaction();
@@ -1222,82 +1209,8 @@ CompactionJob::ProcessKeyValueCompactionWithCompactionService(
             compaction_result.bytes_written);
  return CompactionServiceJobStatus::kSuccess;
 }
-
-void CompactionJob::BuildSubcompactionJobInfo(
-    SubcompactionState* sub_compact,
-    SubcompactionJobInfo* subcompaction_job_info) const {
-  Compaction* c = compact_->compaction;
-  ColumnFamilyData* cfd = c->column_family_data();
-
-  subcompaction_job_info->cf_id = cfd->GetID();
-  subcompaction_job_info->cf_name = cfd->GetName();
-  subcompaction_job_info->status = sub_compact->status;
-  subcompaction_job_info->thread_id = env_->GetThreadID();
-  subcompaction_job_info->job_id = job_id_;
-  subcompaction_job_info->subcompaction_job_id = sub_compact->sub_job_id;
-  subcompaction_job_info->base_input_level = c->start_level();
-  subcompaction_job_info->output_level = c->output_level();
-  subcompaction_job_info->stats = sub_compact->compaction_job_stats;
-}
 #endif  // !ROCKSDB_LITE

-void CompactionJob::NotifyOnSubcompactionBegin(
-    SubcompactionState* sub_compact) {
-#ifndef ROCKSDB_LITE
-  Compaction* c = compact_->compaction;
-
-  if (db_options_.listeners.empty()) {
-    return;
-  }
-  if (shutting_down_->load(std::memory_order_acquire)) {
-    return;
-  }
-  if (c->is_manual_compaction() &&
-      manual_compaction_paused_->load(std::memory_order_acquire) > 0) {
-    return;
-  }
-
-  sub_compact->notify_on_subcompaction_completion = true;
-
-  SubcompactionJobInfo info{};
-  BuildSubcompactionJobInfo(sub_compact, &info);
-
-  for (auto listener : db_options_.listeners) {
-    listener->OnSubcompactionBegin(info);
-  }
-  info.status.PermitUncheckedError();
-
-#else
-  (void)sub_compact;
-#endif  // ROCKSDB_LITE
-}
-
-void CompactionJob::NotifyOnSubcompactionCompleted(
-    SubcompactionState* sub_compact) {
-#ifndef ROCKSDB_LITE
-
-  if (db_options_.listeners.empty()) {
-    return;
-  }
-  if (shutting_down_->load(std::memory_order_acquire)) {
-    return;
-  }
-
-  if (sub_compact->notify_on_subcompaction_completion == false) {
-    return;
-  }
-
-  SubcompactionJobInfo info{};
-  BuildSubcompactionJobInfo(sub_compact, &info);
-
-  for (auto listener : db_options_.listeners) {
-    listener->OnSubcompactionCompleted(info);
-  }
-#else
-  (void)sub_compact;
-#endif  // ROCKSDB_LITE
-}
-
 void CompactionJob::ProcessKeyValueCompaction(SubcompactionState* sub_compact) {
  assert(sub_compact);
  assert(sub_compact->compaction);
@@ -1336,8 +1249,6 @@ void CompactionJob::ProcessKeyValueCompaction(SubcompactionState* sub_compact) {
    return;
  }

-  NotifyOnSubcompactionBegin(sub_compact);
-
  CompactionRangeDelAggregator range_del_agg(&cfd->internal_comparator(),
                                             existing_snapshots_);

@@ -1347,7 +1258,6 @@ void CompactionJob::ProcessKeyValueCompaction(SubcompactionState* sub_compact) {
  ReadOptions read_options;
  read_options.verify_checksums = true;
  read_options.fill_cache = false;
-  read_options.rate_limiter_priority = Env::IO_LOW;
  // Compaction iterators shouldn't be confined to a single prefix.
  // Compactions use Seek() for
  // (a) concurrent compactions,
@@ -1383,28 +1293,21 @@ void CompactionJob::ProcessKeyValueCompaction(SubcompactionState* sub_compact) {

  std::unique_ptr<InternalIterator> clip;
  if (start || end) {
-    clip = std::make_unique<ClippingIterator>(
+    clip.reset(new ClippingIterator(
        raw_input.get(), start ? &start_slice : nullptr,
-        end ? &end_slice : nullptr, &cfd->internal_comparator());
+        end ? &end_slice : nullptr, &cfd->internal_comparator()));
    input = clip.get();
  }

  std::unique_ptr<InternalIterator> blob_counter;

  if (sub_compact->compaction->DoesInputReferenceBlobFiles()) {
-    sub_compact->blob_garbage_meter = std::make_unique<BlobGarbageMeter>();
-    blob_counter = std::make_unique<BlobCountingIterator>(
-        input, sub_compact->blob_garbage_meter.get());
+    sub_compact->blob_garbage_meter.reset(new BlobGarbageMeter);
+    blob_counter.reset(
+        new BlobCountingIterator(input, sub_compact->blob_garbage_meter.get()));
    input = blob_counter.get();
  }

-  std::unique_ptr<InternalIterator> trim_history_iter;
-  if (cfd->user_comparator()->timestamp_size() > 0 && !trim_ts_.empty()) {
-    trim_history_iter = std::make_unique<HistoryTrimmingIterator>(
-        input, cfd->user_comparator(), trim_ts_);
-    input = trim_history_iter.get();
-  }
-
  input->SeekToFirst();

  AutoThreadOperationStageUpdater stage_updater(
@@ -1704,7 +1607,6 @@ void CompactionJob::ProcessKeyValueCompaction(SubcompactionState* sub_compact) {
  clip.reset();
  raw_input.reset();
  sub_compact->status = status;
-  NotifyOnSubcompactionCompleted(sub_compact);
 }

 uint64_t CompactionJob::GetCompactionId(SubcompactionState* sub_compact) {
@@ -2042,21 +1944,17 @@ Status CompactionJob::FinishCompactionOutputFile(
  std::string fname;
  FileDescriptor output_fd;
  uint64_t oldest_blob_file_number = kInvalidBlobFileNumber;
-  Status status_for_listener = s;
  if (meta != nullptr) {
    fname = GetTableFileName(meta->fd.GetNumber());
    output_fd = meta->fd;
    oldest_blob_file_number = meta->oldest_blob_file_number;
  } else {
    fname = "(nil)";
-    if (s.ok()) {
-      status_for_listener = Status::Aborted("Empty SST file not kept");
-    }
  }
  EventHelpers::LogAndNotifyTableFileCreationFinished(
      event_logger_, cfd->ioptions()->listeners, dbname_, cfd->GetName(), fname,
      job_id_, output_fd, oldest_blob_file_number, tp,
-      TableFileCreationReason::kCompaction, status_for_listener, file_checksum,
+      TableFileCreationReason::kCompaction, s, file_checksum,
      file_checksum_func_name);

 #ifndef ROCKSDB_LITE
@@ -2278,8 +2176,9 @@ Status CompactionJob::OpenCompactionOutputFile(
  const auto& listeners =
      sub_compact->compaction->immutable_options()->listeners;
  sub_compact->outfile.reset(new WritableFileWriter(
-      std::move(writable_file), fname, fo_copy, db_options_.clock, io_tracer_,
-      db_options_.stats, listeners, db_options_.file_checksum_gen_factory.get(),
+      std::move(writable_file), fname, file_options_, db_options_.clock,
+      io_tracer_, db_options_.stats, listeners,
+      db_options_.file_checksum_gen_factory.get(),
      tmp_set.Contains(FileType::kTableFile), false));

  TableBuilderOptions tboptions(
@@ -2597,14 +2496,34 @@ enum BinaryFormatVersion : uint32_t {
  kOptionsString = 1,  // Use string format similar to Option string format
 };

+// offset_of is used to get the offset of a class data member
+// ex: offset_of(&ColumnFamilyDescriptor::options)
+// This call will return the offset of options in ColumnFamilyDescriptor class
+//
+// This is the same as offsetof() but allow us to work with non standard-layout
+// classes and structures
+// refs:
+// http://en.cppreference.com/w/cpp/concept/StandardLayoutType
+// https://gist.github.com/graphitemaster/494f21190bb2c63c5516
+static ColumnFamilyDescriptor dummy_cfd("", ColumnFamilyOptions());
+template <typename T1>
+int offset_of(T1 ColumnFamilyDescriptor::*member) {
+  return int(size_t(&(dummy_cfd.*member)) - size_t(&dummy_cfd));
+}
+
+static CompactionServiceInput dummy_cs_input;
+template <typename T1>
+int offset_of(T1 CompactionServiceInput::*member) {
+  return int(size_t(&(dummy_cs_input.*member)) - size_t(&dummy_cs_input));
+}
+
 static std::unordered_map<std::string, OptionTypeInfo> cfd_type_info = {
    {"name",
-     {offsetof(struct ColumnFamilyDescriptor, name), OptionType::kEncodedString,
+     {offset_of(&ColumnFamilyDescriptor::name), OptionType::kEncodedString,
      OptionVerificationType::kNormal, OptionTypeFlags::kNone}},
    {"options",
-     {offsetof(struct ColumnFamilyDescriptor, options),
-      OptionType::kConfigurable, OptionVerificationType::kNormal,
-      OptionTypeFlags::kNone,
+     {offset_of(&ColumnFamilyDescriptor::options), OptionType::kConfigurable,
+      OptionVerificationType::kNormal, OptionTypeFlags::kNone,
      [](const ConfigOptions& opts, const std::string& /*name*/,
         const std::string& value, void* addr) {
        auto cf_options = static_cast<ColumnFamilyOptions*>(addr);
@@ -2638,14 +2557,13 @@ static std::unordered_map<std::string, OptionTypeInfo> cfd_type_info = {

 static std::unordered_map<std::string, OptionTypeInfo> cs_input_type_info = {
    {"column_family",
-     OptionTypeInfo::Struct(
-         "column_family", &cfd_type_info,
-         offsetof(struct CompactionServiceInput, column_family),
-         OptionVerificationType::kNormal, OptionTypeFlags::kNone)},
+     OptionTypeInfo::Struct("column_family", &cfd_type_info,
+                            offset_of(&CompactionServiceInput::column_family),
+                            OptionVerificationType::kNormal,
+                            OptionTypeFlags::kNone)},
    {"db_options",
-     {offsetof(struct CompactionServiceInput, db_options),
-      OptionType::kConfigurable, OptionVerificationType::kNormal,
-      OptionTypeFlags::kNone,
+     {offset_of(&CompactionServiceInput::db_options), OptionType::kConfigurable,
+      OptionVerificationType::kNormal, OptionTypeFlags::kNone,
      [](const ConfigOptions& opts, const std::string& /*name*/,
         const std::string& value, void* addr) {
        auto options = static_cast<DBOptions*>(addr);
@@ -2674,33 +2592,31 @@ static std::unordered_map<std::string, OptionTypeInfo> cs_input_type_info = {
        return result;
      }}},
    {"snapshots", OptionTypeInfo::Vector<uint64_t>(
-                      offsetof(struct CompactionServiceInput, snapshots),
+                      offset_of(&CompactionServiceInput::snapshots),
                      OptionVerificationType::kNormal, OptionTypeFlags::kNone,
                      {0, OptionType::kUInt64T})},
    {"input_files", OptionTypeInfo::Vector<std::string>(
-                        offsetof(struct CompactionServiceInput, input_files),
+                        offset_of(&CompactionServiceInput::input_files),
                        OptionVerificationType::kNormal, OptionTypeFlags::kNone,
                        {0, OptionType::kEncodedString})},
    {"output_level",
-     {offsetof(struct CompactionServiceInput, output_level), OptionType::kInt,
+     {offset_of(&CompactionServiceInput::output_level), OptionType::kInt,
      OptionVerificationType::kNormal, OptionTypeFlags::kNone}},
    {"has_begin",
-     {offsetof(struct CompactionServiceInput, has_begin), OptionType::kBoolean,
+     {offset_of(&CompactionServiceInput::has_begin), OptionType::kBoolean,
      OptionVerificationType::kNormal, OptionTypeFlags::kNone}},
    {"begin",
-     {offsetof(struct CompactionServiceInput, begin),
-      OptionType::kEncodedString, OptionVerificationType::kNormal,
-      OptionTypeFlags::kNone}},
+     {offset_of(&CompactionServiceInput::begin), OptionType::kEncodedString,
+      OptionVerificationType::kNormal, OptionTypeFlags::kNone}},
    {"has_end",
-     {offsetof(struct CompactionServiceInput, has_end), OptionType::kBoolean,
+     {offset_of(&CompactionServiceInput::has_end), OptionType::kBoolean,
      OptionVerificationType::kNormal, OptionTypeFlags::kNone}},
    {"end",
-     {offsetof(struct CompactionServiceInput, end), OptionType::kEncodedString,
+     {offset_of(&CompactionServiceInput::end), OptionType::kEncodedString,
      OptionVerificationType::kNormal, OptionTypeFlags::kNone}},
    {"approx_size",
-     {offsetof(struct CompactionServiceInput, approx_size),
-      OptionType::kUInt64T, OptionVerificationType::kNormal,
-      OptionTypeFlags::kNone}},
+     {offset_of(&CompactionServiceInput::approx_size), OptionType::kUInt64T,
+      OptionVerificationType::kNormal, OptionTypeFlags::kNone}},
 };

 static std::unordered_map<std::string, OptionTypeInfo>
@@ -82,7 +82,7 @@ class CompactionJob {
      const std::atomic<int>* manual_compaction_paused = nullptr,
      const std::atomic<bool>* manual_compaction_canceled = nullptr,
      const std::string& db_id = "", const std::string& db_session_id = "",
-      std::string full_history_ts_low = "", std::string trim_ts = "",
+      std::string full_history_ts_low = "",
      BlobFileCompletionCallback* blob_callback = nullptr);

  virtual ~CompactionJob();
@@ -167,16 +167,6 @@ class CompactionJob {
  void UpdateCompactionInputStatsHelper(
      int* num_files, uint64_t* bytes_read, int input_level);

-#ifndef ROCKSDB_LITE
-  void BuildSubcompactionJobInfo(
-      SubcompactionState* sub_compact,
-      SubcompactionJobInfo* subcompaction_job_info) const;
-#endif  // ROCKSDB_LITE
-
-  void NotifyOnSubcompactionBegin(SubcompactionState* sub_compact);
-
-  void NotifyOnSubcompactionCompleted(SubcompactionState* sub_compact);
-
  uint32_t job_id_;

  CompactionJobStats* compaction_job_stats_;
@@ -226,7 +216,6 @@ class CompactionJob {
  std::vector<uint64_t> sizes_;
  Env::Priority thread_pri_;
  std::string full_history_ts_low_;
-  std::string trim_ts_;
  BlobFileCompletionCallback* blob_callback_;

  uint64_t GetCompactionId(SubcompactionState* sub_compact);
@@ -1292,8 +1292,7 @@ class CompactionJobTimestampTest : public CompactionJobTestBase {
 public:
  CompactionJobTimestampTest()
      : CompactionJobTestBase(test::PerThreadDBPath("compaction_job_ts_test"),
-                              test::BytewiseComparatorWithU64TsWrapper(),
-                              test::EncodeInt) {}
+                              test::ComparatorWithU64Ts(), test::EncodeInt) {}
 };

 TEST_F(CompactionJobTimestampTest, GCDisabled) {
@@ -100,7 +100,8 @@ bool FindIntraL0Compaction(const std::vector<FileMetaData*>& level_files,
 // If enable_compression is false, then compression is always disabled no
 // matter what the values of the other two parameters are.
 // Otherwise, the compression type is determined based on options and level.
-CompressionType GetCompressionType(const VersionStorageInfo* vstorage,
+CompressionType GetCompressionType(const ImmutableCFOptions& ioptions,
+                                   const VersionStorageInfo* vstorage,
                                   const MutableCFOptions& mutable_cf_options,
                                   int level, int base_level,
                                   const bool enable_compression) {
@@ -117,19 +118,17 @@ CompressionType GetCompressionType(const VersionStorageInfo* vstorage,
  }
  // If the user has specified a different compression level for each level,
  // then pick the compression for that level.
-  if (!mutable_cf_options.compression_per_level.empty()) {
+  if (!ioptions.compression_per_level.empty()) {
    assert(level == 0 || level >= base_level);
    int idx = (level == 0) ? 0 : level - base_level + 1;

-    const int n =
-        static_cast<int>(mutable_cf_options.compression_per_level.size()) - 1;
+    const int n = static_cast<int>(ioptions.compression_per_level.size()) - 1;
    // It is possible for level_ to be -1; in that case, we use level
    // 0's compression.  This occurs mostly in backwards compatibility
    // situations when the builder doesn't know what level the file
    // belongs to.  Likewise, if level is beyond the end of the
    // specified compression levels, use the last value.
-    return mutable_cf_options
-        .compression_per_level[std::max(0, std::min(idx, n))];
+    return ioptions.compression_per_level[std::max(0, std::min(idx, n))];
  } else {
    return mutable_cf_options.compression;
  }
@@ -348,8 +347,9 @@ Compaction* CompactionPicker::CompactFiles(
    } else {
      base_level = 1;
    }
-    compression_type = GetCompressionType(vstorage, mutable_cf_options,
-                                          output_level, base_level);
+    compression_type =
+        GetCompressionType(ioptions_, vstorage, mutable_cf_options,
+                           output_level, base_level);
  } else {
    // TODO(ajkr): `CompactionOptions` offers configurable `CompressionType`
    // without configurable `CompressionOptions`, which is inconsistent.
@@ -571,7 +571,7 @@ Compaction* CompactionPicker::CompactRange(
    int input_level, int output_level,
    const CompactRangeOptions& compact_range_options, const InternalKey* begin,
    const InternalKey* end, InternalKey** compaction_end, bool* manual_conflict,
-    uint64_t max_file_num_to_ignore, const std::string& trim_ts) {
+    uint64_t max_file_num_to_ignore) {
  // CompactionPickerFIFO has its own implementation of compact range
  assert(ioptions_.compaction_style != kCompactionStyleFIFO);

@@ -637,10 +637,12 @@ Compaction* CompactionPicker::CompactRange(
                            ioptions_.compaction_style),
        /* max_compaction_bytes */ LLONG_MAX,
        compact_range_options.target_path_id,
-        GetCompressionType(vstorage, mutable_cf_options, output_level, 1),
+        GetCompressionType(ioptions_, vstorage, mutable_cf_options,
+                           output_level, 1),
        GetCompressionOptions(mutable_cf_options, vstorage, output_level),
        Temperature::kUnknown, compact_range_options.max_subcompactions,
-        /* grandparents */ {}, /* is manual */ true, trim_ts);
+        /* grandparents */ {},
+        /* is manual */ true);
    RegisterCompaction(c);
    vstorage->ComputeCompactionScore(ioptions_, mutable_cf_options);
    return c;
@@ -814,12 +816,12 @@ Compaction* CompactionPicker::CompactRange(
                          ioptions_.level_compaction_dynamic_level_bytes),
      mutable_cf_options.max_compaction_bytes,
      compact_range_options.target_path_id,
-      GetCompressionType(vstorage, mutable_cf_options, output_level,
+      GetCompressionType(ioptions_, vstorage, mutable_cf_options, output_level,
                         vstorage->base_level()),
      GetCompressionOptions(mutable_cf_options, vstorage, output_level),
      Temperature::kUnknown, compact_range_options.max_subcompactions,
      std::move(grandparents),
-      /* is manual compaction */ true, trim_ts);
+      /* is manual compaction */ true);

  TEST_SYNC_POINT_CALLBACK("CompactionPicker::CompactRange:Return", compaction);
  RegisterCompaction(compaction);
@@ -78,7 +78,7 @@ class CompactionPicker {
      const CompactRangeOptions& compact_range_options,
      const InternalKey* begin, const InternalKey* end,
      InternalKey** compaction_end, bool* manual_conflict,
-      uint64_t max_file_num_to_ignore, const std::string& trim_ts);
+      uint64_t max_file_num_to_ignore);

  // The maximum allowed output level.  Default value is NumberLevels() - 1.
  virtual int MaxOutputLevel() const { return NumberLevels() - 1; }
@@ -270,8 +270,7 @@ class NullCompactionPicker : public CompactionPicker {
                           const InternalKey* /*end*/,
                           InternalKey** /*compaction_end*/,
                           bool* /*manual_conflict*/,
-                           uint64_t /*max_file_num_to_ignore*/,
-                           const std::string& /*trim_ts*/) override {
+                           uint64_t /*max_file_num_to_ignore*/) override {
    return nullptr;
  }

@@ -305,7 +304,8 @@ bool FindIntraL0Compaction(
    CompactionInputFiles* comp_inputs,
    SequenceNumber earliest_mem_seqno = kMaxSequenceNumber);

-CompressionType GetCompressionType(const VersionStorageInfo* vstorage,
+CompressionType GetCompressionType(const ImmutableCFOptions& ioptions,
+                                   const VersionStorageInfo* vstorage,
                                   const MutableCFOptions& mutable_cf_options,
                                   int level, int base_level,
                                   const bool enable_compression = true);
@@ -115,7 +115,7 @@ Compaction* FIFOCompactionPicker::PickTTLCompaction(
      std::move(inputs), 0, 0, 0, 0, kNoCompression,
      mutable_cf_options.compression_opts, Temperature::kUnknown,
      /* max_subcompactions */ 0, {}, /* is manual */ false,
-      /* trim_ts */ "", vstorage->CompactionScore(0),
+      vstorage->CompactionScore(0),
      /* is deletion compaction */ true, CompactionReason::kFIFOTtl);
  return c;
 }
@@ -157,8 +157,8 @@ Compaction* FIFOCompactionPicker::PickSizeCompaction(
            0 /* max compaction bytes, not applicable */,
            0 /* output path ID */, mutable_cf_options.compression,
            mutable_cf_options.compression_opts, Temperature::kUnknown,
-            0 /* max_subcompactions */, {}, /* is manual */ false,
-            /* trim_ts */ "", vstorage->CompactionScore(0),
+            0 /* max_subcompactions */, {},
+            /* is manual */ false, vstorage->CompactionScore(0),
            /* is deletion compaction */ false,
            CompactionReason::kFIFOReduceNumFiles);
        return c;
@@ -208,7 +208,7 @@ Compaction* FIFOCompactionPicker::PickSizeCompaction(
      std::move(inputs), 0, 0, 0, 0, kNoCompression,
      mutable_cf_options.compression_opts, Temperature::kUnknown,
      /* max_subcompactions */ 0, {}, /* is manual */ false,
-      /* trim_ts */ "", vstorage->CompactionScore(0),
+      vstorage->CompactionScore(0),
      /* is deletion compaction */ true, CompactionReason::kFIFOMaxSize);
  return c;
 }
@@ -313,7 +313,7 @@ Compaction* FIFOCompactionPicker::PickCompactionToWarm(
      0 /* max compaction bytes, not applicable */, 0 /* output path ID */,
      mutable_cf_options.compression, mutable_cf_options.compression_opts,
      Temperature::kWarm,
-      /* max_subcompactions */ 0, {}, /* is manual */ false, /* trim_ts */ "",
+      /* max_subcompactions */ 0, {}, /* is manual */ false,
      vstorage->CompactionScore(0),
      /* is deletion compaction */ false, CompactionReason::kChangeTemperature);
  return c;
@@ -349,7 +349,7 @@ Compaction* FIFOCompactionPicker::CompactRange(
    const CompactRangeOptions& /*compact_range_options*/,
    const InternalKey* /*begin*/, const InternalKey* /*end*/,
    InternalKey** compaction_end, bool* /*manual_conflict*/,
-    uint64_t /*max_file_num_to_ignore*/, const std::string& /*trim_ts*/) {
+    uint64_t /*max_file_num_to_ignore*/) {
 #ifdef NDEBUG
  (void)input_level;
  (void)output_level;
@@ -32,7 +32,7 @@ class FIFOCompactionPicker : public CompactionPicker {
      const CompactRangeOptions& compact_range_options,
      const InternalKey* begin, const InternalKey* end,
      InternalKey** compaction_end, bool* manual_conflict,
-      uint64_t max_file_num_to_ignore, const std::string& trim_ts) override;
+      uint64_t max_file_num_to_ignore) override;

  // The maximum allowed output level.  Always returns 0.
  virtual int MaxOutputLevel() const override { return 0; }
@@ -343,13 +343,12 @@ Compaction* LevelCompactionBuilder::GetCompaction() {
                          ioptions_.level_compaction_dynamic_level_bytes),
      mutable_cf_options_.max_compaction_bytes,
      GetPathId(ioptions_, mutable_cf_options_, output_level_),
-      GetCompressionType(vstorage_, mutable_cf_options_, output_level_,
-                         vstorage_->base_level()),
+      GetCompressionType(ioptions_, vstorage_, mutable_cf_options_,
+                         output_level_, vstorage_->base_level()),
      GetCompressionOptions(mutable_cf_options_, vstorage_, output_level_),
      Temperature::kUnknown,
      /* max_subcompactions */ 0, std::move(grandparents_), is_manual_,
-      /* trim_ts */ "", start_level_score_, false /* deletion_compaction */,
-      compaction_reason_);
+      start_level_score_, false /* deletion_compaction */, compaction_reason_);

  // If it's level 0 compaction, make sure we don't execute any other level 0
  // compactions in parallel
@@ -76,7 +76,7 @@ class CompactionPickerTest : public testing::Test {
    options_.num_levels = num_levels;
    vstorage_.reset(new VersionStorageInfo(&icmp_, ucmp_, options_.num_levels,
                                           style, nullptr, false));
-    vstorage_->PrepareForVersionAppend(ioptions_, mutable_cf_options_);
+    vstorage_->CalculateBaseBytes(ioptions_, mutable_cf_options_);
  }

  // Create a new VersionStorageInfo object so we can add mode files and then
@@ -148,10 +148,35 @@ class CompactionPickerTest : public testing::Test {
      ASSERT_OK(builder.SaveTo(temp_vstorage_.get()));
      vstorage_ = std::move(temp_vstorage_);
    }
-    vstorage_->PrepareForVersionAppend(ioptions_, mutable_cf_options_);
+    vstorage_->CalculateBaseBytes(ioptions_, mutable_cf_options_);
+    vstorage_->UpdateFilesByCompactionPri(ioptions_, mutable_cf_options_);
+    vstorage_->UpdateNumNonEmptyLevels();
+    vstorage_->GenerateFileIndexer();
+    vstorage_->GenerateLevelFilesBrief();
    vstorage_->ComputeCompactionScore(ioptions_, mutable_cf_options_);
+    vstorage_->GenerateLevel0NonOverlapping();
+    vstorage_->ComputeFilesMarkedForCompaction();
    vstorage_->SetFinalized();
  }
+  void AddFileToVersionStorage(int level, uint32_t file_number,
+                               const char* smallest, const char* largest,
+                               uint64_t file_size = 1, uint32_t path_id = 0,
+                               SequenceNumber smallest_seq = 100,
+                               SequenceNumber largest_seq = 100,
+                               size_t compensated_file_size = 0,
+                               bool marked_for_compact = false) {
+    VersionStorageInfo* base_vstorage = vstorage_.release();
+    vstorage_.reset(new VersionStorageInfo(&icmp_, ucmp_, options_.num_levels,
+                                           kCompactionStyleUniversal,
+                                           base_vstorage, false));
+    Add(level, file_number, smallest, largest, file_size, path_id, smallest_seq,
+        largest_seq, compensated_file_size, marked_for_compact);
+
+    VersionBuilder builder(FileOptions(), &ioptions_, nullptr, base_vstorage,
+                           nullptr);
+    builder.SaveTo(vstorage_.get());
+    UpdateVersionStorageInfo();
+  }

 private:
  std::unique_ptr<VersionStorageInfo> temp_vstorage_;
@@ -2648,13 +2673,12 @@ TEST_F(CompactionPickerTest, UniversalMarkedManualCompaction) {
  ASSERT_EQ(3U, vstorage_->FilesMarkedForCompaction().size());

  bool manual_conflict = false;
-  InternalKey* manual_end = nullptr;
+  InternalKey* manual_end = NULL;
  std::unique_ptr<Compaction> compaction(
      universal_compaction_picker.CompactRange(
          cf_name_, mutable_cf_options_, mutable_db_options_, vstorage_.get(),
-          ColumnFamilyData::kCompactAllLevels, 6, CompactRangeOptions(),
-          nullptr, nullptr, &manual_end, &manual_conflict, port::kMaxUint64,
-          ""));
+          ColumnFamilyData::kCompactAllLevels, 6, CompactRangeOptions(), NULL,
+          NULL, &manual_end, &manual_conflict, port::kMaxUint64));

  ASSERT_TRUE(compaction);

@@ -746,19 +746,19 @@ Compaction* UniversalCompactionBuilder::PickCompactionToReduceSortedRuns(
  } else {
    compaction_reason = CompactionReason::kUniversalSortedRunNum;
  }
-  return new Compaction(vstorage_, ioptions_, mutable_cf_options_,
-                        mutable_db_options_, std::move(inputs), output_level,
-                        MaxFileSizeForLevel(mutable_cf_options_, output_level,
-                                            kCompactionStyleUniversal),
-                        GetMaxOverlappingBytes(), path_id,
-                        GetCompressionType(vstorage_, mutable_cf_options_,
-                                           start_level, 1, enable_compression),
-                        GetCompressionOptions(mutable_cf_options_, vstorage_,
-                                              start_level, enable_compression),
-                        Temperature::kUnknown,
-                        /* max_subcompactions */ 0, grandparents,
-                        /* is manual */ false, /* trim_ts */ "", score_,
-                        false /* deletion_compaction */, compaction_reason);
+  return new Compaction(
+      vstorage_, ioptions_, mutable_cf_options_, mutable_db_options_,
+      std::move(inputs), output_level,
+      MaxFileSizeForLevel(mutable_cf_options_, output_level,
+                          kCompactionStyleUniversal),
+      GetMaxOverlappingBytes(), path_id,
+      GetCompressionType(ioptions_, vstorage_, mutable_cf_options_, start_level,
+                         1, enable_compression),
+      GetCompressionOptions(mutable_cf_options_, vstorage_, start_level,
+                            enable_compression),
+      Temperature::kUnknown,
+      /* max_subcompactions */ 0, grandparents, /* is manual */ false, score_,
+      false /* deletion_compaction */, compaction_reason);
 }

 // Look at overall size amplification. If size amplification
@@ -1076,13 +1076,13 @@ Compaction* UniversalCompactionBuilder::PickIncrementalForReduceSizeAmp(
      MaxFileSizeForLevel(mutable_cf_options_, output_level,
                          kCompactionStyleUniversal),
      GetMaxOverlappingBytes(), path_id,
-      GetCompressionType(vstorage_, mutable_cf_options_, output_level, 1,
-                         true /* enable_compression */),
+      GetCompressionType(ioptions_, vstorage_, mutable_cf_options_,
+                         output_level, 1, true /* enable_compression */),
      GetCompressionOptions(mutable_cf_options_, vstorage_, output_level,
                            true /* enable_compression */),
      Temperature::kUnknown,
      /* max_subcompactions */ 0, /* grandparents */ {}, /* is manual */ false,
-      /* trim_ts */ "", score_, false /* deletion_compaction */,
+      score_, false /* deletion_compaction */,
      CompactionReason::kUniversalSizeAmplification);
 }

@@ -1220,11 +1220,12 @@ Compaction* UniversalCompactionBuilder::PickDeleteTriggeredCompaction() {
      MaxFileSizeForLevel(mutable_cf_options_, output_level,
                          kCompactionStyleUniversal),
      /* max_grandparent_overlap_bytes */ GetMaxOverlappingBytes(), path_id,
-      GetCompressionType(vstorage_, mutable_cf_options_, output_level, 1),
+      GetCompressionType(ioptions_, vstorage_, mutable_cf_options_,
+                         output_level, 1),
      GetCompressionOptions(mutable_cf_options_, vstorage_, output_level),
      Temperature::kUnknown,
-      /* max_subcompactions */ 0, grandparents, /* is manual */ false,
-      /* trim_ts */ "", score_, false /* deletion_compaction */,
+      /* max_subcompactions */ 0, grandparents, /* is manual */ false, score_,
+      false /* deletion_compaction */,
      CompactionReason::kFilesMarkedForCompaction);
 }

@@ -1293,14 +1294,13 @@ Compaction* UniversalCompactionBuilder::PickCompactionToOldest(
      MaxFileSizeForLevel(mutable_cf_options_, output_level,
                          kCompactionStyleUniversal),
      GetMaxOverlappingBytes(), path_id,
-      GetCompressionType(vstorage_, mutable_cf_options_, output_level, 1,
-                         true /* enable_compression */),
+      GetCompressionType(ioptions_, vstorage_, mutable_cf_options_,
+                         output_level, 1, true /* enable_compression */),
      GetCompressionOptions(mutable_cf_options_, vstorage_, output_level,
                            true /* enable_compression */),
      Temperature::kUnknown,
      /* max_subcompactions */ 0, /* grandparents */ {}, /* is manual */ false,
-      /* trim_ts */ "", score_, false /* deletion_compaction */,
-      compaction_reason);
+      score_, false /* deletion_compaction */, compaction_reason);
 }

 Compaction* UniversalCompactionBuilder::PickPeriodicCompaction() {
@@ -10,7 +10,126 @@

 namespace ROCKSDB_NAMESPACE {

-class MyTestCompactionService : public CompactionService {
+class TestCompactionServiceBase {
+ public:
+  virtual int GetCompactionNum() = 0;
+
+  void OverrideStartStatus(CompactionServiceJobStatus s) {
+    is_override_start_status = true;
+    override_start_status = s;
+  }
+
+  void OverrideWaitStatus(CompactionServiceJobStatus s) {
+    is_override_wait_status = true;
+    override_wait_status = s;
+  }
+
+  void OverrideWaitResult(std::string str) {
+    is_override_wait_result = true;
+    override_wait_result = std::move(str);
+  }
+
+  void ResetOverride() {
+    is_override_wait_result = false;
+    is_override_start_status = false;
+    is_override_wait_status = false;
+  }
+
+  virtual ~TestCompactionServiceBase() = default;
+
+ protected:
+  bool is_override_start_status = false;
+  CompactionServiceJobStatus override_start_status =
+      CompactionServiceJobStatus::kFailure;
+  bool is_override_wait_status = false;
+  CompactionServiceJobStatus override_wait_status =
+      CompactionServiceJobStatus::kFailure;
+  bool is_override_wait_result = false;
+  std::string override_wait_result;
+};
+
+class MyTestCompactionServiceLegacy : public CompactionService,
+                                      public TestCompactionServiceBase {
+ public:
+  MyTestCompactionServiceLegacy(std::string db_path, Options& options,
+                                std::shared_ptr<Statistics>& statistics)
+      : db_path_(std::move(db_path)),
+        options_(options),
+        statistics_(statistics) {}
+
+  static const char* kClassName() { return "MyTestCompactionServiceLegacy"; }
+
+  const char* Name() const override { return kClassName(); }
+
+  CompactionServiceJobStatus Start(const std::string& compaction_service_input,
+                                   uint64_t job_id) override {
+    InstrumentedMutexLock l(&mutex_);
+    jobs_.emplace(job_id, compaction_service_input);
+    CompactionServiceJobStatus s = CompactionServiceJobStatus::kSuccess;
+    if (is_override_start_status) {
+      return override_start_status;
+    }
+    return s;
+  }
+
+  CompactionServiceJobStatus WaitForComplete(
+      uint64_t job_id, std::string* compaction_service_result) override {
+    std::string compaction_input;
+    {
+      InstrumentedMutexLock l(&mutex_);
+      auto i = jobs_.find(job_id);
+      if (i == jobs_.end()) {
+        return CompactionServiceJobStatus::kFailure;
+      }
+      compaction_input = std::move(i->second);
+      jobs_.erase(i);
+    }
+
+    if (is_override_wait_status) {
+      return override_wait_status;
+    }
+
+    CompactionServiceOptionsOverride options_override;
+    options_override.env = options_.env;
+    options_override.file_checksum_gen_factory =
+        options_.file_checksum_gen_factory;
+    options_override.comparator = options_.comparator;
+    options_override.merge_operator = options_.merge_operator;
+    options_override.compaction_filter = options_.compaction_filter;
+    options_override.compaction_filter_factory =
+        options_.compaction_filter_factory;
+    options_override.prefix_extractor = options_.prefix_extractor;
+    options_override.table_factory = options_.table_factory;
+    options_override.sst_partitioner_factory = options_.sst_partitioner_factory;
+    options_override.statistics = statistics_;
+
+    Status s = DB::OpenAndCompact(
+        db_path_, db_path_ + "/" + ROCKSDB_NAMESPACE::ToString(job_id),
+        compaction_input, compaction_service_result, options_override);
+    if (is_override_wait_result) {
+      *compaction_service_result = override_wait_result;
+    }
+    compaction_num_.fetch_add(1);
+    if (s.ok()) {
+      return CompactionServiceJobStatus::kSuccess;
+    } else {
+      return CompactionServiceJobStatus::kFailure;
+    }
+  }
+
+  int GetCompactionNum() override { return compaction_num_.load(); }
+
+ private:
+  InstrumentedMutex mutex_;
+  std::atomic_int compaction_num_{0};
+  std::map<uint64_t, std::string> jobs_;
+  const std::string db_path_;
+  Options options_;
+  std::shared_ptr<Statistics> statistics_;
+};
+
+class MyTestCompactionService : public CompactionService,
+                                public TestCompactionServiceBase {
 public:
  MyTestCompactionService(std::string db_path, Options& options,
                          std::shared_ptr<Statistics>& statistics)
@@ -32,8 +151,8 @@ class MyTestCompactionService : public CompactionService {
    assert(info.db_name == db_path_);
    jobs_.emplace(info.job_id, compaction_service_input);
    CompactionServiceJobStatus s = CompactionServiceJobStatus::kSuccess;
-    if (is_override_start_status_) {
-      return override_start_status_;
+    if (is_override_start_status) {
+      return override_start_status;
    }
    return s;
  }
@@ -54,8 +173,8 @@ class MyTestCompactionService : public CompactionService {
      jobs_.erase(i);
    }

-    if (is_override_wait_status_) {
-      return override_wait_status_;
+    if (is_override_wait_status) {
+      return override_wait_status;
    }

    CompactionServiceOptionsOverride options_override;
@@ -75,8 +194,8 @@ class MyTestCompactionService : public CompactionService {
    Status s = DB::OpenAndCompact(
        db_path_, db_path_ + "/" + ROCKSDB_NAMESPACE::ToString(info.job_id),
        compaction_input, compaction_service_result, options_override);
-    if (is_override_wait_result_) {
-      *compaction_service_result = override_wait_result_;
+    if (is_override_wait_result) {
+      *compaction_service_result = override_wait_result;
    }
    compaction_num_.fetch_add(1);
    if (s.ok()) {
@@ -86,32 +205,11 @@ class MyTestCompactionService : public CompactionService {
    }
  }

-  int GetCompactionNum() { return compaction_num_.load(); }
+  int GetCompactionNum() override { return compaction_num_.load(); }

  CompactionServiceJobInfo GetCompactionInfoForStart() { return start_info_; }
  CompactionServiceJobInfo GetCompactionInfoForWait() { return wait_info_; }

-  void OverrideStartStatus(CompactionServiceJobStatus s) {
-    is_override_start_status_ = true;
-    override_start_status_ = s;
-  }
-
-  void OverrideWaitStatus(CompactionServiceJobStatus s) {
-    is_override_wait_status_ = true;
-    override_wait_status_ = s;
-  }
-
-  void OverrideWaitResult(std::string str) {
-    is_override_wait_result_ = true;
-    override_wait_result_ = std::move(str);
-  }
-
-  void ResetOverride() {
-    is_override_wait_result_ = false;
-    is_override_start_status_ = false;
-    is_override_wait_status_ = false;
-  }
-
 private:
  InstrumentedMutex mutex_;
  std::atomic_int compaction_num_{0};
@@ -121,17 +219,17 @@ class MyTestCompactionService : public CompactionService {
  std::shared_ptr<Statistics> statistics_;
  CompactionServiceJobInfo start_info_;
  CompactionServiceJobInfo wait_info_;
-  bool is_override_start_status_ = false;
-  CompactionServiceJobStatus override_start_status_ =
-      CompactionServiceJobStatus::kFailure;
-  bool is_override_wait_status_ = false;
-  CompactionServiceJobStatus override_wait_status_ =
-      CompactionServiceJobStatus::kFailure;
-  bool is_override_wait_result_ = false;
-  std::string override_wait_result_;
 };

-class CompactionServiceTest : public DBTestBase {
+// This is only for listing test classes
+enum TestCompactionServiceType {
+  MyTestCompactionServiceType,
+  MyTestCompactionServiceLegacyType,
+};
+
+class CompactionServiceTest
+    : public DBTestBase,
+      public testing::WithParamInterface<TestCompactionServiceType> {
 public:
  explicit CompactionServiceTest()
      : DBTestBase("compaction_service_test", true) {}
@@ -142,9 +240,19 @@ class CompactionServiceTest : public DBTestBase {
    primary_statistics_ = CreateDBStatistics();
    options->statistics = primary_statistics_;
    compactor_statistics_ = CreateDBStatistics();
-
-    compaction_service_ = std::make_shared<MyTestCompactionService>(
-        dbname_, *options, compactor_statistics_);
+    TestCompactionServiceType cs_type = GetParam();
+    switch (cs_type) {
+      case MyTestCompactionServiceType:
+        compaction_service_ = std::make_shared<MyTestCompactionService>(
+            dbname_, *options, compactor_statistics_);
+        break;
+      case MyTestCompactionServiceLegacyType:
+        compaction_service_ = std::make_shared<MyTestCompactionServiceLegacy>(
+            dbname_, *options, compactor_statistics_);
+        break;
+      default:
+        assert(false);
+    }
    options->compaction_service = compaction_service_;
    DestroyAndReopen(*options);
  }
@@ -153,9 +261,9 @@ class CompactionServiceTest : public DBTestBase {

  Statistics* GetPrimaryStatistics() { return primary_statistics_.get(); }

-  MyTestCompactionService* GetCompactionService() {
+  TestCompactionServiceBase* GetCompactionService() {
    CompactionService* cs = compaction_service_.get();
-    return static_cast_with_check<MyTestCompactionService>(cs);
+    return dynamic_cast<TestCompactionServiceBase*>(cs);
  }

  void GenerateTestData() {
@@ -198,7 +306,7 @@ class CompactionServiceTest : public DBTestBase {
  std::shared_ptr<CompactionService> compaction_service_;
 };

-TEST_F(CompactionServiceTest, BasicCompactions) {
+TEST_P(CompactionServiceTest, BasicCompactions) {
  Options options = CurrentOptions();
  ReopenWithCompactionService(&options);

@@ -285,7 +393,7 @@ TEST_F(CompactionServiceTest, BasicCompactions) {
  ASSERT_TRUE(s.IsAborted());
 }

-TEST_F(CompactionServiceTest, ManualCompaction) {
+TEST_P(CompactionServiceTest, ManualCompaction) {
  Options options = CurrentOptions();
  options.disable_auto_compactions = true;
  ReopenWithCompactionService(&options);
@@ -322,7 +430,7 @@ TEST_F(CompactionServiceTest, ManualCompaction) {
  VerifyTestData();
 }

-TEST_F(CompactionServiceTest, FailedToStart) {
+TEST_P(CompactionServiceTest, FailedToStart) {
  Options options = CurrentOptions();
  options.disable_auto_compactions = true;
  ReopenWithCompactionService(&options);
@@ -340,7 +448,7 @@ TEST_F(CompactionServiceTest, FailedToStart) {
  ASSERT_TRUE(s.IsIncomplete());
 }

-TEST_F(CompactionServiceTest, InvalidResult) {
+TEST_P(CompactionServiceTest, InvalidResult) {
  Options options = CurrentOptions();
  options.disable_auto_compactions = true;
  ReopenWithCompactionService(&options);
@@ -358,7 +466,7 @@ TEST_F(CompactionServiceTest, InvalidResult) {
  ASSERT_FALSE(s.ok());
 }

-TEST_F(CompactionServiceTest, SubCompaction) {
+TEST_P(CompactionServiceTest, SubCompaction) {
  Options options = CurrentOptions();
  options.max_subcompactions = 10;
  options.target_file_size_base = 1 << 10;  // 1KB
@@ -397,7 +505,7 @@ class PartialDeleteCompactionFilter : public CompactionFilter {
  const char* Name() const override { return "PartialDeleteCompactionFilter"; }
 };

-TEST_F(CompactionServiceTest, CompactionFilter) {
+TEST_P(CompactionServiceTest, CompactionFilter) {
  Options options = CurrentOptions();
  std::unique_ptr<CompactionFilter> delete_comp_filter(
      new PartialDeleteCompactionFilter());
@@ -438,7 +546,7 @@ TEST_F(CompactionServiceTest, CompactionFilter) {
  ASSERT_GE(my_cs->GetCompactionNum(), 1);
 }

-TEST_F(CompactionServiceTest, Snapshot) {
+TEST_P(CompactionServiceTest, Snapshot) {
  Options options = CurrentOptions();
  ReopenWithCompactionService(&options);

@@ -459,7 +567,7 @@ TEST_F(CompactionServiceTest, Snapshot) {
  db_->ReleaseSnapshot(s1);
 }

-TEST_F(CompactionServiceTest, ConcurrentCompaction) {
+TEST_P(CompactionServiceTest, ConcurrentCompaction) {
  Options options = CurrentOptions();
  options.level0_file_num_compaction_trigger = 100;
  options.max_background_jobs = 20;
@@ -471,7 +579,7 @@ TEST_F(CompactionServiceTest, ConcurrentCompaction) {

  std::vector<std::thread> threads;
  for (const auto& file : meta.levels[1].files) {
-    threads.emplace_back(std::thread([&]() {
+    threads.push_back(std::thread([&]() {
      std::string fname = file.db_path + "/" + file.name;
      ASSERT_OK(db_->CompactFiles(CompactionOptions(), {fname}, 2));
    }));
@@ -496,7 +604,12 @@ TEST_F(CompactionServiceTest, ConcurrentCompaction) {
  ASSERT_EQ(FilesPerLevel(), "0,0,10");
 }

-TEST_F(CompactionServiceTest, CompactionInfo) {
+TEST_P(CompactionServiceTest, CompactionInfo) {
+  // only test compaction info for new compaction service interface
+  if (GetParam() != MyTestCompactionServiceType) {
+    return;
+  }
+
  Options options = CurrentOptions();
  ReopenWithCompactionService(&options);

@@ -575,7 +688,7 @@ TEST_F(CompactionServiceTest, CompactionInfo) {
  ASSERT_EQ(Env::BOTTOM, info.priority);
 }

-TEST_F(CompactionServiceTest, FallbackLocalAuto) {
+TEST_P(CompactionServiceTest, FallbackLocalAuto) {
  Options options = CurrentOptions();
  ReopenWithCompactionService(&options);

@@ -627,7 +740,7 @@ TEST_F(CompactionServiceTest, FallbackLocalAuto) {
  ASSERT_EQ(primary_statistics->getTickerCount(REMOTE_COMPACT_WRITE_BYTES), 0);
 }

-TEST_F(CompactionServiceTest, FallbackLocalManual) {
+TEST_P(CompactionServiceTest, FallbackLocalManual) {
  Options options = CurrentOptions();
  options.disable_auto_compactions = true;
  ReopenWithCompactionService(&options);
@@ -685,6 +798,12 @@ TEST_F(CompactionServiceTest, FallbackLocalManual) {
  VerifyTestData();
 }

+INSTANTIATE_TEST_CASE_P(
+    CompactionServiceTest, CompactionServiceTest,
+    ::testing::Values(
+        TestCompactionServiceType::MyTestCompactionServiceType,
+        TestCompactionServiceType::MyTestCompactionServiceLegacyType));
+
 }  // namespace ROCKSDB_NAMESPACE

 int main(int argc, char** argv) {
@@ -56,10 +56,7 @@ Status VerifySstFileChecksum(const Options& options,
  }
  std::unique_ptr<TableReader> table_reader;
  std::unique_ptr<RandomAccessFileReader> file_reader(
-      new RandomAccessFileReader(
-          std::move(file), file_path, ioptions.clock, nullptr /* io_tracer */,
-          nullptr /* stats */, 0 /* hist_type */, nullptr /* file_read_hist */,
-          ioptions.rate_limiter.get()));
+      new RandomAccessFileReader(std::move(file), file_path));
  const bool kImmortal = true;
  s = ioptions.table_factory->NewTableReader(
      TableReaderOptions(ioptions, options.prefix_extractor, env_options,
@@ -51,24 +51,6 @@ TEST_F(DBBasicTest, OpenWhenOpen) {
  delete db2;
 }

-TEST_F(DBBasicTest, EnableDirectIOWithZeroBuf) {
-  if (!IsDirectIOSupported()) {
-    ROCKSDB_GTEST_BYPASS("Direct IO not supported");
-    return;
-  }
-  Options options = GetDefaultOptions();
-  options.create_if_missing = true;
-  options.use_direct_io_for_flush_and_compaction = true;
-  options.writable_file_max_buffer_size = 0;
-  ASSERT_TRUE(TryReopen(options).IsInvalidArgument());
-
-  options.writable_file_max_buffer_size = 1024;
-  Reopen(options);
-  const std::unordered_map<std::string, std::string> new_db_opts = {
-      {"writable_file_max_buffer_size", "0"}};
-  ASSERT_TRUE(db_->SetDBOptions(new_db_opts).IsInvalidArgument());
-}
-
 TEST_F(DBBasicTest, UniqueSession) {
  Options options = CurrentOptions();
  std::string sid1, sid2, sid3, sid4;
@@ -9,26 +9,17 @@
 #include <cstdlib>
 #include <functional>
 #include <memory>
-#include <unordered_set>

 #include "cache/cache_entry_roles.h"
-#include "cache/cache_key.h"
 #include "cache/lru_cache.h"
 #include "db/column_family.h"
-#include "db/db_impl/db_impl.h"
 #include "db/db_test_util.h"
-#include "env/unique_id_gen.h"
 #include "port/stack_trace.h"
 #include "rocksdb/persistent_cache.h"
 #include "rocksdb/statistics.h"
 #include "rocksdb/table.h"
-#include "rocksdb/table_properties.h"
-#include "table/block_based/block_based_table_reader.h"
-#include "table/unique_id_impl.h"
 #include "util/compression.h"
 #include "util/defer.h"
-#include "util/hash.h"
-#include "util/math.h"
 #include "util/random.h"
 #include "utilities/fault_injection_fs.h"

@@ -1723,238 +1714,6 @@ TEST_P(DBBlockCacheKeyTest, StableCacheKeys) {
  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->DisableProcessing();
 }

-class CacheKeyTest : public testing::Test {
- public:
-  void SetupStableBase() {
-    // Like SemiStructuredUniqueIdGen::GenerateNext
-    tp_.db_session_id = EncodeSessionId(base_session_upper_,
-                                        base_session_lower_ ^ session_counter_);
-    tp_.db_id = ToString(db_id_);
-    tp_.orig_file_number = file_number_;
-    bool is_stable;
-    std::string cur_session_id = "";  // ignored
-    uint64_t cur_file_number = 42;    // ignored
-    BlockBasedTable::SetupBaseCacheKey(&tp_, cur_session_id, cur_file_number,
-                                       file_size_, &base_cache_key_,
-                                       &is_stable);
-    ASSERT_TRUE(is_stable);
-  }
-  CacheKey WithOffset(uint64_t offset) {
-    return BlockBasedTable::GetCacheKey(base_cache_key_,
-                                        BlockHandle(offset, /*size*/ 5));
-  }
-
- protected:
-  OffsetableCacheKey base_cache_key_;
-  TableProperties tp_;
-  uint64_t file_size_ = 0;
-  uint64_t base_session_upper_ = 0;
-  uint64_t base_session_lower_ = 0;
-  uint64_t session_counter_ = 0;
-  uint64_t file_number_ = 0;
-  uint64_t db_id_ = 0;
-};
-
-namespace {
-template <typename T>
-int CountBitsDifferent(const T& t1, const T& t2) {
-  int diff = 0;
-  const uint8_t* p1 = reinterpret_cast<const uint8_t*>(&t1);
-  const uint8_t* p2 = reinterpret_cast<const uint8_t*>(&t2);
-  static_assert(sizeof(*p1) == 1, "Expecting uint8_t byte");
-  for (size_t i = 0; i < sizeof(T); ++i) {
-    diff += BitsSetToOne(p1[i] ^ p2[i]);
-  }
-  return diff;
-}
-
-}  // namespace
-
-TEST_F(CacheKeyTest, DBImplSessionIdStructure) {
-  // We have to generate our own session IDs for simulation purposes in other
-  // tests. Here we verify that the DBImpl implementation seems to match
-  // our construction here, by using lowest XORed-in bits for "session
-  // counter."
-  std::string session_id1 = DBImpl::GenerateDbSessionId(/*env*/ nullptr);
-  std::string session_id2 = DBImpl::GenerateDbSessionId(/*env*/ nullptr);
-  uint64_t upper1, upper2, lower1, lower2;
-  ASSERT_OK(DecodeSessionId(session_id1, &upper1, &lower1));
-  ASSERT_OK(DecodeSessionId(session_id2, &upper2, &lower2));
-  // Because generated in same process
-  ASSERT_EQ(upper1, upper2);
-  // Unless we generate > 4 billion session IDs in this process...
-  ASSERT_EQ(Upper32of64(lower1), Upper32of64(lower2));
-  // But they must be different somewhere
-  ASSERT_NE(Lower32of64(lower1), Lower32of64(lower2));
-}
-
-TEST_F(CacheKeyTest, StandardEncodingLimit) {
-  base_session_upper_ = 1234;
-  base_session_lower_ = 5678;
-  session_counter_ = 42;
-  file_number_ = 42;
-  db_id_ = 1234;
-
-  file_size_ = 42;
-  SetupStableBase();
-  CacheKey ck1;
-  ASSERT_TRUE(ck1.IsEmpty());
-  ck1 = WithOffset(0);
-  ASSERT_FALSE(ck1.IsEmpty());
-
-  // Should use same encoding
-  file_size_ = BlockBasedTable::kMaxFileSizeStandardEncoding;
-  SetupStableBase();
-  CacheKey ck2 = WithOffset(0);
-  ASSERT_EQ(CountBitsDifferent(ck1, ck2), 0);
-
-  // Should use different encoding
-  ++file_size_;
-  SetupStableBase();
-  CacheKey ck3 = WithOffset(0);
-  ASSERT_GT(CountBitsDifferent(ck2, ck3), 0);
-}
-
-TEST_F(CacheKeyTest, Encodings) {
-  // Claim from cache_key.cc:
-  // In fact, if our SST files are all < 4TB (see
-  // BlockBasedTable::kMaxFileSizeStandardEncoding), then SST files generated
-  // in a single process are guaranteed to have unique cache keys, unless/until
-  // number session ids * max file number = 2**86, e.g. 1 trillion DB::Open in
-  // a single process and 64 trillion files generated.
-
-  // We can generalize that. For
-  // * z bits in maximum file size
-  // * n bits in maximum file number
-  // * s bits in maximum session counter
-  // uniqueness is guaranteed at least when all of these hold:
-  // *  z + n + s <= 121  (128 - 2 meta + 2 offset trim - (8-1) byte granularity
-  //                       in encoding)
-  // *  n + s <= 86       (encoding limitation)
-  // *  s <= 62           (because of 2-bit metadata)
-
-  // We can verify this indirectly by how input bits get into the cache key,
-  // but we have to be mindful that for sufficiently large file sizes,
-  // different encodings might be used. But for cases mixing large and small
-  // files, we have to verify uniqueness between encodings.
-
-  // Going through all combinations would be a little expensive, so we test
-  // only one random "stripe" of the configuration space per run.
-  constexpr uint32_t kStripeBits = 8;
-  constexpr uint32_t kStripeMask = (uint32_t{1} << kStripeBits) - 1;
-
-  // Also cycle through stripes on repeated runs (not thread safe)
-  static uint32_t stripe =
-      static_cast<uint32_t>(std::random_device{}()) & kStripeMask;
-  stripe = (stripe + 1) & kStripeMask;
-
-  fprintf(stderr, "%u\n", stripe);
-
-  // We are going to randomly initialize some values which *should* not affect
-  // result
-  Random64 r{std::random_device{}()};
-
-  int max_num_encodings = 0;
-  uint32_t config_num = 0;
-  uint32_t session_counter_bits, file_number_bits, max_file_size_bits;
-
-  // Inner loop body, used later in a loop over configurations
-  auto TestConfig = [&]() {
-    base_session_upper_ = r.Next();
-    base_session_lower_ = r.Next();
-    session_counter_ = r.Next();
-    if (session_counter_bits < 64) {
-      // Avoid shifting UB
-      session_counter_ = session_counter_ >> 1 >> (63 - session_counter_bits);
-    }
-    file_number_ = r.Next() >> (64 - file_number_bits);
-    // Need two bits set to avoid temporary zero below
-    if (BitsSetToOne(file_number_) < 2) {
-      file_number_ = 3;
-    }
-    db_id_ = r.Next();
-
-    // Work-around clang-analyzer which thinks empty last_base is garbage
-    CacheKey last_base = CacheKey::CreateUniqueForProcessLifetime();
-
-    std::unordered_set<std::string> seen;
-    int num_encodings = 0;
-
-    // Loop over encodings by increasing file size bits
-    for (uint32_t file_size_bits = 1; file_size_bits <= max_file_size_bits;
-         ++file_size_bits) {
-      file_size_ = uint64_t{1} << (file_size_bits - 1);
-      SetupStableBase();
-      CacheKey new_base = WithOffset(0);
-      if (CountBitsDifferent(last_base, new_base) == 0) {
-        // Same as previous encoding
-        continue;
-      }
-
-      // New encoding
-      ++num_encodings;
-      ASSERT_TRUE(seen.insert(new_base.AsSlice().ToString()).second);
-      last_base = new_base;
-      for (uint32_t i = 0; i < file_size_bits; ++i) {
-        CacheKey ck = WithOffset(uint64_t{1} << i);
-        if (i < 2) {
-          // These cases are not relevant and optimized by dropping two
-          // lowest bits because there's always at least 5 bytes between
-          // blocks.
-          ASSERT_EQ(CountBitsDifferent(ck, new_base), 0);
-        } else {
-          // Normal case
-          // 1 bit different from base and never been seen implies the bit
-          // is encoded into cache key without overlapping other structured
-          // data.
-          ASSERT_EQ(CountBitsDifferent(ck, new_base), 1);
-          ASSERT_TRUE(seen.insert(ck.AsSlice().ToString()).second);
-        }
-      }
-      for (uint32_t i = 0; i < session_counter_bits; ++i) {
-        SaveAndRestore<uint64_t> tmp(&session_counter_,
-                                     session_counter_ ^ (uint64_t{1} << i));
-        SetupStableBase();
-        CacheKey ck = WithOffset(0);
-        ASSERT_EQ(CountBitsDifferent(ck, new_base), 1);
-        ASSERT_TRUE(seen.insert(ck.AsSlice().ToString()).second);
-      }
-      for (uint32_t i = 0; i < file_number_bits; ++i) {
-        SaveAndRestore<uint64_t> tmp(&file_number_,
-                                     file_number_ ^ (uint64_t{1} << i));
-        SetupStableBase();
-        CacheKey ck = WithOffset(0);
-        ASSERT_EQ(CountBitsDifferent(ck, new_base), 1);
-        ASSERT_TRUE(seen.insert(ck.AsSlice().ToString()).second);
-      }
-      max_num_encodings = std::max(max_num_encodings, num_encodings);
-    }
-  };
-
-  // Loop over configurations and test those in stripe
-  for (session_counter_bits = 0; session_counter_bits <= 62;
-       ++session_counter_bits) {
-    uint32_t max_file_number_bits =
-        std::min(uint32_t{64}, uint32_t{86} - session_counter_bits);
-    // Start with 2 to avoid file_number_ == 0 in testing
-    for (file_number_bits = 2; file_number_bits <= max_file_number_bits;
-         ++file_number_bits) {
-      uint32_t max_max_file_size_bits =
-          std::min(uint32_t{64},
-                   uint32_t{121} - file_number_bits - session_counter_bits);
-      for (max_file_size_bits = 1; max_file_size_bits <= max_max_file_size_bits;
-           ++max_file_size_bits) {
-        if ((config_num++ & kStripeMask) == stripe) {
-          TestConfig();
-        }
-      }
-    }
-  }
-
-  // Make sure the current implementation is exercised
-  ASSERT_EQ(max_num_encodings, 4);
-}
-
 INSTANTIATE_TEST_CASE_P(DBBlockCacheKeyTest, DBBlockCacheKeyTest,
                        ::testing::Combine(::testing::Bool(),
                                           ::testing::Bool()));
@@ -369,6 +369,89 @@ TEST_P(DBCompactionTestWithParam, CompactionDeletionTrigger) {
 }
 #endif  // !defined(ROCKSDB_VALGRIND_RUN) || defined(ROCKSDB_FULL_VALGRIND_RUN)

+TEST_P(DBCompactionTestWithParam, CompactionsPreserveDeletes) {
+  //  For each options type we test following
+  //  - Enable preserve_deletes
+  //  - write bunch of keys and deletes
+  //  - Set start_seqnum to the beginning; compact; check that keys are present
+  //  - rewind start_seqnum way forward; compact; check that keys are gone
+
+  for (int tid = 0; tid < 3; ++tid) {
+    Options options = DeletionTriggerOptions(CurrentOptions());
+    options.max_subcompactions = max_subcompactions_;
+    options.preserve_deletes=true;
+    options.num_levels = 2;
+
+    if (tid == 1) {
+      options.skip_stats_update_on_db_open = true;
+    } else if (tid == 2) {
+      // third pass with universal compaction
+      options.compaction_style = kCompactionStyleUniversal;
+    }
+
+    DestroyAndReopen(options);
+    Random rnd(301);
+    // highlight the default; all deletes should be preserved
+    SetPreserveDeletesSequenceNumber(0);
+
+    const int kTestSize = kCDTKeysPerBuffer;
+    std::vector<std::string> values;
+    for (int k = 0; k < kTestSize; ++k) {
+      values.push_back(rnd.RandomString(kCDTValueSize));
+      ASSERT_OK(Put(Key(k), values[k]));
+    }
+
+    for (int k = 0; k < kTestSize; ++k) {
+      ASSERT_OK(Delete(Key(k)));
+    }
+    // to ensure we tackle all tombstones
+    CompactRangeOptions cro;
+    cro.change_level = true;
+    cro.target_level = 2;
+    cro.bottommost_level_compaction =
+        BottommostLevelCompaction::kForceOptimized;
+
+    ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
+    ASSERT_TRUE(
+        dbfull()->CompactRange(cro, nullptr, nullptr).IsInvalidArgument());
+
+    // check that normal user iterator doesn't see anything
+    Iterator* db_iter = dbfull()->NewIterator(ReadOptions());
+    int i = 0;
+    for (db_iter->SeekToFirst(); db_iter->Valid(); db_iter->Next()) {
+      i++;
+    }
+    ASSERT_OK(db_iter->status());
+    ASSERT_EQ(i, 0);
+    delete db_iter;
+
+    // check that iterator that sees internal keys sees tombstones
+    ReadOptions ro;
+    ro.iter_start_seqnum=1;
+    db_iter = dbfull()->NewIterator(ro);
+    ASSERT_OK(db_iter->status());
+    i = 0;
+    for (db_iter->SeekToFirst(); db_iter->Valid(); db_iter->Next()) {
+      i++;
+    }
+    ASSERT_EQ(i, 4);
+    delete db_iter;
+
+    // now all deletes should be gone
+    SetPreserveDeletesSequenceNumber(100000000);
+    ASSERT_NOK(dbfull()->CompactRange(cro, nullptr, nullptr));
+
+    db_iter = dbfull()->NewIterator(ro);
+    ASSERT_TRUE(db_iter->status().IsInvalidArgument());
+    i = 0;
+    for (db_iter->SeekToFirst(); db_iter->Valid(); db_iter->Next()) {
+      i++;
+    }
+    ASSERT_EQ(i, 0);
+    delete db_iter;
+  }
+}
+
 TEST_F(DBCompactionTest, SkipStatsUpdateTest) {
  // This test verify UpdateAccumulatedStats is not on
  // if options.skip_stats_update_on_db_open = true
@@ -418,6 +501,7 @@ TEST_F(DBCompactionTest, SkipStatsUpdateTest) {
 TEST_F(DBCompactionTest, TestTableReaderForCompaction) {
  Options options = CurrentOptions();
  options.env = env_;
+  options.new_table_reader_for_compaction_inputs = true;
  options.max_open_files = 20;
  options.level0_file_num_compaction_trigger = 3;
  // Avoid many shards with small max_open_files, where as little as
@@ -4671,98 +4755,6 @@ TEST_F(DBCompactionTest, CompactionStatsTest) {
  VerifyCompactionStats(*cfd, *collector);
 }

-TEST_F(DBCompactionTest, SubcompactionEvent) {
-  class SubCompactionEventListener : public EventListener {
-   public:
-    void OnCompactionBegin(DB* /*db*/, const CompactionJobInfo& ci) override {
-      InstrumentedMutexLock l(&mutex_);
-      ASSERT_EQ(running_compactions_.find(ci.job_id),
-                running_compactions_.end());
-      running_compactions_.emplace(ci.job_id, std::unordered_set<int>());
-    }
-
-    void OnCompactionCompleted(DB* /*db*/,
-                               const CompactionJobInfo& ci) override {
-      InstrumentedMutexLock l(&mutex_);
-      auto it = running_compactions_.find(ci.job_id);
-      ASSERT_NE(it, running_compactions_.end());
-      ASSERT_EQ(it->second.size(), 0);
-      running_compactions_.erase(it);
-    }
-
-    void OnSubcompactionBegin(const SubcompactionJobInfo& si) override {
-      InstrumentedMutexLock l(&mutex_);
-      auto it = running_compactions_.find(si.job_id);
-      ASSERT_NE(it, running_compactions_.end());
-      auto r = it->second.insert(si.subcompaction_job_id);
-      ASSERT_TRUE(r.second);  // each subcompaction_job_id should be different
-      total_subcompaction_cnt_++;
-    }
-
-    void OnSubcompactionCompleted(const SubcompactionJobInfo& si) override {
-      InstrumentedMutexLock l(&mutex_);
-      auto it = running_compactions_.find(si.job_id);
-      ASSERT_NE(it, running_compactions_.end());
-      auto r = it->second.erase(si.subcompaction_job_id);
-      ASSERT_EQ(r, 1);
-    }
-
-    size_t GetRunningCompactionCount() {
-      InstrumentedMutexLock l(&mutex_);
-      return running_compactions_.size();
-    }
-
-    size_t GetTotalSubcompactionCount() {
-      InstrumentedMutexLock l(&mutex_);
-      return total_subcompaction_cnt_;
-    }
-
-   private:
-    InstrumentedMutex mutex_;
-    std::unordered_map<int, std::unordered_set<int>> running_compactions_;
-    size_t total_subcompaction_cnt_ = 0;
-  };
-
-  Options options = CurrentOptions();
-  options.target_file_size_base = 1024;
-  options.level0_file_num_compaction_trigger = 10;
-  auto* listener = new SubCompactionEventListener();
-  options.listeners.emplace_back(listener);
-
-  DestroyAndReopen(options);
-
-  // generate 4 files @ L2
-  for (int i = 0; i < 4; i++) {
-    for (int j = 0; j < 10; j++) {
-      int key_id = i * 10 + j;
-      ASSERT_OK(Put(Key(key_id), "value" + ToString(key_id)));
-    }
-    ASSERT_OK(Flush());
-  }
-  MoveFilesToLevel(2);
-
-  // generate 2 files @ L1 which overlaps with L2 files
-  for (int i = 0; i < 2; i++) {
-    for (int j = 0; j < 10; j++) {
-      int key_id = i * 20 + j * 2;
-      ASSERT_OK(Put(Key(key_id), "value" + ToString(key_id)));
-    }
-    ASSERT_OK(Flush());
-  }
-  MoveFilesToLevel(1);
-  ASSERT_EQ(FilesPerLevel(), "0,2,4");
-
-  CompactRangeOptions comp_opts;
-  comp_opts.max_subcompactions = 4;
-  Status s = dbfull()->CompactRange(comp_opts, nullptr, nullptr);
-  ASSERT_OK(s);
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
-  // make sure there's no running compaction
-  ASSERT_EQ(listener->GetRunningCompactionCount(), 0);
-  // and sub compaction is triggered
-  ASSERT_GT(listener->GetTotalSubcompactionCount(), 0);
-}
-
 TEST_F(DBCompactionTest, CompactFilesOutputRangeConflict) {
  // LSM setup:
  // L1:      [ba bz]
@@ -6156,7 +6148,7 @@ TEST_F(DBCompactionTest, CompactionWithBlob) {
  const auto& blob_files = storage_info->GetBlobFiles();
  ASSERT_EQ(blob_files.size(), 1);

-  const auto& blob_file = blob_files.front();
+  const auto& blob_file = blob_files.begin()->second;
  ASSERT_NE(blob_file, nullptr);

  ASSERT_EQ(table_file->smallest.user_key(), first_key);
@@ -69,6 +69,7 @@ TEST_F(DBTestDynamicLevel, DynamicLevelMaxBytesBase) {
      options.level_compaction_dynamic_level_bytes = true;
      options.max_bytes_for_level_base = 10240;
      options.max_bytes_for_level_multiplier = 4;
+      options.soft_rate_limit = 1.1;
      options.max_background_compactions = max_background_compactions;
      options.num_levels = 5;

@@ -369,6 +370,7 @@ TEST_F(DBTestDynamicLevel, DynamicLevelMaxBytesBaseInc) {
  options.level_compaction_dynamic_level_bytes = true;
  options.max_bytes_for_level_base = 10240;
  options.max_bytes_for_level_multiplier = 4;
+  options.soft_rate_limit = 1.1;
  options.max_background_compactions = 2;
  options.num_levels = 5;
  options.max_compaction_bytes = 100000000;
@@ -420,6 +422,7 @@ TEST_F(DBTestDynamicLevel, DISABLED_MigrateToDynamicLevelMaxBytesBase) {
  options.level_compaction_dynamic_level_bytes = false;
  options.max_bytes_for_level_base = 10240;
  options.max_bytes_for_level_multiplier = 4;
+  options.soft_rate_limit = 1.1;
  options.num_levels = 8;

  DestroyAndReopen(options);
@@ -45,17 +45,15 @@ Status DBImpl::FlushForGetLiveFiles() {
    }
    mutex_.Lock();
  } else {
-    for (auto cfd : *versions_->GetColumnFamilySet()) {
+    for (auto cfd : versions_->GetRefedColumnFamilySet()) {
      if (cfd->IsDropped()) {
        continue;
      }
-      cfd->Ref();
      mutex_.Unlock();
      status = FlushMemTable(cfd, FlushOptions(), FlushReason::kGetLiveFiles);
      TEST_SYNC_POINT("DBImpl::GetLiveFiles:1");
      TEST_SYNC_POINT("DBImpl::GetLiveFiles:2");
      mutex_.Lock();
-      cfd->UnrefAndTryDelete();
      if (!status.ok() && !status.IsColumnFamilyDropped()) {
        break;
      } else if (status.IsColumnFamilyDropped()) {
@@ -63,7 +61,6 @@ Status DBImpl::FlushForGetLiveFiles() {
      }
    }
  }
-  versions_->GetColumnFamilySet()->FreeDeadColumnFamilies();
  return status;
 }

@@ -260,14 +257,15 @@ Status DBImpl::GetLiveFilesStorageInfo(
      }
    }
    const auto& blob_files = vsi.GetBlobFiles();
-    for (const auto& meta : blob_files) {
+    for (const auto& pair : blob_files) {
+      const auto& meta = pair.second;
      assert(meta);

      results.emplace_back();
      LiveFileStorageInfo& info = results.back();

      info.relative_filename = BlobFileName(meta->GetBlobFileNumber());
-      info.directory = GetDir(/* path_id */ 0);
+      info.directory = GetName();  // TODO?: support db_paths/cf_paths
      info.file_number = meta->GetBlobFileNumber();
      info.file_type = kBlobFile;
      info.size = meta->GetBlobFileSize();
@@ -1374,140 +1374,6 @@ TEST_F(DBFlushTest, DISABLED_MemPurgeWALSupport) {
  } while (ChangeWalOptions());
 }

-TEST_F(DBFlushTest, MemPurgeCorrectLogNumberAndSSTFileCreation) {
-  // Before our bug fix, we noticed that when 2 memtables were
-  // being flushed (with one memtable being the output of a
-  // previous MemPurge and one memtable being a newly-sealed memtable),
-  // the SST file created was not properly added to the DB version
-  // (via the VersionEdit obj), leading to data loss (the SST file
-  // was later being purged as an obsolete file).
-  // Therefore, we reproduce this scenario to test our fix.
-  Options options = CurrentOptions();
-
-  options.create_if_missing = true;
-  options.compression = kNoCompression;
-  options.inplace_update_support = false;
-  options.allow_concurrent_memtable_write = true;
-
-  // Enforce size of a single MemTable to 1MB (64MB = 1048576 bytes).
-  options.write_buffer_size = 1 << 20;
-  // Activate the MemPurge prototype.
-  options.experimental_mempurge_threshold = 1.0;
-
-  // Force to have more than one memtable to trigger a flush.
-  // For some reason this option does not seem to be enforced,
-  // so the following test is designed to make sure that we
-  // are testing the correct test case.
-  options.min_write_buffer_number_to_merge = 3;
-  options.max_write_buffer_number = 5;
-  options.max_write_buffer_size_to_maintain = 2 * (options.write_buffer_size);
-  options.disable_auto_compactions = true;
-  ASSERT_OK(TryReopen(options));
-
-  std::atomic<uint32_t> mempurge_count{0};
-  std::atomic<uint32_t> sst_count{0};
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
-      "DBImpl::FlushJob:MemPurgeSuccessful",
-      [&](void* /*arg*/) { mempurge_count++; });
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
-      "DBImpl::FlushJob:SSTFileCreated", [&](void* /*arg*/) { sst_count++; });
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->EnableProcessing();
-
-  // Dummy variable used for the following callback function.
-  uint64_t ZERO = 0;
-  // We will first execute mempurge operations exclusively.
-  // Therefore, when the first flush is triggered, we want to make
-  // sure there is at least 2 memtables being flushed: one output
-  // from a previous mempurge, and one newly sealed memtable.
-  // This is when we observed in the past that some SST files created
-  // were not properly added to the DB version (via the VersionEdit obj).
-  std::atomic<uint64_t> num_memtable_at_first_flush(0);
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
-      "FlushJob::WriteLevel0Table:num_memtables", [&](void* arg) {
-        uint64_t* mems_size = reinterpret_cast<uint64_t*>(arg);
-        // atomic_compare_exchange_strong sometimes updates the value
-        // of ZERO (the "expected" object), so we make sure ZERO is indeed...
-        // zero.
-        ZERO = 0;
-        std::atomic_compare_exchange_strong(&num_memtable_at_first_flush, &ZERO,
-                                            *mems_size);
-      });
-
-  const std::vector<std::string> KEYS = {
-      "ThisIsKey1", "ThisIsKey2", "ThisIsKey3", "ThisIsKey4", "ThisIsKey5",
-      "ThisIsKey6", "ThisIsKey7", "ThisIsKey8", "ThisIsKey9"};
-  const std::string NOT_FOUND = "NOT_FOUND";
-
-  Random rnd(117);
-  const uint64_t NUM_REPEAT_OVERWRITES = 100;
-  const uint64_t NUM_RAND_INSERTS = 500;
-  const uint64_t RAND_VALUES_LENGTH = 10240;
-
-  std::string key, value;
-  std::vector<std::string> values(9, "");
-
-  // Keys used to check that no SST file disappeared.
-  for (uint64_t k = 0; k < 5; k++) {
-    values[k] = rnd.RandomString(RAND_VALUES_LENGTH);
-    ASSERT_OK(Put(KEYS[k], values[k]));
-  }
-
-  // Insertion of of K-V pairs, multiple times.
-  // Trigger at least one mempurge and no SST file creation.
-  for (size_t i = 0; i < NUM_REPEAT_OVERWRITES; i++) {
-    // Create value strings of arbitrary length RAND_VALUES_LENGTH bytes.
-    for (uint64_t k = 5; k < values.size(); k++) {
-      values[k] = rnd.RandomString(RAND_VALUES_LENGTH);
-      ASSERT_OK(Put(KEYS[k], values[k]));
-    }
-    // Check database consistency.
-    for (uint64_t k = 0; k < values.size(); k++) {
-      ASSERT_EQ(Get(KEYS[k]), values[k]);
-    }
-  }
-
-  // Check that there was at least one mempurge
-  uint32_t expected_min_mempurge_count = 1;
-  // Check that there was no SST files created during flush.
-  uint32_t expected_sst_count = 0;
-  EXPECT_GE(mempurge_count.load(), expected_min_mempurge_count);
-  EXPECT_EQ(sst_count.load(), expected_sst_count);
-
-  // Trigger an SST file creation and no mempurge.
-  for (size_t i = 0; i < NUM_RAND_INSERTS; i++) {
-    key = rnd.RandomString(RAND_VALUES_LENGTH);
-    // Create value strings of arbitrary length RAND_VALUES_LENGTH bytes.
-    value = rnd.RandomString(RAND_VALUES_LENGTH);
-    ASSERT_OK(Put(key, value));
-    // Check database consistency.
-    for (uint64_t k = 0; k < values.size(); k++) {
-      ASSERT_EQ(Get(KEYS[k]), values[k]);
-    }
-    ASSERT_EQ(Get(key), value);
-  }
-
-  // Check that there was at least one SST files created during flush.
-  expected_sst_count = 1;
-  EXPECT_GE(sst_count.load(), expected_sst_count);
-
-  // Oddly enough, num_memtable_at_first_flush is not enforced to be
-  // equal to min_write_buffer_number_to_merge. So by asserting that
-  // the first SST file creation comes from one output memtable
-  // from a previous mempurge, and one newly sealed memtable. This
-  // is the scenario where we observed that some SST files created
-  // were not properly added to the DB version before our bug fix.
-  ASSERT_GE(num_memtable_at_first_flush.load(), 2);
-
-  // Check that no data was lost after SST file creation.
-  for (uint64_t k = 0; k < values.size(); k++) {
-    ASSERT_EQ(Get(KEYS[k]), values[k]);
-  }
-  // Extra check of database consistency.
-  ASSERT_EQ(Get(key), value);
-
-  Close();
-}
-
 TEST_P(DBFlushDirectIOTest, DirectIO) {
  Options options;
  options.create_if_missing = true;
@@ -1709,9 +1575,6 @@ TEST_F(DBFlushTest, FireOnFlushCompletedAfterCommittedResult) {
  flush_opts.wait = false;
  ASSERT_OK(db_->Flush(flush_opts));
  t1.join();
-  // Ensure background work is fully finished including listener callbacks
-  // before accessing listener state.
-  ASSERT_OK(dbfull()->TEST_WaitForBackgroundWork());
  ASSERT_TRUE(listener->completed1);
  ASSERT_TRUE(listener->completed2);
  SyncPoint::GetInstance()->DisableProcessing();
@@ -1767,7 +1630,7 @@ TEST_F(DBFlushTest, FlushWithBlob) {
  const auto& blob_files = storage_info->GetBlobFiles();
  ASSERT_EQ(blob_files.size(), 1);

-  const auto& blob_file = blob_files.front();
+  const auto& blob_file = blob_files.begin()->second;
  assert(blob_file);

  ASSERT_EQ(table_file->smallest.user_key(), "key1");
@@ -40,11 +40,6 @@ size_t CompactedDBImpl::FindFile(const Slice& key) {

 Status CompactedDBImpl::Get(const ReadOptions& options, ColumnFamilyHandle*,
                            const Slice& key, PinnableSlice* value) {
-  assert(user_comparator_);
-  if (options.timestamp || user_comparator_->timestamp_size()) {
-    // TODO: support timestamp
-    return Status::NotSupported();
-  }
  GetContext get_context(user_comparator_, nullptr, nullptr, nullptr,
                         GetContext::kNotFound, key, value, nullptr, nullptr,
                         nullptr, true, nullptr, nullptr);
@@ -63,11 +58,6 @@ Status CompactedDBImpl::Get(const ReadOptions& options, ColumnFamilyHandle*,
 std::vector<Status> CompactedDBImpl::MultiGet(const ReadOptions& options,
    const std::vector<ColumnFamilyHandle*>&,
    const std::vector<Slice>& keys, std::vector<std::string>* values) {
-  assert(user_comparator_);
-  if (user_comparator_->timestamp_size() || options.timestamp) {
-    // TODO: support timestamp
-    return std::vector<Status>(keys.size(), Status::NotSupported());
-  }
  autovector<TableReader*, 16> reader_list;
  for (const auto& key : keys) {
    const FdWithKeyRange& f = files_.files[FindFile(key)];
@@ -79,7 +69,6 @@ std::vector<Status> CompactedDBImpl::MultiGet(const ReadOptions& options,
      reader_list.push_back(f.fd.table_reader);
    }
  }
-
  std::vector<Status> statuses(keys.size(), Status::NotFound());
  values->resize(keys.size());
  int idx = 0;
@@ -171,9 +160,7 @@ Status CompactedDBImpl::Open(const Options& options,
  std::unique_ptr<CompactedDBImpl> db(new CompactedDBImpl(db_options, dbname));
  Status s = db->Init(options);
  if (s.ok()) {
-    s = db->StartPeriodicWorkScheduler();
-  }
-  if (s.ok()) {
+    db->StartPeriodicWorkScheduler();
    ROCKS_LOG_INFO(db->immutable_db_options_.info_log,
                   "Opened the db as fully compacted mode");
    LogFlush(db->immutable_db_options_.info_log);
@@ -119,16 +119,18 @@ CompressionType GetCompressionFlush(
  // Compressing memtable flushes might not help unless the sequential load
  // optimization is used for leveled compaction. Otherwise the CPU and
  // latency overhead is not offset by saving much space.
-  if (ioptions.compaction_style == kCompactionStyleUniversal &&
-      mutable_cf_options.compaction_options_universal
-              .compression_size_percent >= 0) {
-    return kNoCompression;
-  }
-  if (mutable_cf_options.compression_per_level.empty()) {
-    return mutable_cf_options.compression;
-  } else {
+  if (ioptions.compaction_style == kCompactionStyleUniversal) {
+    if (mutable_cf_options.compaction_options_universal
+            .compression_size_percent < 0) {
+      return mutable_cf_options.compression;
+    } else {
+      return kNoCompression;
+    }
+  } else if (!ioptions.compression_per_level.empty()) {
    // For leveled compress when min_level_to_compress != 0.
-    return mutable_cf_options.compression_per_level[0];
+    return ioptions.compression_per_level[0];
+  } else {
+    return mutable_cf_options.compression;
  }
 }

@@ -232,6 +234,7 @@ DBImpl::DBImpl(const DBOptions& options, const std::string& dbname,
      use_custom_gc_(seq_per_batch),
      shutdown_initiated_(false),
      own_sfm_(options.sst_file_manager == nullptr),
+      preserve_deletes_(options.preserve_deletes),
      closed_(false),
      atomic_flush_install_cv_(&mutex_),
      blob_callback_(immutable_db_options_.sst_file_manager.get(), &mutex_,
@@ -269,6 +272,11 @@ DBImpl::DBImpl(const DBOptions& options, const std::string& dbname,
  mutable_db_options_.Dump(immutable_db_options_.info_log.get());
  DumpSupportInfo(immutable_db_options_.info_log.get());

+  // always open the DB with 0 here, which means if preserve_deletes_==true
+  // we won't drop any deletion markers until SetPreserveDeletesSequenceNumber()
+  // is called by client and this seqnum is advanced.
+  preserve_deletes_seqnum_.store(0);
+
  if (write_buffer_manager_) {
    wbm_stall_.reset(new WBMStallInterface());
  }
@@ -375,15 +383,12 @@ Status DBImpl::ResumeImpl(DBRecoverContext context) {
      s = AtomicFlushMemTables(cfds, flush_opts, context.flush_reason);
      mutex_.Lock();
    } else {
-      for (auto cfd : *versions_->GetColumnFamilySet()) {
+      for (auto cfd : versions_->GetRefedColumnFamilySet()) {
        if (cfd->IsDropped()) {
          continue;
        }
-        cfd->Ref();
-        mutex_.Unlock();
+        InstrumentedMutexUnlock u(&mutex_);
        s = FlushMemTable(cfd, flush_opts, context.flush_reason);
-        mutex_.Lock();
-        cfd->UnrefAndTryDelete();
        if (!s.ok()) {
          break;
        }
@@ -495,18 +500,14 @@ void DBImpl::CancelAllBackgroundWork(bool wait) {
      s.PermitUncheckedError();  //**TODO: What to do on error?
      mutex_.Lock();
    } else {
-      for (auto cfd : *versions_->GetColumnFamilySet()) {
+      for (auto cfd : versions_->GetRefedColumnFamilySet()) {
        if (!cfd->IsDropped() && cfd->initialized() && !cfd->mem()->IsEmpty()) {
-          cfd->Ref();
-          mutex_.Unlock();
+          InstrumentedMutexUnlock u(&mutex_);
          Status s = FlushMemTable(cfd, FlushOptions(), FlushReason::kShutDown);
          s.PermitUncheckedError();  //**TODO: What to do on error?
-          mutex_.Lock();
-          cfd->UnrefAndTryDelete();
        }
      }
    }
-    versions_->GetColumnFamilySet()->FreeDeadColumnFamilies();
  }

  shutting_down_.store(true, std::memory_order_release);
@@ -768,7 +769,7 @@ void DBImpl::PrintStatistics() {
  }
 }

-Status DBImpl::StartPeriodicWorkScheduler() {
+void DBImpl::StartPeriodicWorkScheduler() {
 #ifndef ROCKSDB_LITE

 #ifndef NDEBUG
@@ -778,7 +779,7 @@ Status DBImpl::StartPeriodicWorkScheduler() {
      "DBImpl::StartPeriodicWorkScheduler:DisableScheduler",
      &disable_scheduler);
  if (disable_scheduler) {
-    return Status::OK();
+    return;
  }
 #endif  // !NDEBUG

@@ -789,11 +790,10 @@ Status DBImpl::StartPeriodicWorkScheduler() {
                             &periodic_work_scheduler_);
  }

-  return periodic_work_scheduler_->Register(
+  periodic_work_scheduler_->Register(
      this, mutable_db_options_.stats_dump_period_sec,
      mutable_db_options_.stats_persist_period_sec);
 #endif  // !ROCKSDB_LITE
-  return Status::OK();
 }

 // esitmate the total size of stats_history_
@@ -804,7 +804,8 @@ size_t DBImpl::EstimateInMemoryStatsHistorySize() const {
  size_t size_per_slice =
      sizeof(uint64_t) + sizeof(std::map<std::string, uint64_t>);
  // non-empty map, stats_history_.begin() guaranteed to exist
-  for (const auto& pairs : stats_history_.begin()->second) {
+  std::map<std::string, uint64_t> sample_slice(stats_history_.begin()->second);
+  for (const auto& pairs : sample_slice) {
    size_per_slice +=
        pairs.first.capacity() + sizeof(pairs.first) + sizeof(pairs.second);
  }
@@ -969,18 +970,13 @@ void DBImpl::DumpStats() {
  TEST_SYNC_POINT("DBImpl::DumpStats:StartRunning");
  {
    InstrumentedMutexLock l(&mutex_);
-    for (auto cfd : *versions_->GetColumnFamilySet()) {
+    for (auto cfd : versions_->GetRefedColumnFamilySet()) {
      if (cfd->initialized()) {
        // Release DB mutex for gathering cache entry stats. Pass over all
        // column families for this first so that other stats are dumped
        // near-atomically.
-        // Get a ref before unlocking
-        cfd->Ref();
-        {
-          InstrumentedMutexUnlock u(&mutex_);
-          cfd->internal_stats()->CollectCacheEntryStats(/*foreground=*/false);
-        }
-        cfd->UnrefAndTryDelete();
+        InstrumentedMutexUnlock u(&mutex_);
+        cfd->internal_stats()->CollectCacheEntryStats(/*foreground=*/false);
      }
    }

@@ -1227,7 +1223,7 @@ Status DBImpl::SetDBOptions(
              mutable_db_options_.stats_persist_period_sec) {
        mutex_.Unlock();
        periodic_work_scheduler_->Unregister(this);
-        s = periodic_work_scheduler_->Register(
+        periodic_work_scheduler_->Register(
            this, new_options.stats_dump_period_sec,
            new_options.stats_persist_period_sec);
        mutex_.Lock();
@@ -1500,6 +1496,15 @@ void DBImpl::SetLastPublishedSequence(SequenceNumber seq) {
  versions_->SetLastPublishedSequence(seq);
 }

+bool DBImpl::SetPreserveDeletesSequenceNumber(SequenceNumber seqnum) {
+  if (seqnum > preserve_deletes_seqnum_.load()) {
+    preserve_deletes_seqnum_.store(seqnum);
+    return true;
+  } else {
+    return false;
+  }
+}
+
 Status DBImpl::GetFullHistoryTsLow(ColumnFamilyHandle* column_family,
                                   std::string* ts_low) {
  if (ts_low == nullptr) {
@@ -1749,22 +1754,20 @@ Status DBImpl::GetImpl(const ReadOptions& read_options, const Slice& key,
         get_impl_options.merge_operands != nullptr);

  assert(get_impl_options.column_family);
-
-  if (read_options.timestamp) {
-    const Status s = FailIfTsSizesMismatch(get_impl_options.column_family,
-                                           *(read_options.timestamp));
-    if (!s.ok()) {
-      return s;
-    }
-  } else {
-    const Status s = FailIfCfHasTs(get_impl_options.column_family);
-    if (!s.ok()) {
-      return s;
-    }
-  }
-
+  const Comparator* ucmp = get_impl_options.column_family->GetComparator();
+  assert(ucmp);
+  size_t ts_sz = ucmp->timestamp_size();
  GetWithTimestampReadCallback read_cb(0);  // Will call Refresh

+#ifndef NDEBUG
+  if (ts_sz > 0) {
+    assert(read_options.timestamp);
+    assert(read_options.timestamp->size() == ts_sz);
+  } else {
+    assert(!read_options.timestamp);
+  }
+#endif  // NDEBUG
+
  PERF_CPU_TIMER_GUARD(get_cpu_nanos, immutable_db_options_.clock);
  StopWatch sw(immutable_db_options_.clock, stats_, DB_GET);
  PERF_TIMER_GUARD(get_snapshot_time);
@@ -1832,9 +1835,7 @@ Status DBImpl::GetImpl(const ReadOptions& read_options, const Slice& key,
  // only if t <= read_opts.timestamp and s <= snapshot.
  // HACK: temporarily overwrite input struct field but restore
  SaveAndRestore<ReadCallback*> restore_callback(&get_impl_options.callback);
-  const Comparator* ucmp = get_impl_options.column_family->GetComparator();
-  assert(ucmp);
-  if (ucmp->timestamp_size() > 0) {
+  if (ts_sz > 0) {
    assert(!get_impl_options
                .callback);  // timestamp with callback is not supported
    read_cb.Refresh(snapshot);
@@ -1857,8 +1858,7 @@ Status DBImpl::GetImpl(const ReadOptions& read_options, const Slice& key,
  bool skip_memtable = (read_options.read_tier == kPersistedTier &&
                        has_unpersisted_data_.load(std::memory_order_relaxed));
  bool done = false;
-  std::string* timestamp =
-      ucmp->timestamp_size() > 0 ? get_impl_options.timestamp : nullptr;
+  std::string* timestamp = ts_sz > 0 ? get_impl_options.timestamp : nullptr;
  if (!skip_memtable) {
    // Get value associated with key
    if (get_impl_options.get_value) {
@@ -1966,36 +1966,19 @@ std::vector<Status> DBImpl::MultiGet(
  StopWatch sw(immutable_db_options_.clock, stats_, DB_MULTIGET);
  PERF_TIMER_GUARD(get_snapshot_time);

-  size_t num_keys = keys.size();
-  assert(column_family.size() == num_keys);
-  std::vector<Status> stat_list(num_keys);
-
-  bool should_fail = false;
-  for (size_t i = 0; i < num_keys; ++i) {
-    assert(column_family[i]);
-    if (read_options.timestamp) {
-      stat_list[i] =
-          FailIfTsSizesMismatch(column_family[i], *(read_options.timestamp));
-      if (!stat_list[i].ok()) {
-        should_fail = true;
-      }
+#ifndef NDEBUG
+  for (const auto* cfh : column_family) {
+    assert(cfh);
+    const Comparator* const ucmp = cfh->GetComparator();
+    assert(ucmp);
+    if (ucmp->timestamp_size() > 0) {
+      assert(read_options.timestamp);
+      assert(ucmp->timestamp_size() == read_options.timestamp->size());
    } else {
-      stat_list[i] = FailIfCfHasTs(column_family[i]);
-      if (!stat_list[i].ok()) {
-        should_fail = true;
-      }
+      assert(!read_options.timestamp);
    }
  }
-
-  if (should_fail) {
-    for (auto& s : stat_list) {
-      if (s.ok()) {
-        s = Status::Incomplete(
-            "DB not queried due to invalid argument(s) in the same MultiGet");
-      }
-    }
-    return stat_list;
-  }
+#endif  // NDEBUG

  if (tracer_) {
    // TODO: This mutex should be removed later, to improve performance when
@@ -2038,6 +2021,8 @@ std::vector<Status> DBImpl::MultiGet(
  MergeContext merge_context;

  // Note: this always resizes the values array
+  size_t num_keys = keys.size();
+  std::vector<Status> stat_list(num_keys);
  values->resize(num_keys);
  if (timestamps) {
    timestamps->resize(num_keys);
@@ -2304,31 +2289,20 @@ void DBImpl::MultiGet(const ReadOptions& read_options, const size_t num_keys,
    return;
  }

-  bool should_fail = false;
+#ifndef NDEBUG
  for (size_t i = 0; i < num_keys; ++i) {
    ColumnFamilyHandle* cfh = column_families[i];
    assert(cfh);
-    if (read_options.timestamp) {
-      statuses[i] = FailIfTsSizesMismatch(cfh, *(read_options.timestamp));
-      if (!statuses[i].ok()) {
-        should_fail = true;
-      }
+    const Comparator* const ucmp = cfh->GetComparator();
+    assert(ucmp);
+    if (ucmp->timestamp_size() > 0) {
+      assert(read_options.timestamp);
+      assert(read_options.timestamp->size() == ucmp->timestamp_size());
    } else {
-      statuses[i] = FailIfCfHasTs(cfh);
-      if (!statuses[i].ok()) {
-        should_fail = true;
-      }
+      assert(!read_options.timestamp);
    }
  }
-  if (should_fail) {
-    for (size_t i = 0; i < num_keys; ++i) {
-      if (statuses[i].ok()) {
-        statuses[i] = Status::Incomplete(
-            "DB not queried due to invalid argument(s) in the same MultiGet");
-      }
-    }
-    return;
-  }
+#endif  // NDEBUG

  if (tracer_) {
    // TODO: This mutex should be removed later, to improve performance when
@@ -2955,22 +2929,22 @@ Iterator* DBImpl::NewIterator(const ReadOptions& read_options,
    return NewErrorIterator(Status::NotSupported(
        "ReadTier::kPersistedData is not yet supported in iterators."));
  }
-
-  assert(column_family);
-
-  if (read_options.timestamp) {
-    const Status s =
-        FailIfTsSizesMismatch(column_family, *(read_options.timestamp));
-    if (!s.ok()) {
-      return NewErrorIterator(s);
-    }
-  } else {
-    const Status s = FailIfCfHasTs(column_family);
-    if (!s.ok()) {
-      return NewErrorIterator(s);
-    }
+  // if iterator wants internal keys, we can only proceed if
+  // we can guarantee the deletes haven't been processed yet
+  if (read_options.iter_start_seqnum > 0 &&
+      !iter_start_seqnum_deprecation_warned_.exchange(true)) {
+    ROCKS_LOG_WARN(
+        immutable_db_options_.info_log,
+        "iter_start_seqnum is deprecated, will be removed in a future release. "
+        "Please try using user-defined timestamp instead.");
+  }
+  if (immutable_db_options_.preserve_deletes &&
+      read_options.iter_start_seqnum > 0 &&
+      read_options.iter_start_seqnum < preserve_deletes_seqnum_.load()) {
+    return NewErrorIterator(Status::InvalidArgument(
+        "Iterator requested internal keys which are too old and are not"
+        " guaranteed to be preserved, try larger iter_start_seqnum opt."));
  }
-
  auto cfh = static_cast_with_check<ColumnFamilyHandleImpl>(column_family);
  ColumnFamilyData* cfd = cfh->cfd();
  assert(cfd != nullptr);
@@ -3097,25 +3071,6 @@ Status DBImpl::NewIterators(
    return Status::NotSupported(
        "ReadTier::kPersistedData is not yet supported in iterators.");
  }
-
-  if (read_options.timestamp) {
-    for (auto* cf : column_families) {
-      assert(cf);
-      const Status s = FailIfTsSizesMismatch(cf, *(read_options.timestamp));
-      if (!s.ok()) {
-        return s;
-      }
-    }
-  } else {
-    for (auto* cf : column_families) {
-      assert(cf);
-      const Status s = FailIfCfHasTs(cf);
-      if (!s.ok()) {
-        return s;
-      }
-    }
-  }
-
  ReadCallback* read_callback = nullptr;  // No read callback provided.
  iterators->clear();
  iterators->reserve(column_families.size());
@@ -3490,15 +3445,13 @@ bool DBImpl::GetAggregatedIntProperty(const Slice& property,
    // Needs mutex to protect the list of column families.
    InstrumentedMutexLock l(&mutex_);
    uint64_t value;
-    for (auto* cfd : *versions_->GetColumnFamilySet()) {
+    for (auto* cfd : versions_->GetRefedColumnFamilySet()) {
      if (!cfd->initialized()) {
        continue;
      }
-      cfd->Ref();
      ret = GetIntPropertyInternal(cfd, *property_info, true, &value);
      // GetIntPropertyInternal may release db mutex and re-acquire it.
      mutex_.AssertHeld();
-      cfd->UnrefAndTryDelete();
      if (ret) {
        sum += value;
      } else {
@@ -3620,7 +3573,7 @@ void DBImpl::GetApproximateMemTableStats(ColumnFamilyHandle* column_family,
 Status DBImpl::GetApproximateSizes(const SizeApproximationOptions& options,
                                   ColumnFamilyHandle* column_family,
                                   const Range* range, int n, uint64_t* sizes) {
-  if (!options.include_memtables && !options.include_files) {
+  if (!options.include_memtabtles && !options.include_files) {
    return Status::InvalidArgument("Invalid options");
  }

@@ -3658,7 +3611,7 @@ Status DBImpl::GetApproximateSizes(const SizeApproximationOptions& options,
          options, v, k1.Encode(), k2.Encode(), /*start_level=*/0,
          /*end_level=*/-1, TableReaderCaller::kUserApproximateSize);
    }
-    if (options.include_memtables) {
+    if (options.include_memtabtles) {
      sizes[i] += sv->mem->ApproximateStats(k1.Encode(), k2.Encode()).size;
      sizes[i] += sv->imm->ApproximateStats(k1.Encode(), k2.Encode()).size;
    }
@@ -5089,6 +5042,7 @@ Status DBImpl::VerifyChecksumInternal(const ReadOptions& read_options,
    }
  }

+  // TODO: simplify using GetRefedColumnFamilySet?
  std::vector<ColumnFamilyData*> cfd_list;
  {
    InstrumentedMutexLock l(&mutex_);
@@ -5138,11 +5092,10 @@ Status DBImpl::VerifyChecksumInternal(const ReadOptions& read_options,

    if (s.ok() && use_file_checksum) {
      const auto& blob_files = vstorage->GetBlobFiles();
-      for (const auto& meta : blob_files) {
+      for (const auto& pair : blob_files) {
+        const uint64_t blob_file_number = pair.first;
+        const auto& meta = pair.second;
        assert(meta);
-
-        const uint64_t blob_file_number = meta->GetBlobFileNumber();
-
        const std::string blob_file_name = BlobFileName(
            cfd->ioptions()->cf_paths.front().path, blob_file_number);
        s = VerifyFullFileChecksum(meta->GetChecksumValue(),
@@ -5201,8 +5154,7 @@ Status DBImpl::VerifyFullFileChecksum(const std::string& file_checksum_expected,
      fs_.get(), fname, immutable_db_options_.file_checksum_gen_factory.get(),
      func_name_expected, &file_checksum, &func_name,
      read_options.readahead_size, immutable_db_options_.allow_mmap_reads,
-      io_tracer_, immutable_db_options_.rate_limiter.get(),
-      read_options.rate_limiter_priority);
+      io_tracer_, immutable_db_options_.rate_limiter.get());
  if (s.ok()) {
    assert(func_name_expected == func_name);
    if (file_checksum != file_checksum_expected) {
@@ -146,36 +146,24 @@ class DBImpl : public DB {
  // ---- Implementations of the DB interface ----

  using DB::Resume;
-  Status Resume() override;
+  virtual Status Resume() override;

  using DB::Put;
-  Status Put(const WriteOptions& options, ColumnFamilyHandle* column_family,
-             const Slice& key, const Slice& value) override;
-  Status Put(const WriteOptions& options, ColumnFamilyHandle* column_family,
-             const Slice& key, const Slice& ts, const Slice& value) override;
-
+  virtual Status Put(const WriteOptions& options,
+                     ColumnFamilyHandle* column_family, const Slice& key,
+                     const Slice& value) override;
  using DB::Merge;
-  Status Merge(const WriteOptions& options, ColumnFamilyHandle* column_family,
-               const Slice& key, const Slice& value) override;
+  virtual Status Merge(const WriteOptions& options,
+                       ColumnFamilyHandle* column_family, const Slice& key,
+                       const Slice& value) override;
  using DB::Delete;
-  Status Delete(const WriteOptions& options, ColumnFamilyHandle* column_family,
-                const Slice& key) override;
-  Status Delete(const WriteOptions& options, ColumnFamilyHandle* column_family,
-                const Slice& key, const Slice& ts) override;
-
+  virtual Status Delete(const WriteOptions& options,
+                        ColumnFamilyHandle* column_family,
+                        const Slice& key) override;
  using DB::SingleDelete;
-  Status SingleDelete(const WriteOptions& options,
-                      ColumnFamilyHandle* column_family,
-                      const Slice& key) override;
-  Status SingleDelete(const WriteOptions& options,
-                      ColumnFamilyHandle* column_family, const Slice& key,
-                      const Slice& ts) override;
-
-  using DB::DeleteRange;
-  Status DeleteRange(const WriteOptions& options,
-                     ColumnFamilyHandle* column_family, const Slice& begin_key,
-                     const Slice& end_key) override;
-
+  virtual Status SingleDelete(const WriteOptions& options,
+                              ColumnFamilyHandle* column_family,
+                              const Slice& key) override;
  using DB::Write;
  virtual Status Write(const WriteOptions& options,
                       WriteBatch* updates) override;
@@ -365,6 +353,8 @@ class DBImpl : public DB {

  virtual SequenceNumber GetLatestSequenceNumber() const override;

+  virtual bool SetPreserveDeletesSequenceNumber(SequenceNumber seqnum) override;
+
  // IncreaseFullHistoryTsLow(ColumnFamilyHandle*, std::string) will acquire
  // and release db_mutex
  Status IncreaseFullHistoryTsLow(ColumnFamilyHandle* column_family,
@@ -663,8 +653,7 @@ class DBImpl : public DB {
                             const CompactRangeOptions& compact_range_options,
                             const Slice* begin, const Slice* end,
                             bool exclusive, bool disallow_trivial_move,
-                             uint64_t max_file_num_to_ignore,
-                             const std::string& trim_ts);
+                             uint64_t max_file_num_to_ignore);

  // Return an internal iterator over the current state of the database.
  // The keys of this iterator are internal keys (see format.h).
@@ -965,11 +954,6 @@ class DBImpl : public DB {

  VersionSet* GetVersionSet() const { return versions_.get(); }

-  // Wait for any compaction
-  // We add a bool parameter to wait for unscheduledCompactions_ == 0, but this
-  // is only for the special test of CancelledCompactions
-  Status WaitForCompact(bool waitUnscheduled = false);
-
 #ifndef NDEBUG
  // Compact any files in the named level that overlap [*begin, *end]
  Status TEST_CompactRange(int level, const Slice* begin, const Slice* end,
@@ -1188,10 +1172,7 @@ class DBImpl : public DB {
  // WriteToWAL need different synchronization: log_empty_, alive_log_files_,
  // logs_, logfile_number_. Refer to the definition of each variable below for
  // more description.
-  //
-  // `mutex_` can be a hot lock in some workloads, so it deserves dedicated
-  // cachelines.
-  mutable CacheAlignedInstrumentedMutex mutex_;
+  mutable InstrumentedMutex mutex_;

  ColumnFamilyHandleImpl* default_cf_handle_;
  InternalStats* default_cf_internal_stats_;
@@ -1248,8 +1229,7 @@ class DBImpl : public DB {

  Status CompactRangeInternal(const CompactRangeOptions& options,
                              ColumnFamilyHandle* column_family,
-                              const Slice* begin, const Slice* end,
-                              const std::string& trim_ts);
+                              const Slice* begin, const Slice* end);

  // The following two functions can only be called when:
  // 1. WriteThread::Writer::EnterUnbatched() is used.
@@ -1385,10 +1365,6 @@ class DBImpl : public DB {
  // to ensure that db_session_id_ gets updated every time the DB is opened
  void SetDbSessionId();

-  Status FailIfCfHasTs(const ColumnFamilyHandle* column_family) const;
-  Status FailIfTsSizesMismatch(const ColumnFamilyHandle* column_family,
-                               const Slice& ts) const;
-
 private:
  friend class DB;
  friend class ErrorHandler;
@@ -1783,12 +1759,8 @@ class DBImpl : public DB {
                         WriteBatch* tmp_batch, size_t* write_with_wal,
                         WriteBatch** to_be_cached_state);

-  // rate_limiter_priority is used to charge `DBOptions::rate_limiter`
-  // for automatic WAL flush (`Options::manual_wal_flush` == false)
-  // associated with this WriteToWAL
  IOStatus WriteToWAL(const WriteBatch& merged_batch, log::Writer* log_writer,
                      uint64_t* log_used, uint64_t* log_size,
-                      Env::IOPriority rate_limiter_priority,
                      bool with_db_mutex = false, bool with_log_mutex = false);

  IOStatus WriteToWAL(const WriteThread::WriteGroup& write_group,
@@ -1885,7 +1857,7 @@ class DBImpl : public DB {
                              LogBuffer* log_buffer);

  // Schedule background tasks
-  Status StartPeriodicWorkScheduler();
+  void StartPeriodicWorkScheduler();

  void PrintStatistics();

@@ -2369,10 +2341,12 @@ class DBImpl : public DB {
  // DB::Open() or passed to us
  bool own_sfm_;

-  // Default value is 0 which means ALL deletes are
-  // preserved. Note that this has no effect if preserve_deletes is false.
-  const std::atomic<SequenceNumber> preserve_deletes_seqnum_{0};
-  const bool preserve_deletes_ = false;
+  // Clients must periodically call SetPreserveDeletesSequenceNumber()
+  // to advance this seqnum. Default value is 0 which means ALL deletes are
+  // preserved. Note that this has no effect if DBOptions.preserve_deletes
+  // is set to false.
+  std::atomic<SequenceNumber> preserve_deletes_seqnum_;
+  const bool preserve_deletes_;

  // Flag to check whether Close() has been called on this DB
  bool closed_;
@@ -2398,6 +2372,10 @@ class DBImpl : public DB {

  // Pointer to WriteBufferManager stalling interface.
  std::unique_ptr<StallInterface> wbm_stall_;
+
+  // Indicate if deprecation warning message is logged before. Will be removed
+  // soon with the deprecated feature.
+  std::atomic_bool iter_start_seqnum_deprecation_warned_{false};
 };

 extern Options SanitizeOptions(const std::string& db, const Options& src,
@@ -2455,43 +2433,4 @@ static void ClipToRange(T* ptr, V minvalue, V maxvalue) {
  if (static_cast<V>(*ptr) < minvalue) *ptr = minvalue;
 }

-inline Status DBImpl::FailIfCfHasTs(
-    const ColumnFamilyHandle* column_family) const {
-  column_family = column_family ? column_family : DefaultColumnFamily();
-  assert(column_family);
-  const Comparator* const ucmp = column_family->GetComparator();
-  assert(ucmp);
-  if (ucmp->timestamp_size() > 0) {
-    std::ostringstream oss;
-    oss << "cannot call this method on column family "
-        << column_family->GetName() << " that enables timestamp";
-    return Status::InvalidArgument(oss.str());
-  }
-  return Status::OK();
-}
-
-inline Status DBImpl::FailIfTsSizesMismatch(
-    const ColumnFamilyHandle* column_family, const Slice& ts) const {
-  if (!column_family) {
-    return Status::InvalidArgument("column family handle cannot be null");
-  }
-  assert(column_family);
-  const Comparator* const ucmp = column_family->GetComparator();
-  assert(ucmp);
-  if (0 == ucmp->timestamp_size()) {
-    std::stringstream oss;
-    oss << "cannot call this method on column family "
-        << column_family->GetName() << " that does not enable timestamp";
-    return Status::InvalidArgument(oss.str());
-  }
-  const size_t ts_sz = ts.size();
-  if (ts_sz != ucmp->timestamp_size()) {
-    std::stringstream oss;
-    oss << "Timestamp sizes mismatch: expect " << ucmp->timestamp_size() << ", "
-        << ts_sz << " given";
-    return Status::InvalidArgument(oss.str());
-  }
-  return Status::OK();
-}
-
 }  // namespace ROCKSDB_NAMESPACE
@@ -263,6 +263,11 @@ Status DBImpl::FlushMemTableToOutputFile(
  if (!s.ok() && need_cancel) {
    flush_job.Cancel();
  }
+  IOStatus io_s = IOStatus::OK();
+  io_s = flush_job.io_status();
+  if (s.ok()) {
+    s = io_s;
+  }

  if (s.ok()) {
    InstallSuperVersionAndScheduleWork(cfd, superversion_context,
@@ -286,19 +291,18 @@ Status DBImpl::FlushMemTableToOutputFile(

    const auto& blob_files = storage_info->GetBlobFiles();
    if (!blob_files.empty()) {
-      assert(blob_files.front());
-      assert(blob_files.back());
-
-      ROCKS_LOG_BUFFER(
-          log_buffer,
-          "[%s] Blob file summary: head=%" PRIu64 ", tail=%" PRIu64 "\n",
-          column_family_name.c_str(), blob_files.front()->GetBlobFileNumber(),
-          blob_files.back()->GetBlobFileNumber());
+      ROCKS_LOG_BUFFER(log_buffer,
+                       "[%s] Blob file summary: head=%" PRIu64 ", tail=%" PRIu64
+                       "\n",
+                       column_family_name.c_str(), blob_files.begin()->first,
+                       blob_files.rbegin()->first);
    }
  }

  if (!s.ok() && !s.IsShutdownInProgress() && !s.IsColumnFamilyDropped()) {
-    if (log_io_s.ok()) {
+    if (!io_s.ok() && !io_s.IsShutdownInProgress() &&
+        !io_s.IsColumnFamilyDropped()) {
+      assert(log_io_s.ok());
      // Error while writing to MANIFEST.
      // In fact, versions_->io_status() can also be the result of renaming
      // CURRENT file. With current code, it's just difficult to tell. So just
@@ -309,19 +313,24 @@ Status DBImpl::FlushMemTableToOutputFile(
        // error), all the Manifest write will be map to soft error.
        // TODO: kManifestWriteNoWAL and kFlushNoWAL are misleading. Refactor is
        // needed.
-        error_handler_.SetBGError(s,
+        error_handler_.SetBGError(io_s,
                                  BackgroundErrorReason::kManifestWriteNoWAL);
      } else {
        // If WAL sync is successful (either WAL size is 0 or there is no IO
        // error), all the other SST file write errors will be set as
        // kFlushNoWAL.
-        error_handler_.SetBGError(s, BackgroundErrorReason::kFlushNoWAL);
+        error_handler_.SetBGError(io_s, BackgroundErrorReason::kFlushNoWAL);
      }
    } else {
-      assert(s == log_io_s);
-      Status new_bg_error = s;
-      error_handler_.SetBGError(new_bg_error, BackgroundErrorReason::kFlush);
+      if (log_io_s.ok()) {
+        Status new_bg_error = s;
+        error_handler_.SetBGError(new_bg_error, BackgroundErrorReason::kFlush);
+      }
    }
+  } else {
+    // If we got here, then we decided not to care about the i_os status (either
+    // from never needing it or ignoring the flush job status
+    io_s.PermitUncheckedError();
  }
  // If flush ran smoothly and no mempurge happened
  // install new SST file path.
@@ -370,14 +379,13 @@ Status DBImpl::FlushMemTablesToOutputFiles(
                     &earliest_write_conflict_snapshot, &snapshot_checker);
  const auto& bg_flush_arg = bg_flush_args[0];
  ColumnFamilyData* cfd = bg_flush_arg.cfd_;
-  // intentional infrequent copy for each flush
-  MutableCFOptions mutable_cf_options_copy = *cfd->GetLatestMutableCFOptions();
+  MutableCFOptions mutable_cf_options = *cfd->GetLatestMutableCFOptions();
  SuperVersionContext* superversion_context =
      bg_flush_arg.superversion_context_;
  Status s = FlushMemTableToOutputFile(
-      cfd, mutable_cf_options_copy, made_progress, job_context,
-      superversion_context, snapshot_seqs, earliest_write_conflict_snapshot,
-      snapshot_checker, log_buffer, thread_pri);
+      cfd, mutable_cf_options, made_progress, job_context, superversion_context,
+      snapshot_seqs, earliest_write_conflict_snapshot, snapshot_checker,
+      log_buffer, thread_pri);
  return s;
 }

@@ -404,7 +412,6 @@ Status DBImpl::AtomicFlushMemTablesToOutputFiles(
  for (const auto cfd : cfds) {
    assert(cfd->imm()->NumNotFlushed() != 0);
    assert(cfd->imm()->IsFlushPending());
-    assert(cfd->GetFlushReason() == cfds[0]->GetFlushReason());
  }
 #endif /* !NDEBUG */

@@ -491,10 +498,12 @@ Status DBImpl::AtomicFlushMemTablesToOutputFiles(
  // exec_status stores the execution status of flush_jobs as
  // <bool /* executed */, Status /* status code */>
  autovector<std::pair<bool, Status>> exec_status;
+  autovector<IOStatus> io_status;
  std::vector<bool> pick_status;
  for (int i = 0; i != num_cfs; ++i) {
    // Initially all jobs are not executed, with status OK.
    exec_status.emplace_back(false, Status::OK());
+    io_status.emplace_back(IOStatus::OK());
    pick_status.push_back(false);
  }

@@ -514,6 +523,7 @@ Status DBImpl::AtomicFlushMemTablesToOutputFiles(
          jobs[i]->Run(&logs_with_prep_tracker_, &file_meta[i],
                       &(switched_to_mempurge.at(i)));
      exec_status[i].first = true;
+      io_status[i] = jobs[i]->io_status();
    }
    if (num_cfs > 1) {
      TEST_SYNC_POINT(
@@ -527,6 +537,7 @@ Status DBImpl::AtomicFlushMemTablesToOutputFiles(
        &logs_with_prep_tracker_, file_meta.data() /* &file_meta[0] */,
        switched_to_mempurge.empty() ? nullptr : &(switched_to_mempurge.at(0)));
    exec_status[0].first = true;
+    io_status[0] = jobs[0]->io_status();

    Status error_status;
    for (const auto& e : exec_status) {
@@ -545,6 +556,21 @@ Status DBImpl::AtomicFlushMemTablesToOutputFiles(
    s = error_status.ok() ? s : error_status;
  }

+  IOStatus io_s = IOStatus::OK();
+  if (io_s.ok()) {
+    IOStatus io_error = IOStatus::OK();
+    for (int i = 0; i != static_cast<int>(io_status.size()); i++) {
+      if (!io_status[i].ok() && !io_status[i].IsShutdownInProgress() &&
+          !io_status[i].IsColumnFamilyDropped()) {
+        io_error = io_status[i];
+      }
+    }
+    io_s = io_error;
+    if (s.ok() && !io_s.ok()) {
+      s = io_s;
+    }
+  }
+
  if (s.IsColumnFamilyDropped()) {
    s = Status::OK();
  }
@@ -617,10 +643,7 @@ Status DBImpl::AtomicFlushMemTablesToOutputFiles(
      return std::make_pair(Status::OK(), !ready);
    };

-    bool resuming_from_bg_err =
-        error_handler_.IsDBStopped() ||
-        (cfds[0]->GetFlushReason() == FlushReason::kErrorRecovery ||
-         cfds[0]->GetFlushReason() == FlushReason::kErrorRecoveryRetryFlush);
+    bool resuming_from_bg_err = error_handler_.IsDBStopped();
    while ((!resuming_from_bg_err || error_handler_.GetRecoveryError().ok())) {
      std::pair<Status, bool> res = wait_to_install_func();

@@ -635,10 +658,7 @@ Status DBImpl::AtomicFlushMemTablesToOutputFiles(
      }
      atomic_flush_install_cv_.Wait();

-      resuming_from_bg_err =
-          error_handler_.IsDBStopped() ||
-          (cfds[0]->GetFlushReason() == FlushReason::kErrorRecovery ||
-           cfds[0]->GetFlushReason() == FlushReason::kErrorRecoveryRetryFlush);
+      resuming_from_bg_err = error_handler_.IsDBStopped();
    }

    if (!resuming_from_bg_err) {
@@ -712,14 +732,11 @@ Status DBImpl::AtomicFlushMemTablesToOutputFiles(

      const auto& blob_files = storage_info->GetBlobFiles();
      if (!blob_files.empty()) {
-        assert(blob_files.front());
-        assert(blob_files.back());
-
-        ROCKS_LOG_BUFFER(
-            log_buffer,
-            "[%s] Blob file summary: head=%" PRIu64 ", tail=%" PRIu64 "\n",
-            column_family_name.c_str(), blob_files.front()->GetBlobFileNumber(),
-            blob_files.back()->GetBlobFileNumber());
+        ROCKS_LOG_BUFFER(log_buffer,
+                         "[%s] Blob file summary: head=%" PRIu64
+                         ", tail=%" PRIu64 "\n",
+                         column_family_name.c_str(), blob_files.begin()->first,
+                         blob_files.rbegin()->first);
      }
    }
    if (made_progress) {
@@ -762,7 +779,8 @@ Status DBImpl::AtomicFlushMemTablesToOutputFiles(
  // Need to undo atomic flush if something went wrong, i.e. s is not OK and
  // it is not because of CF drop.
  if (!s.ok() && !s.IsColumnFamilyDropped()) {
-    if (log_io_s.ok()) {
+    if (!io_s.ok() && !io_s.IsColumnFamilyDropped()) {
+      assert(log_io_s.ok());
      // Error while writing to MANIFEST.
      // In fact, versions_->io_status() can also be the result of renaming
      // CURRENT file. With current code, it's just difficult to tell. So just
@@ -773,18 +791,19 @@ Status DBImpl::AtomicFlushMemTablesToOutputFiles(
        // error), all the Manifest write will be map to soft error.
        // TODO: kManifestWriteNoWAL and kFlushNoWAL are misleading. Refactor
        // is needed.
-        error_handler_.SetBGError(s,
+        error_handler_.SetBGError(io_s,
                                  BackgroundErrorReason::kManifestWriteNoWAL);
      } else {
        // If WAL sync is successful (either WAL size is 0 or there is no IO
        // error), all the other SST file write errors will be set as
        // kFlushNoWAL.
-        error_handler_.SetBGError(s, BackgroundErrorReason::kFlushNoWAL);
+        error_handler_.SetBGError(io_s, BackgroundErrorReason::kFlushNoWAL);
      }
    } else {
-      assert(s == log_io_s);
-      Status new_bg_error = s;
-      error_handler_.SetBGError(new_bg_error, BackgroundErrorReason::kFlush);
+      if (log_io_s.ok()) {
+        Status new_bg_error = s;
+        error_handler_.SetBGError(new_bg_error, BackgroundErrorReason::kFlush);
+      }
    }
  }

@@ -869,8 +888,6 @@ void DBImpl::NotifyOnFlushCompleted(
      for (auto listener : immutable_db_options_.listeners) {
        listener->OnFlushCompleted(this, *info);
      }
-      TEST_SYNC_POINT(
-          "DBImpl::NotifyOnFlushCompleted::PostAllOnFlushCompleted");
    }
    flush_jobs_info->clear();
  }
@@ -901,7 +918,7 @@ Status DBImpl::CompactRange(const CompactRangeOptions& options,
  size_t ts_sz = ucmp->timestamp_size();
  if (ts_sz == 0) {
    return CompactRangeInternal(options, column_family, begin_without_ts,
-                                end_without_ts, "" /*trim_ts*/);
+                                end_without_ts);
  }

  std::string begin_str;
@@ -923,7 +940,7 @@ Status DBImpl::CompactRange(const CompactRangeOptions& options,
  Slice* end_with_ts = end_without_ts ? &end : nullptr;

  return CompactRangeInternal(options, column_family, begin_with_ts,
-                              end_with_ts, "" /*trim_ts*/);
+                              end_with_ts);
 }

 Status DBImpl::IncreaseFullHistoryTsLow(ColumnFamilyHandle* column_family,
@@ -969,8 +986,7 @@ Status DBImpl::IncreaseFullHistoryTsLowImpl(ColumnFamilyData* cfd,

 Status DBImpl::CompactRangeInternal(const CompactRangeOptions& options,
                                    ColumnFamilyHandle* column_family,
-                                    const Slice* begin, const Slice* end,
-                                    const std::string& trim_ts) {
+                                    const Slice* begin, const Slice* end) {
  auto cfh = static_cast_with_check<ColumnFamilyHandleImpl>(column_family);
  auto cfd = cfh->cfd();

@@ -1041,7 +1057,7 @@ Status DBImpl::CompactRangeInternal(const CompactRangeOptions& options,
    }
    s = RunManualCompaction(cfd, ColumnFamilyData::kCompactAllLevels,
                            final_output_level, options, begin, end, exclusive,
-                            false, port::kMaxUint64, trim_ts);
+                            false, port::kMaxUint64);
  } else {
    int first_overlapped_level = kInvalidLevel;
    int max_overlapped_level = kInvalidLevel;
@@ -1127,13 +1143,9 @@ Status DBImpl::CompactRangeInternal(const CompactRangeOptions& options,
            disallow_trivial_move = true;
          }
        }
-        // trim_ts need real compaction to remove latest record
-        if (!trim_ts.empty()) {
-          disallow_trivial_move = true;
-        }
        s = RunManualCompaction(cfd, level, output_level, options, begin, end,
                                exclusive, disallow_trivial_move,
-                                max_file_num_to_ignore, trim_ts);
+                                max_file_num_to_ignore);
        if (!s.ok()) {
          break;
        }
@@ -1372,8 +1384,7 @@ Status DBImpl::CompactFilesImpl(
      c->mutable_cf_options()->report_bg_io_stats, dbname_,
      &compaction_job_stats, Env::Priority::USER, io_tracer_,
      &manual_compaction_paused_, nullptr, db_id_, db_session_id_,
-      c->column_family_data()->GetFullHistoryTsLow(), c->trim_ts(),
-      &blob_callback_);
+      c->column_family_data()->GetFullHistoryTsLow(), &blob_callback_);

  // Creating a compaction influences the compaction score because the score
  // takes running compactions into account (by skipping files that are already
@@ -1762,7 +1773,7 @@ Status DBImpl::RunManualCompaction(
    ColumnFamilyData* cfd, int input_level, int output_level,
    const CompactRangeOptions& compact_range_options, const Slice* begin,
    const Slice* end, bool exclusive, bool disallow_trivial_move,
-    uint64_t max_file_num_to_ignore, const std::string& trim_ts) {
+    uint64_t max_file_num_to_ignore) {
  assert(input_level == ColumnFamilyData::kCompactAllLevels ||
         input_level >= 0);

@@ -1874,7 +1885,7 @@ Status DBImpl::RunManualCompaction(
               *manual.cfd->GetLatestMutableCFOptions(), mutable_db_options_,
               manual.input_level, manual.output_level, compact_range_options,
               manual.begin, manual.end, &manual.manual_end, &manual_conflict,
-               max_file_num_to_ignore, trim_ts)) == nullptr &&
+               max_file_num_to_ignore)) == nullptr &&
          manual_conflict))) {
      // exclusive manual compactions should not see a conflict during
      // CompactRange
@@ -2973,8 +2984,6 @@ void DBImpl::BackgroundCallCompaction(PrepickedCompaction* prepicked_compaction,
      bg_bottom_compaction_scheduled_--;
    }

-    versions_->GetColumnFamilySet()->FreeDeadColumnFamilies();
-
    // See if there's more work to be done
    MaybeScheduleFlushOrCompaction();

@@ -3371,7 +3380,7 @@ Status DBImpl::BackgroundCompaction(bool* made_progress,
        is_manual ? &manual_compaction_paused_ : nullptr,
        is_manual ? manual_compaction->canceled : nullptr, db_id_,
        db_session_id_, c->column_family_data()->GetFullHistoryTsLow(),
-        c->trim_ts(), &blob_callback_);
+        &blob_callback_);
    compaction_job.Prepare();

    NotifyOnCompactionBegin(c->column_family_data(), c.get(), status,
@@ -3771,22 +3780,4 @@ void DBImpl::GetSnapshotContext(
  }
  *snapshot_seqs = snapshots_.GetAll(earliest_write_conflict_snapshot);
 }
-
-Status DBImpl::WaitForCompact(bool wait_unscheduled) {
-  // Wait until the compaction completes
-
-  // TODO: a bug here. This function actually does not necessarily
-  // wait for compact. It actually waits for scheduled compaction
-  // OR flush to finish.
-
-  InstrumentedMutexLock l(&mutex_);
-  while ((bg_bottom_compaction_scheduled_ || bg_compaction_scheduled_ ||
-          bg_flush_scheduled_ ||
-          (wait_unscheduled && unscheduled_compactions_)) &&
-         (error_handler_.GetBGError().ok())) {
-    bg_cv_.Wait();
-  }
-  return error_handler_.GetBGError();
-}
-
 }  // namespace ROCKSDB_NAMESPACE
@@ -60,37 +60,24 @@ void DBImpl::TEST_GetFilesMetaData(
    ColumnFamilyHandle* column_family,
    std::vector<std::vector<FileMetaData>>* metadata,
    std::vector<std::shared_ptr<BlobFileMetaData>>* blob_metadata) {
-  assert(metadata);
-
  auto cfh = static_cast_with_check<ColumnFamilyHandleImpl>(column_family);
-  assert(cfh);
-
  auto cfd = cfh->cfd();
-  assert(cfd);
-
  InstrumentedMutexLock l(&mutex_);
-
-  const auto* current = cfd->current();
-  assert(current);
-
-  const auto* vstorage = current->storage_info();
-  assert(vstorage);
-
  metadata->resize(NumberLevels());
-
-  for (int level = 0; level < NumberLevels(); ++level) {
-    const std::vector<FileMetaData*>& files = vstorage->LevelFiles(level);
+  for (int level = 0; level < NumberLevels(); level++) {
+    const std::vector<FileMetaData*>& files =
+        cfd->current()->storage_info()->LevelFiles(level);

    (*metadata)[level].clear();
-    (*metadata)[level].reserve(files.size());
-
    for (const auto& f : files) {
      (*metadata)[level].push_back(*f);
    }
  }
-
-  if (blob_metadata) {
-    *blob_metadata = vstorage->GetBlobFiles();
+  if (blob_metadata != nullptr) {
+    blob_metadata->clear();
+    for (const auto& blob : cfd->current()->storage_info()->GetBlobFiles()) {
+      blob_metadata->push_back(blob.second);
+    }
  }
 }

@@ -120,8 +107,7 @@ Status DBImpl::TEST_CompactRange(int level, const Slice* begin,
          : level + 1;
  return RunManualCompaction(cfd, level, output_level, CompactRangeOptions(),
                             begin, end, true, disallow_trivial_move,
-                             port::kMaxUint64 /*max_file_num_to_ignore*/,
-                             "" /*trim_ts*/);
+                             port::kMaxUint64 /*max_file_num_to_ignore*/);
 }

 Status DBImpl::TEST_SwitchMemtable(ColumnFamilyData* cfd) {
@@ -189,7 +175,19 @@ Status DBImpl::TEST_WaitForFlushMemTable(ColumnFamilyHandle* column_family) {

 Status DBImpl::TEST_WaitForCompact(bool wait_unscheduled) {
  // Wait until the compaction completes
-  return WaitForCompact(wait_unscheduled);
+
+  // TODO: a bug here. This function actually does not necessarily
+  // wait for compact. It actually waits for scheduled compaction
+  // OR flush to finish.
+
+  InstrumentedMutexLock l(&mutex_);
+  while ((bg_bottom_compaction_scheduled_ || bg_compaction_scheduled_ ||
+          bg_flush_scheduled_ ||
+          (wait_unscheduled && unscheduled_compactions_)) &&
+         (error_handler_.GetBGError().ok())) {
+    bg_cv_.Wait();
+  }
+  return error_handler_.GetBGError();
 }

 Status DBImpl::TEST_WaitForPurge() {
@@ -23,11 +23,7 @@
 namespace ROCKSDB_NAMESPACE {

 uint64_t DBImpl::MinLogNumberToKeep() {
-  if (allow_2pc()) {
-    return versions_->min_log_number_to_keep_2pc();
-  } else {
-    return versions_->MinLogNumberWithUnflushedData();
-  }
+  return versions_->min_log_number_to_keep();
 }

 uint64_t DBImpl::MinObsoleteSstNumberToKeep() {
@@ -224,7 +220,6 @@ void DBImpl::FindObsoleteFiles(JobContext* job_context, bool force,
    }

    // Add log files in wal_dir
-
    if (!immutable_db_options_.IsWalDirSameAsDBPath(dbname_)) {
      std::vector<std::string> log_files;
      Status s = env_->GetChildren(immutable_db_options_.wal_dir, &log_files);
@@ -234,6 +229,7 @@ void DBImpl::FindObsoleteFiles(JobContext* job_context, bool force,
            log_file, immutable_db_options_.wal_dir);
      }
    }
+
    // Add info log files in db_log_dir
    if (!immutable_db_options_.db_log_dir.empty() &&
        immutable_db_options_.db_log_dir != dbname_) {
@@ -142,6 +142,10 @@ DBOptions SanitizeOptions(const std::string& dbname, const DBOptions& src,
    result.compaction_readahead_size = 1024 * 1024 * 2;
  }

+  if (result.compaction_readahead_size > 0 || result.use_direct_reads) {
+    result.new_table_reader_for_compaction_inputs = true;
+  }
+
  // Force flush on DB open if 2PC is enabled, since with 2PC we have no
  // guarantee that consecutive log files have consecutive sequence id, which
  // make recovery complicated.
@@ -190,19 +194,19 @@ DBOptions SanitizeOptions(const std::string& dbname, const DBOptions& src,
  }
 #endif  // !ROCKSDB_LITE

-  // Supported wal compression types
-  if (!StreamingCompressionTypeSupported(result.wal_compression)) {
-    result.wal_compression = kNoCompression;
-    ROCKS_LOG_WARN(result.info_log,
-                   "wal_compression is disabled since only zstd is supported");
-  }
-
  if (!result.paranoid_checks) {
    result.skip_checking_sst_file_sizes_on_db_open = true;
    ROCKS_LOG_INFO(result.info_log,
                   "file size check will be skipped during open.");
  }

+  if (result.preserve_deletes) {
+    ROCKS_LOG_WARN(
+        result.info_log,
+        "preserve_deletes is deprecated, will be removed in a future release. "
+        "Please try using user-defined timestamp instead.");
+  }
+
  return result;
 }

@@ -282,12 +286,6 @@ Status DBImpl::ValidateOptions(const DBOptions& db_options) {
        "atomic_flush is currently incompatible with best-efforts recovery");
  }

-  if (db_options.use_direct_io_for_flush_and_compaction &&
-      0 == db_options.writable_file_max_buffer_size) {
-    return Status::InvalidArgument(
-        "writes in direct IO require writable_file_max_buffer_size > 0");
-  }
-
  return Status::OK();
 }

@@ -866,6 +864,11 @@ Status DBImpl::RecoverLogFiles(const std::vector<uint64_t>& wal_numbers,
  bool flushed = false;
  uint64_t corrupted_wal_number = kMaxSequenceNumber;
  uint64_t min_wal_number = MinLogNumberToKeep();
+  if (!allow_2pc()) {
+    // In non-2pc mode, we skip WALs that do not back unflushed data.
+    min_wal_number =
+        std::max(min_wal_number, versions_->MinLogNumberWithUnflushedData());
+  }
  for (auto wal_number : wal_numbers) {
    if (wal_number < min_wal_number) {
      ROCKS_LOG_INFO(immutable_db_options_.info_log,
@@ -1270,9 +1273,16 @@ Status DBImpl::RecoverLogFiles(const std::vector<uint64_t>& wal_numbers,
      }

      std::unique_ptr<VersionEdit> wal_deletion;
-      if (immutable_db_options_.track_and_verify_wals_in_manifest) {
-        wal_deletion.reset(new VersionEdit);
-        wal_deletion->DeleteWalsBefore(max_wal_number + 1);
+      if (flushed) {
+        wal_deletion = std::unique_ptr<VersionEdit>(new VersionEdit());
+        if (immutable_db_options_.track_and_verify_wals_in_manifest) {
+          wal_deletion->DeleteWalsBefore(max_wal_number + 1);
+        }
+        if (!allow_2pc()) {
+          // In non-2pc mode, flushing the memtables of the column families
+          // means we can advance min_log_number_to_keep.
+          wal_deletion->SetMinLogNumberToKeep(max_wal_number + 1);
+        }
        edit_lists.back().push_back(wal_deletion.get());
      }

@@ -1351,7 +1361,14 @@ Status DBImpl::RestoreAliveLogFiles(const std::vector<uint64_t>& wal_numbers) {
  // FindObsoleteFiles()
  total_log_size_ = 0;
  log_empty_ = false;
+  uint64_t min_wal_with_unflushed_data =
+      versions_->MinLogNumberWithUnflushedData();
  for (auto wal_number : wal_numbers) {
+    if (!allow_2pc() && wal_number < min_wal_with_unflushed_data) {
+      // In non-2pc mode, the WAL files not backing unflushed data are not
+      // alive, thus should not be added to the alive_log_files_.
+      continue;
+    }
    // We preallocate space for wals, but then after a crash and restart, those
    // preallocated space are not needed anymore. It is likely only the last
    // log has such preallocated space, so we only truncate for the last log.
@@ -1547,72 +1564,6 @@ Status DB::Open(const DBOptions& db_options, const std::string& dbname,
                      !kSeqPerBatch, kBatchPerTxn);
 }

-// TODO: Implement the trimming in flush code path.
-// TODO: Perform trimming before inserting into memtable during recovery.
-// TODO: Pick files with max_timestamp > trim_ts by each file's timestamp meta
-// info, and handle only these files to reduce io.
-Status DB::OpenAndTrimHistory(
-    const DBOptions& db_options, const std::string& dbname,
-    const std::vector<ColumnFamilyDescriptor>& column_families,
-    std::vector<ColumnFamilyHandle*>* handles, DB** dbptr,
-    std::string trim_ts) {
-  assert(dbptr != nullptr);
-  assert(handles != nullptr);
-  auto validate_options = [&db_options] {
-    if (db_options.avoid_flush_during_recovery) {
-      return Status::InvalidArgument(
-          "avoid_flush_during_recovery incompatible with "
-          "OpenAndTrimHistory");
-    }
-    return Status::OK();
-  };
-  auto s = validate_options();
-  if (!s.ok()) {
-    return s;
-  }
-
-  DB* db = nullptr;
-  s = DB::Open(db_options, dbname, column_families, handles, &db);
-  if (!s.ok()) {
-    return s;
-  }
-  assert(db);
-  CompactRangeOptions options;
-  options.bottommost_level_compaction =
-      BottommostLevelCompaction::kForceOptimized;
-  auto db_impl = static_cast_with_check<DBImpl>(db);
-  for (auto handle : *handles) {
-    assert(handle != nullptr);
-    auto cfh = static_cast_with_check<ColumnFamilyHandleImpl>(handle);
-    auto cfd = cfh->cfd();
-    assert(cfd != nullptr);
-    // Only compact column families with timestamp enabled
-    if (cfd->user_comparator() != nullptr &&
-        cfd->user_comparator()->timestamp_size() > 0) {
-      s = db_impl->CompactRangeInternal(options, handle, nullptr, nullptr,
-                                        trim_ts);
-      if (!s.ok()) {
-        break;
-      }
-    }
-  }
-  auto clean_op = [&handles, &db] {
-    for (auto handle : *handles) {
-      auto temp_s = db->DestroyColumnFamilyHandle(handle);
-      assert(temp_s.ok());
-    }
-    handles->clear();
-    delete db;
-  };
-  if (!s.ok()) {
-    clean_op();
-    return s;
-  }
-
-  *dbptr = db;
-  return s;
-}
-
 IOStatus DBImpl::CreateWAL(uint64_t log_file_num, uint64_t recycle_log_number,
                           size_t preallocate_block_size,
                           log::Writer** new_log) {
@@ -1652,9 +1603,7 @@ IOStatus DBImpl::CreateWAL(uint64_t log_file_num, uint64_t recycle_log_number,
        tmp_set.Contains(FileType::kWalFile)));
    *new_log = new log::Writer(std::move(file_writer), log_file_num,
                               immutable_db_options_.recycle_log_file_num > 0,
-                               immutable_db_options_.manual_wal_flush,
-                               immutable_db_options_.wal_compression);
-    io_s = (*new_log)->AddCompressionTypeRecord();
+                               immutable_db_options_.manual_wal_flush);
  }
  return io_s;
 }
@@ -1798,7 +1747,7 @@ Status DBImpl::Open(const DBOptions& db_options, const std::string& dbname,
        uint64_t log_used, log_size;
        log::Writer* log_writer = impl->logs_.back().writer;
        s = impl->WriteToWAL(empty_batch, log_writer, &log_used, &log_size,
-                             Env::IO_TOTAL, /*with_db_mutex==*/true);
+                             /*with_db_mutex==*/true);
        if (s.ok()) {
          // Need to fsync, otherwise it might get lost after a power reset.
          s = impl->FlushWAL(false);
@@ -1958,9 +1907,8 @@ Status DBImpl::Open(const DBOptions& db_options, const std::string& dbname,
                   persist_options_status.ToString().c_str());
  }
  if (s.ok()) {
-    s = impl->StartPeriodicWorkScheduler();
-  }
-  if (!s.ok()) {
+    impl->StartPeriodicWorkScheduler();
+  } else {
    for (auto* h : *handles) {
      delete h;
    }
@@ -36,15 +36,6 @@ Status DBImplReadOnly::Get(const ReadOptions& read_options,
  assert(pinnable_val != nullptr);
  // TODO: stopwatch DB_GET needed?, perf timer needed?
  PERF_TIMER_GUARD(get_snapshot_time);
-
-  assert(column_family);
-  const Comparator* ucmp = column_family->GetComparator();
-  assert(ucmp);
-  if (ucmp->timestamp_size() || read_options.timestamp) {
-    // TODO: support timestamp
-    return Status::NotSupported();
-  }
-
  Status s;
  SequenceNumber snapshot = versions_->LastSequence();
  auto cfh = static_cast_with_check<ColumnFamilyHandleImpl>(column_family);
@@ -83,13 +74,6 @@ Status DBImplReadOnly::Get(const ReadOptions& read_options,

 Iterator* DBImplReadOnly::NewIterator(const ReadOptions& read_options,
                                      ColumnFamilyHandle* column_family) {
-  assert(column_family);
-  const Comparator* ucmp = column_family->GetComparator();
-  assert(ucmp);
-  if (ucmp->timestamp_size() || read_options.timestamp) {
-    // TODO: support timestamp
-    return NewErrorIterator(Status::NotSupported());
-  }
  auto cfh = static_cast_with_check<ColumnFamilyHandleImpl>(column_family);
  auto cfd = cfh->cfd();
  SuperVersion* super_version = cfd->GetSuperVersion()->Ref();
@@ -117,21 +101,6 @@ Status DBImplReadOnly::NewIterators(
    const ReadOptions& read_options,
    const std::vector<ColumnFamilyHandle*>& column_families,
    std::vector<Iterator*>* iterators) {
-  if (read_options.timestamp) {
-    // TODO: support timestamp
-    return Status::NotSupported();
-  } else {
-    for (auto* cf : column_families) {
-      assert(cf);
-      const Comparator* ucmp = cf->GetComparator();
-      assert(ucmp);
-      if (ucmp->timestamp_size()) {
-        // TODO: support timestamp
-        return Status::NotSupported();
-      }
-    }
-  }
-
  ReadCallback* read_callback = nullptr;  // No read callback provided.
  if (iterators == nullptr) {
    return Status::InvalidArgument("iterators not allowed to be nullptr");
@@ -339,14 +339,6 @@ Status DBImplSecondary::GetImpl(const ReadOptions& read_options,
  StopWatch sw(immutable_db_options_.clock, stats_, DB_GET);
  PERF_TIMER_GUARD(get_snapshot_time);

-  assert(column_family);
-  const Comparator* ucmp = column_family->GetComparator();
-  assert(ucmp);
-  if (ucmp->timestamp_size() || read_options.timestamp) {
-    // TODO: support timestamp
-    return Status::NotSupported();
-  }
-
  auto cfh = static_cast<ColumnFamilyHandleImpl*>(column_family);
  ColumnFamilyData* cfd = cfh->cfd();
  if (tracer_) {
@@ -413,15 +405,6 @@ Iterator* DBImplSecondary::NewIterator(const ReadOptions& read_options,
    return NewErrorIterator(Status::NotSupported(
        "ReadTier::kPersistedData is not yet supported in iterators."));
  }
-
-  assert(column_family);
-  const Comparator* ucmp = column_family->GetComparator();
-  assert(ucmp);
-  if (ucmp->timestamp_size() || read_options.timestamp) {
-    // TODO: support timestamp
-    return NewErrorIterator(Status::NotSupported());
-  }
-
  Iterator* result = nullptr;
  auto cfh = static_cast_with_check<ColumnFamilyHandleImpl>(column_family);
  auto cfd = cfh->cfd();
@@ -478,20 +461,6 @@ Status DBImplSecondary::NewIterators(
  if (iterators == nullptr) {
    return Status::InvalidArgument("iterators not allowed to be nullptr");
  }
-  if (read_options.timestamp) {
-    // TODO: support timestamp
-    return Status::NotSupported();
-  } else {
-    for (auto* cf : column_families) {
-      assert(cf);
-      const Comparator* ucmp = cf->GetComparator();
-      assert(ucmp);
-      if (ucmp->timestamp_size()) {
-        // TODO: support timestamp
-        return Status::NotSupported();
-      }
-    }
-  }
  iterators->clear();
  iterators->reserve(column_families.size());
  if (read_options.tailing) {
@@ -21,28 +21,11 @@ namespace ROCKSDB_NAMESPACE {
 // Convenience methods
 Status DBImpl::Put(const WriteOptions& o, ColumnFamilyHandle* column_family,
                   const Slice& key, const Slice& val) {
-  const Status s = FailIfCfHasTs(column_family);
-  if (!s.ok()) {
-    return s;
-  }
  return DB::Put(o, column_family, key, val);
 }

-Status DBImpl::Put(const WriteOptions& o, ColumnFamilyHandle* column_family,
-                   const Slice& key, const Slice& ts, const Slice& val) {
-  const Status s = FailIfTsSizesMismatch(column_family, ts);
-  if (!s.ok()) {
-    return s;
-  }
-  return DB::Put(o, column_family, key, ts, val);
-}
-
 Status DBImpl::Merge(const WriteOptions& o, ColumnFamilyHandle* column_family,
                     const Slice& key, const Slice& val) {
-  const Status s = FailIfCfHasTs(column_family);
-  if (!s.ok()) {
-    return s;
-  }
  auto cfh = static_cast_with_check<ColumnFamilyHandleImpl>(column_family);
  if (!cfh->cfd()->ioptions()->merge_operator) {
    return Status::NotSupported("Provide a merge_operator when opening DB");
@@ -53,61 +36,22 @@ Status DBImpl::Merge(const WriteOptions& o, ColumnFamilyHandle* column_family,

 Status DBImpl::Delete(const WriteOptions& write_options,
                      ColumnFamilyHandle* column_family, const Slice& key) {
-  const Status s = FailIfCfHasTs(column_family);
-  if (!s.ok()) {
-    return s;
-  }
  return DB::Delete(write_options, column_family, key);
 }

-Status DBImpl::Delete(const WriteOptions& write_options,
-                      ColumnFamilyHandle* column_family, const Slice& key,
-                      const Slice& ts) {
-  const Status s = FailIfTsSizesMismatch(column_family, ts);
-  if (!s.ok()) {
-    return s;
-  }
-  return DB::Delete(write_options, column_family, key, ts);
-}
-
 Status DBImpl::SingleDelete(const WriteOptions& write_options,
                            ColumnFamilyHandle* column_family,
                            const Slice& key) {
-  const Status s = FailIfCfHasTs(column_family);
-  if (!s.ok()) {
-    return s;
-  }
  return DB::SingleDelete(write_options, column_family, key);
 }

-Status DBImpl::SingleDelete(const WriteOptions& write_options,
-                            ColumnFamilyHandle* column_family, const Slice& key,
-                            const Slice& ts) {
-  const Status s = FailIfTsSizesMismatch(column_family, ts);
-  if (!s.ok()) {
-    return s;
-  }
-  return DB::SingleDelete(write_options, column_family, key, ts);
-}
-
-Status DBImpl::DeleteRange(const WriteOptions& write_options,
-                           ColumnFamilyHandle* column_family,
-                           const Slice& begin_key, const Slice& end_key) {
-  const Status s = FailIfCfHasTs(column_family);
-  if (!s.ok()) {
-    return s;
-  }
-  return DB::DeleteRange(write_options, column_family, begin_key, end_key);
-}
-
 void DBImpl::SetRecoverableStatePreReleaseCallback(
    PreReleaseCallback* callback) {
  recoverable_state_pre_release_callback_.reset(callback);
 }

 Status DBImpl::Write(const WriteOptions& write_options, WriteBatch* my_batch) {
-  return WriteImpl(write_options, my_batch, /*callback=*/nullptr,
-                   /*log_used=*/nullptr);
+  return WriteImpl(write_options, my_batch, nullptr, nullptr);
 }

 #ifndef ROCKSDB_LITE
@@ -130,31 +74,6 @@ Status DBImpl::WriteImpl(const WriteOptions& write_options,
  assert(!seq_per_batch_ || batch_cnt != 0);
  if (my_batch == nullptr) {
    return Status::Corruption("Batch is nullptr!");
-  } else if (!disable_memtable &&
-             WriteBatchInternal::TimestampsUpdateNeeded(*my_batch)) {
-    // If writing to memtable, then we require the caller to set/update the
-    // timestamps for the keys in the write batch.
-    // Otherwise, it means we are just writing to the WAL, and we allow
-    // timestamps unset for the keys in the write batch. This can happen if we
-    // use TransactionDB with write-committed policy, and we currently do not
-    // support user-defined timestamp with other policies.
-    // In the prepare phase, a transaction can write the batch to the WAL
-    // without inserting to memtable. The keys in the batch do not have to be
-    // assigned timestamps because they will be used only during recovery if
-    // there is a commit marker which includes their commit timestamp.
-    return Status::InvalidArgument("write batch must have timestamp(s) set");
-  } else if (write_options.rate_limiter_priority != Env::IO_TOTAL &&
-             write_options.rate_limiter_priority != Env::IO_USER) {
-    return Status::InvalidArgument(
-        "WriteOptions::rate_limiter_priority only allows "
-        "Env::IO_TOTAL and Env::IO_USER due to implementation constraints");
-  } else if (write_options.rate_limiter_priority != Env::IO_TOTAL &&
-             (write_options.disableWAL || manual_wal_flush_)) {
-    return Status::InvalidArgument(
-        "WriteOptions::rate_limiter_priority currently only supports "
-        "rate-limiting automatic WAL flush, which requires "
-        "`WriteOptions::disableWAL` and "
-        "`DBOptions::manual_wal_flush` both set to false");
  }
  // TODO: this use of operator bool on `tracer_` can avoid unnecessary lock
  // grabs but does not seem thread-safe.
@@ -364,7 +283,6 @@ Status DBImpl::WriteImpl(const WriteOptions& write_options,
    size_t total_byte_size = 0;
    size_t pre_release_callback_cnt = 0;
    for (auto* writer : write_group) {
-      assert(writer);
      if (writer->CheckCallback(this)) {
        valid_batches += writer->batch_cnt;
        if (writer->ShouldWriteToMemtable()) {
@@ -569,8 +487,7 @@ Status DBImpl::PipelinedWriteImpl(const WriteOptions& write_options,
  WriteContext write_context;

  WriteThread::Writer w(write_options, my_batch, callback, log_ref,
-                        disable_memtable, /*_batch_cnt=*/0,
-                        /*_pre_release_callback=*/nullptr);
+                        disable_memtable);
  write_thread_.JoinBatchGroup(&w);
  TEST_SYNC_POINT("DBImplWrite::PipelinedWriteImpl:AfterJoinBatchGroup");
  if (w.state == WriteThread::STATE_GROUP_LEADER) {
@@ -609,8 +526,7 @@ Status DBImpl::PipelinedWriteImpl(const WriteOptions& write_options,
        }
      }
      SequenceNumber next_sequence = current_sequence;
-      for (auto* writer : wal_write_group) {
-        assert(writer);
+      for (auto writer : wal_write_group) {
        if (writer->CheckCallback(this)) {
          if (writer->ShouldWriteToMemtable()) {
            writer->sequence = next_sequence;
@@ -848,7 +764,6 @@ Status DBImpl::WriteImplWALOnly(
  size_t pre_release_callback_cnt = 0;
  size_t total_byte_size = 0;
  for (auto* writer : write_group) {
-    assert(writer);
    if (writer->CheckCallback(this)) {
      total_byte_size = WriteBatchInternal::AppendedByteSize(
          total_byte_size, WriteBatchInternal::ByteSize(writer->batch));
@@ -1171,7 +1086,6 @@ WriteBatch* DBImpl::MergeBatch(const WriteThread::WriteGroup& write_group,
 IOStatus DBImpl::WriteToWAL(const WriteBatch& merged_batch,
                            log::Writer* log_writer, uint64_t* log_used,
                            uint64_t* log_size,
-                            Env::IOPriority rate_limiter_priority,
                            bool with_db_mutex, bool with_log_mutex) {
  assert(log_size != nullptr);

@@ -1196,7 +1110,7 @@ IOStatus DBImpl::WriteToWAL(const WriteBatch& merged_batch,
  if (UNLIKELY(needs_locking)) {
    log_write_mutex_.Lock();
  }
-  IOStatus io_s = log_writer->AddRecord(log_entry, rate_limiter_priority);
+  IOStatus io_s = log_writer->AddRecord(log_entry);

  if (UNLIKELY(needs_locking)) {
    log_write_mutex_.Unlock();
@@ -1238,8 +1152,7 @@ IOStatus DBImpl::WriteToWAL(const WriteThread::WriteGroup& write_group,
  WriteBatchInternal::SetSequence(merged_batch, sequence);

  uint64_t log_size;
-  io_s = WriteToWAL(*merged_batch, log_writer, log_used, &log_size,
-                    write_group.leader->rate_limiter_priority);
+  io_s = WriteToWAL(*merged_batch, log_writer, log_used, &log_size);
  if (to_be_cached_state) {
    cached_recoverable_state_ = *to_be_cached_state;
    cached_recoverable_state_empty_ = false;
@@ -1335,7 +1248,6 @@ IOStatus DBImpl::ConcurrentWriteToWAL(
  log::Writer* log_writer = logs_.back().writer;
  uint64_t log_size;
  io_s = WriteToWAL(*merged_batch, log_writer, log_used, &log_size,
-                    write_group.leader->rate_limiter_priority,
                    /*with_db_mutex=*/false, /*with_log_mutex=*/true);
  if (to_be_cached_state) {
    cached_recoverable_state_ = *to_be_cached_state;
@@ -2124,25 +2036,34 @@ size_t DBImpl::GetWalPreallocateBlockSize(uint64_t write_buffer_size) const {
 // can call if they wish
 Status DB::Put(const WriteOptions& opt, ColumnFamilyHandle* column_family,
               const Slice& key, const Slice& value) {
-  // Pre-allocate size of write batch conservatively.
-  // 8 bytes are taken by header, 4 bytes for count, 1 byte for type,
-  // and we allocate 11 extra bytes for key length, as well as value length.
-  WriteBatch batch(key.size() + value.size() + 24);
-  Status s = batch.Put(column_family, key, value);
-  if (!s.ok()) {
-    return s;
+  if (nullptr == opt.timestamp) {
+    // Pre-allocate size of write batch conservatively.
+    // 8 bytes are taken by header, 4 bytes for count, 1 byte for type,
+    // and we allocate 11 extra bytes for key length, as well as value length.
+    WriteBatch batch(key.size() + value.size() + 24);
+    Status s = batch.Put(column_family, key, value);
+    if (!s.ok()) {
+      return s;
+    }
+    return Write(opt, &batch);
+  }
+  const Slice* ts = opt.timestamp;
+  assert(nullptr != ts);
+  size_t ts_sz = ts->size();
+  assert(column_family->GetComparator());
+  assert(ts_sz == column_family->GetComparator()->timestamp_size());
+  WriteBatch batch;
+  Status s;
+  if (key.data() + key.size() == ts->data()) {
+    Slice key_with_ts = Slice(key.data(), key.size() + ts_sz);
+    s = batch.Put(column_family, key_with_ts, value);
+  } else {
+    std::array<Slice, 2> key_with_ts_slices{{key, *ts}};
+    SliceParts key_with_ts(key_with_ts_slices.data(), 2);
+    std::array<Slice, 1> value_slices{{value}};
+    SliceParts values(value_slices.data(), 1);
+    s = batch.Put(column_family, key_with_ts, values);
  }
-  return Write(opt, &batch);
-}
-
-Status DB::Put(const WriteOptions& opt, ColumnFamilyHandle* column_family,
-               const Slice& key, const Slice& ts, const Slice& value) {
-  ColumnFamilyHandle* default_cf = DefaultColumnFamily();
-  assert(default_cf);
-  const Comparator* const default_cf_ucmp = default_cf->GetComparator();
-  assert(default_cf_ucmp);
-  WriteBatch batch(0, 0, 0, default_cf_ucmp->timestamp_size());
-  Status s = batch.Put(column_family, key, ts, value);
  if (!s.ok()) {
    return s;
  }
@@ -2151,22 +2072,29 @@ Status DB::Put(const WriteOptions& opt, ColumnFamilyHandle* column_family,

 Status DB::Delete(const WriteOptions& opt, ColumnFamilyHandle* column_family,
                  const Slice& key) {
-  WriteBatch batch;
-  Status s = batch.Delete(column_family, key);
-  if (!s.ok()) {
-    return s;
+  if (nullptr == opt.timestamp) {
+    WriteBatch batch;
+    Status s = batch.Delete(column_family, key);
+    if (!s.ok()) {
+      return s;
+    }
+    return Write(opt, &batch);
+  }
+  const Slice* ts = opt.timestamp;
+  assert(ts != nullptr);
+  size_t ts_sz = ts->size();
+  assert(column_family->GetComparator());
+  assert(ts_sz == column_family->GetComparator()->timestamp_size());
+  WriteBatch batch;
+  Status s;
+  if (key.data() + key.size() == ts->data()) {
+    Slice key_with_ts = Slice(key.data(), key.size() + ts_sz);
+    s = batch.Delete(column_family, key_with_ts);
+  } else {
+    std::array<Slice, 2> key_with_ts_slices{{key, *ts}};
+    SliceParts key_with_ts(key_with_ts_slices.data(), 2);
+    s = batch.Delete(column_family, key_with_ts);
  }
-  return Write(opt, &batch);
-}
-
-Status DB::Delete(const WriteOptions& opt, ColumnFamilyHandle* column_family,
-                  const Slice& key, const Slice& ts) {
-  ColumnFamilyHandle* default_cf = DefaultColumnFamily();
-  assert(default_cf);
-  const Comparator* const default_cf_ucmp = default_cf->GetComparator();
-  assert(default_cf_ucmp);
-  WriteBatch batch(0, 0, 0, default_cf_ucmp->timestamp_size());
-  Status s = batch.Delete(column_family, key, ts);
  if (!s.ok()) {
    return s;
  }
@@ -2175,27 +2103,36 @@ Status DB::Delete(const WriteOptions& opt, ColumnFamilyHandle* column_family,

 Status DB::SingleDelete(const WriteOptions& opt,
                        ColumnFamilyHandle* column_family, const Slice& key) {
-  WriteBatch batch;
-  Status s = batch.SingleDelete(column_family, key);
-  if (!s.ok()) {
+  Status s;
+  if (opt.timestamp == nullptr) {
+    WriteBatch batch;
+    s = batch.SingleDelete(column_family, key);
+    if (!s.ok()) {
+      return s;
+    }
+    s = Write(opt, &batch);
    return s;
  }
-  return Write(opt, &batch);
-}

-Status DB::SingleDelete(const WriteOptions& opt,
-                        ColumnFamilyHandle* column_family, const Slice& key,
-                        const Slice& ts) {
-  ColumnFamilyHandle* default_cf = DefaultColumnFamily();
-  assert(default_cf);
-  const Comparator* const default_cf_ucmp = default_cf->GetComparator();
-  assert(default_cf_ucmp);
-  WriteBatch batch(0, 0, 0, default_cf_ucmp->timestamp_size());
-  Status s = batch.SingleDelete(column_family, key, ts);
+  const Slice* ts = opt.timestamp;
+  assert(ts != nullptr);
+  size_t ts_sz = ts->size();
+  assert(column_family->GetComparator());
+  assert(ts_sz == column_family->GetComparator()->timestamp_size());
+  WriteBatch batch;
+  if (key.data() + key.size() == ts->data()) {
+    Slice key_with_ts = Slice(key.data(), key.size() + ts_sz);
+    s = batch.SingleDelete(column_family, key_with_ts);
+  } else {
+    std::array<Slice, 2> key_with_ts_slices{{key, *ts}};
+    SliceParts key_with_ts(key_with_ts_slices.data(), 2);
+    s = batch.SingleDelete(column_family, key_with_ts);
+  }
  if (!s.ok()) {
    return s;
  }
-  return Write(opt, &batch);
+  s = Write(opt, &batch);
+  return s;
 }

 Status DB::DeleteRange(const WriteOptions& opt,
@@ -78,7 +78,7 @@ DBIter::DBIter(Env* _env, const ReadOptions& read_options,
      range_del_agg_(&ioptions.internal_comparator, s),
      db_impl_(db_impl),
      cfd_(cfd),
-      start_seqnum_(0ULL),
+      start_seqnum_(read_options.iter_start_seqnum),
      timestamp_ub_(read_options.timestamp),
      timestamp_lb_(read_options.iter_start_ts),
      timestamp_size_(timestamp_ub_ ? timestamp_ub_->size() : 0) {
@@ -2562,6 +2562,84 @@ TEST_F(DBIteratorTest, DBIterator14) {
  ASSERT_EQ(db_iter->value().ToString(), "4");
 }

+TEST_F(DBIteratorTest, DBIteratorTestDifferentialSnapshots) {
+  { // test that KVs earlier that iter_start_seqnum are filtered out
+    ReadOptions ro;
+    ro.iter_start_seqnum=5;
+    Options options;
+    options.statistics = ROCKSDB_NAMESPACE::CreateDBStatistics();
+
+    TestIterator* internal_iter = new TestIterator(BytewiseComparator());
+    for (size_t i = 0; i < 10; ++i) {
+      internal_iter->AddPut(std::to_string(i), std::to_string(i) + "a");
+      internal_iter->AddPut(std::to_string(i), std::to_string(i) + "b");
+      internal_iter->AddPut(std::to_string(i), std::to_string(i) + "c");
+    }
+    internal_iter->Finish();
+
+    std::unique_ptr<Iterator> db_iter(NewDBIterator(
+        env_, ro, ImmutableOptions(options), MutableCFOptions(options),
+        BytewiseComparator(), internal_iter, nullptr /* version */,
+        13 /* sequence */, options.max_sequential_skip_in_iterations,
+        nullptr /* read_callback */));
+    // Expecting InternalKeys in [5,8] range with correct type
+    int seqnums[4] = {5,8,11,13};
+    std::string user_keys[4] = {"1","2","3","4"};
+    std::string values[4] = {"1c", "2c", "3c", "4b"};
+    int i = 0;
+    for (db_iter->SeekToFirst(); db_iter->Valid(); db_iter->Next()) {
+      ParsedInternalKey fkey;
+      ASSERT_OK(
+          ParseInternalKey(db_iter->key(), &fkey, true /* log_err_key */));
+      ASSERT_EQ(user_keys[i], fkey.user_key.ToString());
+      ASSERT_EQ(kTypeValue, fkey.type);
+      ASSERT_EQ(seqnums[i], fkey.sequence);
+      ASSERT_EQ(values[i], db_iter->value().ToString());
+      i++;
+    }
+    ASSERT_EQ(i, 4);
+  }
+
+  { // Test that deletes are returned correctly as internal KVs
+    ReadOptions ro;
+    ro.iter_start_seqnum=5;
+    Options options;
+    options.statistics = ROCKSDB_NAMESPACE::CreateDBStatistics();
+
+    TestIterator* internal_iter = new TestIterator(BytewiseComparator());
+    for (size_t i = 0; i < 10; ++i) {
+      internal_iter->AddPut(std::to_string(i), std::to_string(i) + "a");
+      internal_iter->AddPut(std::to_string(i), std::to_string(i) + "b");
+      internal_iter->AddDeletion(std::to_string(i));
+    }
+    internal_iter->Finish();
+
+    std::unique_ptr<Iterator> db_iter(NewDBIterator(
+        env_, ro, ImmutableOptions(options), MutableCFOptions(options),
+        BytewiseComparator(), internal_iter, nullptr /* version */,
+        13 /* sequence */, options.max_sequential_skip_in_iterations,
+        nullptr /* read_callback */));
+    // Expecting InternalKeys in [5,8] range with correct type
+    int seqnums[4] = {5,8,11,13};
+    ValueType key_types[4] = {kTypeDeletion, kTypeDeletion, kTypeDeletion,
+                              kTypeValue};
+    std::string user_keys[4] = {"1","2","3","4"};
+    std::string values[4] = {"", "", "", "4b"};
+    int i = 0;
+    for (db_iter->SeekToFirst(); db_iter->Valid(); db_iter->Next()) {
+      ParsedInternalKey fkey;
+      ASSERT_OK(
+          ParseInternalKey(db_iter->key(), &fkey, true /* log_err_key */));
+      ASSERT_EQ(user_keys[i], fkey.user_key.ToString());
+      ASSERT_EQ(key_types[i], fkey.type);
+      ASSERT_EQ(seqnums[i], fkey.sequence);
+      ASSERT_EQ(values[i], db_iter->value().ToString());
+      i++;
+    }
+    ASSERT_EQ(i, 4);
+  }
+}
+
 class DBIterWithMergeIterTest : public testing::Test {
 public:
  DBIterWithMergeIterTest()
@@ -37,7 +37,7 @@ class DbKvChecksumTest
  std::pair<WriteBatch, Status> GetWriteBatch(ColumnFamilyHandle* cf_handle) {
    Status s;
    WriteBatch wb(0 /* reserved_bytes */, 0 /* max_bytes */,
-                  8 /* protection_bytes_per_entry */, 0 /* default_cf_ts_sz */);
+                  8 /* protection_bytes_per_entry */);
    switch (op_type_) {
      case WriteBatchOpType::kPut:
        s = wb.Put(cf_handle, "key", "val");
@@ -167,14 +167,9 @@ TEST_F(DBLogicalBlockSizeCacheTest, CreateColumnFamily) {
 }

 TEST_F(DBLogicalBlockSizeCacheTest, CreateColumnFamilies) {
-  // To test:
-  // (1) CreateColumnFamilies will cache the cf_paths in
-  // DBLogicalBlockSizeCache
-  // (2) Dropping column family handles associated with
-  // that cf_paths won't drop the cached cf_paths
-  // (3) Deleting all the column family handles associated
-  //  with that cf_paths will drop the cached cf_paths
-
+  // Tests that CreateColumnFamilies will cache the cf_paths,
+  // drop the column family handle won't drop the cache,
+  // drop and then delete the column family handle will drop the cache.
  Options options;
  options.create_if_missing = true;
  options.env = env_.get();
@@ -195,7 +190,7 @@ TEST_F(DBLogicalBlockSizeCacheTest, CreateColumnFamilies) {
  ASSERT_TRUE(cache_->Contains(cf_path_0_));
  ASSERT_EQ(2, cache_->GetRefCount(cf_path_0_));

-  // Drop column family does not drop cf_path_0_'s entry from cache
+  // Drop column family does not drop cache.
  for (ColumnFamilyHandle* cf : cfs) {
    ASSERT_OK(db->DropColumnFamily(cf));
    ASSERT_EQ(2, cache_->Size());
@@ -205,24 +200,22 @@ TEST_F(DBLogicalBlockSizeCacheTest, CreateColumnFamilies) {
    ASSERT_EQ(2, cache_->GetRefCount(cf_path_0_));
  }

-  // Delete one cf handle will not drop cf_path_0_'s entry from cache because
-  // another handle is still referencing cf_path_0_.
+  // Delete one handle will not drop cache because another handle is still
+  // referencing cf_path_0_.
  ASSERT_OK(db->DestroyColumnFamilyHandle(cfs[0]));
  ASSERT_EQ(2, cache_->Size());
  ASSERT_TRUE(cache_->Contains(dbname_));
  ASSERT_EQ(1, cache_->GetRefCount(dbname_));
  ASSERT_TRUE(cache_->Contains(cf_path_0_));
+  ASSERT_EQ(1, cache_->GetRefCount(cf_path_0_));

-  // Delete all cf handles and ensure the ref count of cf_path_0_ in cache_
-  // can be properly decreased by releasing any background reference to the
-  // ColumnFamilyData during db deletion
+  // Delete the last handle will drop cache.
  ASSERT_OK(db->DestroyColumnFamilyHandle(cfs[1]));
+  ASSERT_EQ(1, cache_->Size());
  ASSERT_TRUE(cache_->Contains(dbname_));
  ASSERT_EQ(1, cache_->GetRefCount(dbname_));
-  delete db;

-  // Now cf_path_0_ in cache_ has been properly decreased and cf_path_0_'s entry
-  // is dropped from cache
+  delete db;
  ASSERT_EQ(0, cache_->Size());
  ASSERT_OK(DestroyDB(dbname_, options,
      {{"cf1", cf_options}, {"cf2", cf_options}}));
@@ -1003,6 +1003,7 @@ TEST_F(DBOptionsTest, CompactionReadaheadSizeChange) {
  options.env = &env;

  options.compaction_readahead_size = 0;
+  options.new_table_reader_for_compaction_inputs = true;
  options.level0_file_num_compaction_trigger = 2;
  const std::string kValue(1024, 'v');
  Reopen(options);
@@ -337,7 +337,7 @@ TEST_F(DBPropertiesTest, ValidateSampleNumber) {

 TEST_F(DBPropertiesTest, AggregatedTableProperties) {
  for (int kTableCount = 40; kTableCount <= 100; kTableCount += 30) {
-    const int kDeletionsPerTable = 0;
+    const int kDeletionsPerTable = 5;
    const int kMergeOperandsPerTable = 15;
    const int kRangeDeletionsPerTable = 5;
    const int kPutsPerTable = 100;
@@ -349,6 +349,7 @@ TEST_F(DBPropertiesTest, AggregatedTableProperties) {
    options.level0_file_num_compaction_trigger = 8;
    options.compression = kNoCompression;
    options.create_if_missing = true;
+    options.preserve_deletes = true;
    options.merge_operator.reset(new TestPutOperator());

    BlockBasedTableOptions table_options;
@@ -529,7 +530,7 @@ TEST_F(DBPropertiesTest, ReadLatencyHistogramByLevel) {

 TEST_F(DBPropertiesTest, AggregatedTablePropertiesAtLevel) {
  const int kTableCount = 100;
-  const int kDeletionsPerTable = 0;
+  const int kDeletionsPerTable = 2;
  const int kMergeOperandsPerTable = 2;
  const int kRangeDeletionsPerTable = 2;
  const int kPutsPerTable = 10;
@@ -548,6 +549,7 @@ TEST_F(DBPropertiesTest, AggregatedTablePropertiesAtLevel) {
  options.max_bytes_for_level_multiplier = 2;
  // This ensures there no compaction happening when we call GetProperty().
  options.disable_auto_compactions = true;
+  options.preserve_deletes = true;
  options.merge_operator.reset(new TestPutOperator());

  BlockBasedTableOptions table_options;
@@ -626,7 +628,7 @@ TEST_F(DBPropertiesTest, AggregatedTablePropertiesAtLevel) {
      // Gives larger bias here as index block size, filter block size,
      // and data block size become much harder to estimate in this test.
      VerifyTableProperties(expected_tp, tp, CACHE_LINE_SIZE >= 256 ? 0.6 : 0.5,
-                            0.5, 0.5, 0.25);
+                            0.4, 0.4, 0.25);
    }
  }
 }
@@ -1067,17 +1069,11 @@ TEST_F(DBPropertiesTest, EstimateCompressionRatio) {
  const int kNumEntriesPerFile = 1000;

  Options options = CurrentOptions();
+  options.compression_per_level = {kNoCompression, kSnappyCompression};
  options.disable_auto_compactions = true;
-  options.num_levels = 3;
+  options.num_levels = 2;
  Reopen(options);

-  ASSERT_OK(db_->SetOptions(
-      {{"compression_per_level", "kNoCompression:kSnappyCompression"}}));
-  auto opts = db_->GetOptions();
-  ASSERT_EQ(opts.compression_per_level.size(), 2);
-  ASSERT_EQ(opts.compression_per_level[0], kNoCompression);
-  ASSERT_EQ(opts.compression_per_level[1], kSnappyCompression);
-
  // compression ratio is -1.0 when no open files at level
  ASSERT_EQ(CompressionRatioAtLevel(0), -1.0);

@@ -500,7 +500,7 @@ TEST_F(DBRangeDelTest, ValidUniversalSubcompactionBoundaries) {
      1 /* input_level */, 2 /* output_level */, CompactRangeOptions(),
      nullptr /* begin */, nullptr /* end */, true /* exclusive */,
      true /* disallow_trivial_move */,
-      port::kMaxUint64 /* max_file_num_to_ignore */, "" /*trim_ts*/));
+      port::kMaxUint64 /* max_file_num_to_ignore */));
 }
 #endif  // ROCKSDB_LITE

@@ -1,446 +0,0 @@
-//  Copyright (c) 2022-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under both the GPLv2 (found in the
-//  COPYING file in the root directory) and Apache 2.0 License
-//  (found in the LICENSE.Apache file in the root directory).
-
-#include <gtest/gtest.h>
-
-#include <cstdint>
-#include <string>
-
-#include "db/db_test_util.h"
-#include "port/stack_trace.h"
-#include "rocksdb/db.h"
-#include "rocksdb/env.h"
-#include "test_util/testharness.h"
-#include "util/file_checksum_helper.h"
-
-namespace ROCKSDB_NAMESPACE {
-
-class DBRateLimiterOnReadTest
-    : public DBTestBase,
-      public ::testing::WithParamInterface<std::tuple<bool, bool, bool>> {
- public:
-  explicit DBRateLimiterOnReadTest()
-      : DBTestBase("db_rate_limiter_on_read_test", /*env_do_fsync=*/false),
-        use_direct_io_(std::get<0>(GetParam())),
-        use_block_cache_(std::get<1>(GetParam())),
-        use_readahead_(std::get<2>(GetParam())) {}
-
-  void Init() {
-    options_ = GetOptions();
-    Reopen(options_);
-    for (int i = 0; i < kNumFiles; ++i) {
-      for (int j = 0; j < kNumKeysPerFile; ++j) {
-        ASSERT_OK(Put(Key(i * kNumKeysPerFile + j), "val"));
-      }
-      ASSERT_OK(Flush());
-    }
-    MoveFilesToLevel(1);
-  }
-
-  BlockBasedTableOptions GetTableOptions() {
-    BlockBasedTableOptions table_options;
-    table_options.no_block_cache = !use_block_cache_;
-    return table_options;
-  }
-
-  ReadOptions GetReadOptions() {
-    ReadOptions read_options;
-    read_options.rate_limiter_priority = Env::IO_USER;
-    read_options.readahead_size = use_readahead_ ? kReadaheadBytes : 0;
-    return read_options;
-  }
-
-  Options GetOptions() {
-    Options options = CurrentOptions();
-    options.disable_auto_compactions = true;
-    options.file_checksum_gen_factory.reset(new FileChecksumGenCrc32cFactory());
-    options.rate_limiter.reset(NewGenericRateLimiter(
-        1 << 20 /* rate_bytes_per_sec */, 100 * 1000 /* refill_period_us */,
-        10 /* fairness */, RateLimiter::Mode::kAllIo));
-    options.table_factory.reset(NewBlockBasedTableFactory(GetTableOptions()));
-    options.use_direct_reads = use_direct_io_;
-    return options;
-  }
-
- protected:
-  const static int kNumKeysPerFile = 1;
-  const static int kNumFiles = 3;
-  const static int kReadaheadBytes = 32 << 10;  // 32KB
-
-  Options options_;
-  const bool use_direct_io_;
-  const bool use_block_cache_;
-  const bool use_readahead_;
-};
-
-std::string GetTestNameSuffix(
-    ::testing::TestParamInfo<std::tuple<bool, bool, bool>> info) {
-  std::ostringstream oss;
-  if (std::get<0>(info.param)) {
-    oss << "DirectIO";
-  } else {
-    oss << "BufferedIO";
-  }
-  if (std::get<1>(info.param)) {
-    oss << "_BlockCache";
-  } else {
-    oss << "_NoBlockCache";
-  }
-  if (std::get<2>(info.param)) {
-    oss << "_Readahead";
-  } else {
-    oss << "_NoReadahead";
-  }
-  return oss.str();
-}
-
-#ifndef ROCKSDB_LITE
-INSTANTIATE_TEST_CASE_P(DBRateLimiterOnReadTest, DBRateLimiterOnReadTest,
-                        ::testing::Combine(::testing::Bool(), ::testing::Bool(),
-                                           ::testing::Bool()),
-                        GetTestNameSuffix);
-#else   // ROCKSDB_LITE
-// Cannot use direct I/O in lite mode.
-INSTANTIATE_TEST_CASE_P(DBRateLimiterOnReadTest, DBRateLimiterOnReadTest,
-                        ::testing::Combine(::testing::Values(false),
-                                           ::testing::Bool(),
-                                           ::testing::Bool()),
-                        GetTestNameSuffix);
-#endif  // ROCKSDB_LITE
-
-TEST_P(DBRateLimiterOnReadTest, Get) {
-  if (use_direct_io_ && !IsDirectIOSupported()) {
-    return;
-  }
-  Init();
-
-  ASSERT_EQ(0, options_.rate_limiter->GetTotalRequests(Env::IO_USER));
-
-  int expected = 0;
-  for (int i = 0; i < kNumFiles; ++i) {
-    {
-      std::string value;
-      ASSERT_OK(db_->Get(GetReadOptions(), Key(i * kNumKeysPerFile), &value));
-      ++expected;
-    }
-    ASSERT_EQ(expected, options_.rate_limiter->GetTotalRequests(Env::IO_USER));
-
-    {
-      std::string value;
-      ASSERT_OK(db_->Get(GetReadOptions(), Key(i * kNumKeysPerFile), &value));
-      if (!use_block_cache_) {
-        ++expected;
-      }
-    }
-    ASSERT_EQ(expected, options_.rate_limiter->GetTotalRequests(Env::IO_USER));
-  }
-}
-
-TEST_P(DBRateLimiterOnReadTest, NewMultiGet) {
-  // The new void-returning `MultiGet()` APIs use `MultiRead()`, which does not
-  // yet support rate limiting.
-  if (use_direct_io_ && !IsDirectIOSupported()) {
-    return;
-  }
-  Init();
-
-  ASSERT_EQ(0, options_.rate_limiter->GetTotalRequests(Env::IO_USER));
-
-  const int kNumKeys = kNumFiles * kNumKeysPerFile;
-  {
-    std::vector<std::string> key_bufs;
-    key_bufs.reserve(kNumKeys);
-    std::vector<Slice> keys;
-    keys.reserve(kNumKeys);
-    for (int i = 0; i < kNumKeys; ++i) {
-      key_bufs.emplace_back(Key(i));
-      keys.emplace_back(key_bufs[i]);
-    }
-    std::vector<Status> statuses(kNumKeys);
-    std::vector<PinnableSlice> values(kNumKeys);
-    db_->MultiGet(GetReadOptions(), dbfull()->DefaultColumnFamily(), kNumKeys,
-                  keys.data(), values.data(), statuses.data());
-    for (int i = 0; i < kNumKeys; ++i) {
-      ASSERT_TRUE(statuses[i].IsNotSupported());
-    }
-  }
-  ASSERT_EQ(0, options_.rate_limiter->GetTotalRequests(Env::IO_USER));
-}
-
-TEST_P(DBRateLimiterOnReadTest, OldMultiGet) {
-  // The old `vector<Status>`-returning `MultiGet()` APIs use `Read()`, which
-  // supports rate limiting.
-  if (use_direct_io_ && !IsDirectIOSupported()) {
-    return;
-  }
-  Init();
-
-  ASSERT_EQ(0, options_.rate_limiter->GetTotalRequests(Env::IO_USER));
-
-  const int kNumKeys = kNumFiles * kNumKeysPerFile;
-  int expected = 0;
-  {
-    std::vector<std::string> key_bufs;
-    key_bufs.reserve(kNumKeys);
-    std::vector<Slice> keys;
-    keys.reserve(kNumKeys);
-    for (int i = 0; i < kNumKeys; ++i) {
-      key_bufs.emplace_back(Key(i));
-      keys.emplace_back(key_bufs[i]);
-    }
-    std::vector<std::string> values;
-    std::vector<Status> statuses =
-        db_->MultiGet(GetReadOptions(), keys, &values);
-    for (int i = 0; i < kNumKeys; ++i) {
-      ASSERT_OK(statuses[i]);
-    }
-  }
-  expected += kNumKeys;
-  ASSERT_EQ(expected, options_.rate_limiter->GetTotalRequests(Env::IO_USER));
-}
-
-TEST_P(DBRateLimiterOnReadTest, Iterator) {
-  if (use_direct_io_ && !IsDirectIOSupported()) {
-    return;
-  }
-  Init();
-
-  std::unique_ptr<Iterator> iter(db_->NewIterator(GetReadOptions()));
-  ASSERT_EQ(0, options_.rate_limiter->GetTotalRequests(Env::IO_USER));
-
-  int expected = 0;
-  for (iter->SeekToFirst(); iter->Valid(); iter->Next()) {
-    ++expected;
-    ASSERT_EQ(expected, options_.rate_limiter->GetTotalRequests(Env::IO_USER));
-  }
-
-  for (iter->SeekToLast(); iter->Valid(); iter->Prev()) {
-    // When `use_block_cache_ == true`, the reverse scan will access the blocks
-    // loaded to cache during the above forward scan, in which case no further
-    // file reads are expected.
-    if (!use_block_cache_) {
-      ++expected;
-    }
-  }
-  // Reverse scan does not read evenly (one block per iteration) due to
-  // descending seqno ordering, so wait until after the loop to check total.
-  ASSERT_EQ(expected, options_.rate_limiter->GetTotalRequests(Env::IO_USER));
-}
-
-#if !defined(ROCKSDB_LITE)
-
-TEST_P(DBRateLimiterOnReadTest, VerifyChecksum) {
-  if (use_direct_io_ && !IsDirectIOSupported()) {
-    return;
-  }
-  Init();
-
-  ASSERT_EQ(0, options_.rate_limiter->GetTotalRequests(Env::IO_USER));
-
-  ASSERT_OK(db_->VerifyChecksum(GetReadOptions()));
-  // The files are tiny so there should have just been one read per file.
-  int expected = kNumFiles;
-  ASSERT_EQ(expected, options_.rate_limiter->GetTotalRequests(Env::IO_USER));
-}
-
-TEST_P(DBRateLimiterOnReadTest, VerifyFileChecksums) {
-  if (use_direct_io_ && !IsDirectIOSupported()) {
-    return;
-  }
-  Init();
-
-  ASSERT_EQ(0, options_.rate_limiter->GetTotalRequests(Env::IO_USER));
-
-  ASSERT_OK(db_->VerifyFileChecksums(GetReadOptions()));
-  // The files are tiny so there should have just been one read per file.
-  int expected = kNumFiles;
-  ASSERT_EQ(expected, options_.rate_limiter->GetTotalRequests(Env::IO_USER));
-}
-
-#endif  // !defined(ROCKSDB_LITE)
-
-class DBRateLimiterOnWriteTest : public DBTestBase {
- public:
-  explicit DBRateLimiterOnWriteTest()
-      : DBTestBase("db_rate_limiter_on_write_test", /*env_do_fsync=*/false) {}
-
-  void Init() {
-    options_ = GetOptions();
-    ASSERT_OK(TryReopenWithColumnFamilies({"default"}, options_));
-    Random rnd(301);
-    for (int i = 0; i < kNumFiles; i++) {
-      ASSERT_OK(Put(0, kStartKey, rnd.RandomString(2)));
-      ASSERT_OK(Put(0, kEndKey, rnd.RandomString(2)));
-      ASSERT_OK(Flush(0));
-    }
-  }
-
-  Options GetOptions() {
-    Options options = CurrentOptions();
-    options.disable_auto_compactions = true;
-    options.rate_limiter.reset(NewGenericRateLimiter(
-        1 << 20 /* rate_bytes_per_sec */, 100 * 1000 /* refill_period_us */,
-        10 /* fairness */, RateLimiter::Mode::kWritesOnly));
-    options.table_factory.reset(
-        NewBlockBasedTableFactory(BlockBasedTableOptions()));
-    return options;
-  }
-
- protected:
-  inline const static int64_t kNumFiles = 3;
-  inline const static std::string kStartKey = "a";
-  inline const static std::string kEndKey = "b";
-  Options options_;
-};
-
-TEST_F(DBRateLimiterOnWriteTest, Flush) {
-  std::int64_t prev_total_request = 0;
-
-  Init();
-
-  std::int64_t actual_flush_request =
-      options_.rate_limiter->GetTotalRequests(Env::IO_TOTAL) -
-      prev_total_request;
-  std::int64_t exepcted_flush_request = kNumFiles;
-  EXPECT_EQ(actual_flush_request, exepcted_flush_request);
-  EXPECT_EQ(actual_flush_request,
-            options_.rate_limiter->GetTotalRequests(Env::IO_HIGH));
-}
-
-TEST_F(DBRateLimiterOnWriteTest, Compact) {
-  Init();
-
-  // Pre-comaction:
-  // level-0 : `kNumFiles` SST files overlapping on [kStartKey, kEndKey]
-#ifndef ROCKSDB_LITE
-  std::string files_per_level_pre_compaction = std::to_string(kNumFiles);
-  ASSERT_EQ(files_per_level_pre_compaction, FilesPerLevel(0 /* cf */));
-#endif  // !ROCKSDB_LITE
-
-  std::int64_t prev_total_request =
-      options_.rate_limiter->GetTotalRequests(Env::IO_TOTAL);
-  ASSERT_EQ(0, options_.rate_limiter->GetTotalRequests(Env::IO_LOW));
-
-  Compact(kStartKey, kEndKey);
-
-  std::int64_t actual_compaction_request =
-      options_.rate_limiter->GetTotalRequests(Env::IO_TOTAL) -
-      prev_total_request;
-
-  // Post-comaction:
-  // level-0 : 0 SST file
-  // level-1 : 1 SST file
-#ifndef ROCKSDB_LITE
-  std::string files_per_level_post_compaction = "0,1";
-  ASSERT_EQ(files_per_level_post_compaction, FilesPerLevel(0 /* cf */));
-#endif  // !ROCKSDB_LITE
-
-  std::int64_t exepcted_compaction_request = 1;
-  EXPECT_EQ(actual_compaction_request, exepcted_compaction_request);
-  EXPECT_EQ(actual_compaction_request,
-            options_.rate_limiter->GetTotalRequests(Env::IO_LOW));
-}
-
-class DBRateLimiterOnWriteWALTest
-    : public DBRateLimiterOnWriteTest,
-      public ::testing::WithParamInterface<std::tuple<
-          bool /* WriteOptions::disableWal */,
-          bool /* Options::manual_wal_flush */,
-          Env::IOPriority /* WriteOptions::rate_limiter_priority */>> {
- public:
-  static std::string GetTestNameSuffix(
-      ::testing::TestParamInfo<std::tuple<bool, bool, Env::IOPriority>> info) {
-    std::ostringstream oss;
-    if (std::get<0>(info.param)) {
-      oss << "DisableWAL";
-    } else {
-      oss << "EnableWAL";
-    }
-    if (std::get<1>(info.param)) {
-      oss << "_ManualWALFlush";
-    } else {
-      oss << "_AutoWALFlush";
-    }
-    if (std::get<2>(info.param) == Env::IO_USER) {
-      oss << "_RateLimitAutoWALFlush";
-    } else if (std::get<2>(info.param) == Env::IO_TOTAL) {
-      oss << "_NoRateLimitAutoWALFlush";
-    } else {
-      oss << "_RateLimitAutoWALFlushWithIncorrectPriority";
-    }
-    return oss.str();
-  }
-
-  explicit DBRateLimiterOnWriteWALTest()
-      : disable_wal_(std::get<0>(GetParam())),
-        manual_wal_flush_(std::get<1>(GetParam())),
-        rate_limiter_priority_(std::get<2>(GetParam())) {}
-
-  void Init() {
-    options_ = GetOptions();
-    options_.manual_wal_flush = manual_wal_flush_;
-    Reopen(options_);
-  }
-
-  WriteOptions GetWriteOptions() {
-    WriteOptions write_options;
-    write_options.disableWAL = disable_wal_;
-    write_options.rate_limiter_priority = rate_limiter_priority_;
-    return write_options;
-  }
-
- protected:
-  bool disable_wal_;
-  bool manual_wal_flush_;
-  Env::IOPriority rate_limiter_priority_;
-};
-
-INSTANTIATE_TEST_CASE_P(
-    DBRateLimiterOnWriteWALTest, DBRateLimiterOnWriteWALTest,
-    ::testing::Values(std::make_tuple(false, false, Env::IO_TOTAL),
-                      std::make_tuple(false, false, Env::IO_USER),
-                      std::make_tuple(false, false, Env::IO_HIGH),
-                      std::make_tuple(false, true, Env::IO_USER),
-                      std::make_tuple(true, false, Env::IO_USER)),
-    DBRateLimiterOnWriteWALTest::GetTestNameSuffix);
-
-TEST_P(DBRateLimiterOnWriteWALTest, AutoWalFlush) {
-  Init();
-
-  const bool no_rate_limit_auto_wal_flush =
-      (rate_limiter_priority_ == Env::IO_TOTAL);
-  const bool valid_arg = (rate_limiter_priority_ == Env::IO_USER &&
-                          !disable_wal_ && !manual_wal_flush_);
-
-  std::int64_t prev_total_request =
-      options_.rate_limiter->GetTotalRequests(Env::IO_TOTAL);
-  ASSERT_EQ(0, options_.rate_limiter->GetTotalRequests(Env::IO_USER));
-
-  Status s = Put("foo", "v1", GetWriteOptions());
-
-  if (no_rate_limit_auto_wal_flush || valid_arg) {
-    EXPECT_TRUE(s.ok());
-  } else {
-    EXPECT_TRUE(s.IsInvalidArgument());
-    EXPECT_TRUE(s.ToString().find("WriteOptions::rate_limiter_priority") !=
-                std::string::npos);
-  }
-
-  std::int64_t actual_auto_wal_flush_request =
-      options_.rate_limiter->GetTotalRequests(Env::IO_TOTAL) -
-      prev_total_request;
-  std::int64_t expected_auto_wal_flush_request = valid_arg ? 1 : 0;
-
-  EXPECT_EQ(actual_auto_wal_flush_request, expected_auto_wal_flush_request);
-  EXPECT_EQ(actual_auto_wal_flush_request,
-            options_.rate_limiter->GetTotalRequests(Env::IO_USER));
-}
-}  // namespace ROCKSDB_NAMESPACE
-
-int main(int argc, char** argv) {
-  ROCKSDB_NAMESPACE::port::InstallStackTraceHandler();
-  ::testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
-}
@@ -1450,7 +1450,7 @@ TEST_F(DBTest, ApproximateSizesMemTable) {
  std::string end = Key(60);
  Range r(start, end);
  SizeApproximationOptions size_approx_options;
-  size_approx_options.include_memtables = true;
+  size_approx_options.include_memtabtles = true;
  size_approx_options.include_files = true;
  ASSERT_OK(
      db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1, &size));
@@ -1551,8 +1551,8 @@ TEST_F(DBTest, ApproximateSizesMemTable) {
  ASSERT_GT(size_with_mt, size_without_mt);
  ASSERT_GT(size_without_mt, 6000);

-  // Check that include_memtables flag works as expected
-  size_approx_options.include_memtables = false;
+  // Check that include_memtabtles flag works as expected
+  size_approx_options.include_memtabtles = false;
  ASSERT_OK(
      db_->GetApproximateSizes(size_approx_options, default_cf, &r, 1, &size));
  ASSERT_EQ(size, size_without_mt);
@@ -1614,7 +1614,7 @@ TEST_F(DBTest, ApproximateSizesFilesWithErrorMargin) {
    const Range r(start, end);

    SizeApproximationOptions size_approx_options;
-    size_approx_options.include_memtables = false;
+    size_approx_options.include_memtabtles = false;
    size_approx_options.include_files = true;
    size_approx_options.files_size_error_margin = -1.0;  // disabled

@@ -2862,11 +2862,6 @@ class ModelDB : public DB {
    }
    return Write(o, &batch);
  }
-  Status Put(const WriteOptions& /*o*/, ColumnFamilyHandle* /*cf*/,
-             const Slice& /*k*/, const Slice& /*ts*/,
-             const Slice& /*v*/) override {
-    return Status::NotSupported();
-  }
  using DB::Close;
  Status Close() override { return Status::OK(); }
  using DB::Delete;
@@ -2879,10 +2874,6 @@ class ModelDB : public DB {
    }
    return Write(o, &batch);
  }
-  Status Delete(const WriteOptions& /*o*/, ColumnFamilyHandle* /*cf*/,
-                const Slice& /*key*/, const Slice& /*ts*/) override {
-    return Status::NotSupported();
-  }
  using DB::SingleDelete;
  Status SingleDelete(const WriteOptions& o, ColumnFamilyHandle* cf,
                      const Slice& key) override {
@@ -2893,10 +2884,6 @@ class ModelDB : public DB {
    }
    return Write(o, &batch);
  }
-  Status SingleDelete(const WriteOptions& /*o*/, ColumnFamilyHandle* /*cf*/,
-                      const Slice& /*key*/, const Slice& /*ts*/) override {
-    return Status::NotSupported();
-  }
  using DB::Merge;
  Status Merge(const WriteOptions& o, ColumnFamilyHandle* cf, const Slice& k,
               const Slice& v) override {
@@ -3212,6 +3199,10 @@ class ModelDB : public DB {

  SequenceNumber GetLatestSequenceNumber() const override { return 0; }

+  bool SetPreserveDeletesSequenceNumber(SequenceNumber /*seqnum*/) override {
+    return true;
+  }
+
  Status IncreaseFullHistoryTsLow(ColumnFamilyHandle* /*cf*/,
                                  std::string /*ts_low*/) override {
    return Status::OK();
@@ -6539,10 +6530,6 @@ TEST_F(DBTest, SoftLimit) {
  ASSERT_OK(dbfull()->TEST_WaitForCompact());

  // Now there is one L1 file but doesn't trigger soft_rate_limit
-  //
-  // TODO: soft_rate_limit is depreciated. If this test
-  // relies on soft_rate_limit, then we need to change the test.
-  //
  // The L1 file size is around 30KB.
  ASSERT_EQ(NumTableFilesAtLevel(1), 1);
  ASSERT_TRUE(!dbfull()->TEST_write_controler().NeedsDelay());
@@ -17,7 +17,6 @@
 #include "options/options_helper.h"
 #include "port/port.h"
 #include "port/stack_trace.h"
-#include "rocksdb/experimental.h"
 #include "rocksdb/iostats_context.h"
 #include "rocksdb/persistent_cache.h"
 #include "rocksdb/trace_record.h"
@@ -410,9 +409,6 @@ TEST_P(DBTestSharedWriteBufferAcrossCFs, SharedWriteBufferAcrossCFs) {
    ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable(handles_[1]));
    ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable(handles_[2]));
    ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable(handles_[3]));
-    // Ensure background work is fully finished including listener callbacks
-    // before accessing listener state.
-    ASSERT_OK(dbfull()->TEST_WaitForBackgroundWork());
  };

  // Create some data and flush "default" and "nikitich" so that they
@@ -591,11 +587,6 @@ TEST_F(DBTest2, SharedWriteBufferLimitAcrossDB) {
    ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable(handles_[1]));
    ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable(handles_[2]));
    ASSERT_OK(static_cast<DBImpl*>(db2)->TEST_WaitForFlushMemTable());
-    // Ensure background work is fully finished including listener callbacks
-    // before accessing listener state.
-    ASSERT_OK(dbfull()->TEST_WaitForBackgroundWork());
-    ASSERT_OK(
-        static_cast_with_check<DBImpl>(db2)->TEST_WaitForBackgroundWork());
  };

  // Trigger a flush on cf2
@@ -3946,74 +3937,69 @@ TEST_F(DBTest2, RateLimitedCompactionReads) {
  const int kBytesPerKey = 1024;
  const int kNumL0Files = 4;

-  for (int compaction_readahead_size : {0, 32 << 10}) {
-    for (auto use_direct_io : {false, true}) {
-      if (use_direct_io && !IsDirectIOSupported()) {
-        continue;
-      }
-      Options options = CurrentOptions();
-      options.compaction_readahead_size = compaction_readahead_size;
-      options.compression = kNoCompression;
-      options.level0_file_num_compaction_trigger = kNumL0Files;
-      options.memtable_factory.reset(
-          test::NewSpecialSkipListFactory(kNumKeysPerFile));
-      // takes roughly one second, split into 100 x 10ms intervals. Each
-      // interval permits 5.12KB, which is smaller than the block size, so this
-      // test exercises the code for chunking reads.
-      options.rate_limiter.reset(NewGenericRateLimiter(
-          static_cast<int64_t>(kNumL0Files * kNumKeysPerFile *
-                               kBytesPerKey) /* rate_bytes_per_sec */,
-          10 * 1000 /* refill_period_us */, 10 /* fairness */,
-          RateLimiter::Mode::kReadsOnly));
-      options.use_direct_reads =
-          options.use_direct_io_for_flush_and_compaction = use_direct_io;
-      BlockBasedTableOptions bbto;
-      bbto.block_size = 16384;
-      bbto.no_block_cache = true;
-      options.table_factory.reset(NewBlockBasedTableFactory(bbto));
-      DestroyAndReopen(options);
-
-      for (int i = 0; i < kNumL0Files; ++i) {
-        for (int j = 0; j <= kNumKeysPerFile; ++j) {
-          ASSERT_OK(Put(Key(j), DummyString(kBytesPerKey)));
-        }
-        ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
-        if (i + 1 < kNumL0Files) {
-          ASSERT_EQ(i + 1, NumTableFilesAtLevel(0));
-        }
-      }
-      ASSERT_OK(dbfull()->TEST_WaitForCompact());
-      ASSERT_EQ(0, NumTableFilesAtLevel(0));
-
-      // should be slightly above 512KB due to non-data blocks read. Arbitrarily
-      // chose 1MB as the upper bound on the total bytes read.
-      size_t rate_limited_bytes =
-          options.rate_limiter->GetTotalBytesThrough(Env::IO_TOTAL);
-      // There must be no charges at non-`IO_LOW` priorities.
-      ASSERT_EQ(rate_limited_bytes,
-                static_cast<size_t>(
-                    options.rate_limiter->GetTotalBytesThrough(Env::IO_LOW)));
-      // Include the explicit prefetch of the footer in direct I/O case.
-      size_t direct_io_extra = use_direct_io ? 512 * 1024 : 0;
-      ASSERT_GE(
-          rate_limited_bytes,
-          static_cast<size_t>(kNumKeysPerFile * kBytesPerKey * kNumL0Files));
-      ASSERT_LT(
-          rate_limited_bytes,
-          static_cast<size_t>(2 * kNumKeysPerFile * kBytesPerKey * kNumL0Files +
-                              direct_io_extra));
-
-      Iterator* iter = db_->NewIterator(ReadOptions());
-      ASSERT_OK(iter->status());
-      for (iter->SeekToFirst(); iter->Valid(); iter->Next()) {
-        ASSERT_EQ(iter->value().ToString(), DummyString(kBytesPerKey));
-      }
-      delete iter;
-      // bytes read for user iterator shouldn't count against the rate limit.
-      ASSERT_EQ(rate_limited_bytes,
-                static_cast<size_t>(
-                    options.rate_limiter->GetTotalBytesThrough(Env::IO_LOW)));
+  for (auto use_direct_io : {false, true}) {
+    if (use_direct_io && !IsDirectIOSupported()) {
+      continue;
    }
+    Options options = CurrentOptions();
+    options.compression = kNoCompression;
+    options.level0_file_num_compaction_trigger = kNumL0Files;
+    options.memtable_factory.reset(
+        test::NewSpecialSkipListFactory(kNumKeysPerFile));
+    options.new_table_reader_for_compaction_inputs = true;
+    // takes roughly one second, split into 100 x 10ms intervals. Each interval
+    // permits 5.12KB, which is smaller than the block size, so this test
+    // exercises the code for chunking reads.
+    options.rate_limiter.reset(NewGenericRateLimiter(
+        static_cast<int64_t>(kNumL0Files * kNumKeysPerFile *
+                             kBytesPerKey) /* rate_bytes_per_sec */,
+        10 * 1000 /* refill_period_us */, 10 /* fairness */,
+        RateLimiter::Mode::kReadsOnly));
+    options.use_direct_reads = options.use_direct_io_for_flush_and_compaction =
+        use_direct_io;
+    BlockBasedTableOptions bbto;
+    bbto.block_size = 16384;
+    bbto.no_block_cache = true;
+    options.table_factory.reset(NewBlockBasedTableFactory(bbto));
+    DestroyAndReopen(options);
+
+    for (int i = 0; i < kNumL0Files; ++i) {
+      for (int j = 0; j <= kNumKeysPerFile; ++j) {
+        ASSERT_OK(Put(Key(j), DummyString(kBytesPerKey)));
+      }
+      ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable());
+      if (i + 1 < kNumL0Files) {
+        ASSERT_EQ(i + 1, NumTableFilesAtLevel(0));
+      }
+    }
+    ASSERT_OK(dbfull()->TEST_WaitForCompact());
+    ASSERT_EQ(0, NumTableFilesAtLevel(0));
+
+    ASSERT_EQ(0, options.rate_limiter->GetTotalBytesThrough(Env::IO_HIGH));
+    // should be slightly above 512KB due to non-data blocks read. Arbitrarily
+    // chose 1MB as the upper bound on the total bytes read.
+    size_t rate_limited_bytes =
+        options.rate_limiter->GetTotalBytesThrough(Env::IO_LOW);
+    // Include the explicit prefetch of the footer in direct I/O case.
+    size_t direct_io_extra = use_direct_io ? 512 * 1024 : 0;
+    ASSERT_GE(
+        rate_limited_bytes,
+        static_cast<size_t>(kNumKeysPerFile * kBytesPerKey * kNumL0Files));
+    ASSERT_LT(
+        rate_limited_bytes,
+        static_cast<size_t>(2 * kNumKeysPerFile * kBytesPerKey * kNumL0Files +
+                            direct_io_extra));
+
+    Iterator* iter = db_->NewIterator(ReadOptions());
+    ASSERT_OK(iter->status());
+    for (iter->SeekToFirst(); iter->Valid(); iter->Next()) {
+      ASSERT_EQ(iter->value().ToString(), DummyString(kBytesPerKey));
+    }
+    delete iter;
+    // bytes read for user iterator shouldn't count against the rate limit.
+    ASSERT_EQ(rate_limited_bytes,
+              static_cast<size_t>(
+                  options.rate_limiter->GetTotalBytesThrough(Env::IO_LOW)));
  }
 }
 #endif  // ROCKSDB_LITE
@@ -6509,66 +6495,10 @@ TEST_P(RenameCurrentTest, Compaction) {
 }

 TEST_F(DBTest2, BottommostTemperature) {
-  class TestListener : public EventListener {
-   public:
-    void OnFileReadFinish(const FileOperationInfo& info) override {
-      UpdateFileTemperature(info);
-    }
-
-    void OnFileWriteFinish(const FileOperationInfo& info) override {
-      UpdateFileTemperature(info);
-    }
-
-    void OnFileFlushFinish(const FileOperationInfo& info) override {
-      UpdateFileTemperature(info);
-    }
-
-    void OnFileSyncFinish(const FileOperationInfo& info) override {
-      UpdateFileTemperature(info);
-    }
-
-    void OnFileCloseFinish(const FileOperationInfo& info) override {
-      UpdateFileTemperature(info);
-    }
-
-    bool ShouldBeNotifiedOnFileIO() override { return true; }
-
-    std::unordered_map<uint64_t, Temperature> file_temperatures;
-
-   private:
-    void UpdateFileTemperature(const FileOperationInfo& info) {
-      auto filename = GetFileName(info.path);
-      uint64_t number;
-      FileType type;
-      ASSERT_TRUE(ParseFileName(filename, &number, &type));
-      if (type == kTableFile) {
-        MutexLock l(&mutex_);
-        auto ret = file_temperatures.insert({number, info.temperature});
-        if (!ret.second) {
-          // the same file temperature should always be the same for all events
-          ASSERT_TRUE(ret.first->second == info.temperature);
-        }
-      }
-    }
-
-    std::string GetFileName(const std::string& fname) {
-      auto filename = fname.substr(fname.find_last_of(kFilePathSeparator) + 1);
-      // workaround only for Windows that the file path could contain both
-      // Windows FilePathSeparator and '/'
-      filename = filename.substr(filename.find_last_of('/') + 1);
-      return filename;
-    }
-
-    port::Mutex mutex_;
-  };
-
-  auto* listener = new TestListener();
-
  Options options = CurrentOptions();
  options.bottommost_temperature = Temperature::kWarm;
  options.level0_file_num_compaction_trigger = 2;
  options.statistics = CreateDBStatistics();
-  options.listeners.emplace_back(listener);
  Reopen(options);

  auto size = GetSstSizeHelper(Temperature::kUnknown);
@@ -6592,13 +6522,7 @@ TEST_F(DBTest2, BottommostTemperature) {
  ColumnFamilyMetaData metadata;
  db_->GetColumnFamilyMetaData(&metadata);
  ASSERT_EQ(1, metadata.file_count);
-  SstFileMetaData meta = metadata.levels[1].files[0];
-  ASSERT_EQ(Temperature::kWarm, meta.temperature);
-  uint64_t number;
-  FileType type;
-  ASSERT_TRUE(ParseFileName(meta.name, &number, &type));
-  ASSERT_EQ(listener->file_temperatures.at(number), meta.temperature);
-
+  ASSERT_EQ(Temperature::kWarm, metadata.levels[1].files[0].temperature);
  size = GetSstSizeHelper(Temperature::kUnknown);
  ASSERT_EQ(size, 0);
  size = GetSstSizeHelper(Temperature::kWarm);
@@ -6645,16 +6569,7 @@ TEST_F(DBTest2, BottommostTemperature) {

  db_->GetColumnFamilyMetaData(&metadata);
  ASSERT_EQ(2, metadata.file_count);
-  meta = metadata.levels[0].files[0];
-  ASSERT_EQ(Temperature::kUnknown, meta.temperature);
-  ASSERT_TRUE(ParseFileName(meta.name, &number, &type));
-  ASSERT_EQ(listener->file_temperatures.at(number), meta.temperature);
-
-  meta = metadata.levels[1].files[0];
-  ASSERT_EQ(Temperature::kWarm, meta.temperature);
-  ASSERT_TRUE(ParseFileName(meta.name, &number, &type));
-  ASSERT_EQ(listener->file_temperatures.at(number), meta.temperature);
-
+  ASSERT_EQ(Temperature::kUnknown, metadata.levels[0].files[0].temperature);
  size = GetSstSizeHelper(Temperature::kUnknown);
  ASSERT_GT(size, 0);
  size = GetSstSizeHelper(Temperature::kWarm);
@@ -6664,15 +6579,8 @@ TEST_F(DBTest2, BottommostTemperature) {
  Reopen(options);
  db_->GetColumnFamilyMetaData(&metadata);
  ASSERT_EQ(2, metadata.file_count);
-  meta = metadata.levels[0].files[0];
-  ASSERT_EQ(Temperature::kUnknown, meta.temperature);
-  ASSERT_TRUE(ParseFileName(meta.name, &number, &type));
-  ASSERT_EQ(listener->file_temperatures.at(number), meta.temperature);
-
-  meta = metadata.levels[1].files[0];
-  ASSERT_EQ(Temperature::kWarm, meta.temperature);
-  ASSERT_TRUE(ParseFileName(meta.name, &number, &type));
-  ASSERT_EQ(listener->file_temperatures.at(number), meta.temperature);
+  ASSERT_EQ(Temperature::kUnknown, metadata.levels[0].files[0].temperature);
+  ASSERT_EQ(Temperature::kWarm, metadata.levels[1].files[0].temperature);
  size = GetSstSizeHelper(Temperature::kUnknown);
  ASSERT_GT(size, 0);
  size = GetSstSizeHelper(Temperature::kWarm);
@@ -6692,15 +6600,8 @@ TEST_F(DBTest2, BottommostTemperature) {
  Reopen(options);
  db_->GetColumnFamilyMetaData(&metadata);
  ASSERT_EQ(2, metadata.file_count);
-  meta = metadata.levels[0].files[0];
-  ASSERT_EQ(Temperature::kUnknown, meta.temperature);
-  ASSERT_TRUE(ParseFileName(meta.name, &number, &type));
-  ASSERT_EQ(listener->file_temperatures.at(number), meta.temperature);
-
-  meta = metadata.levels[1].files[0];
-  ASSERT_EQ(Temperature::kWarm, meta.temperature);
-  ASSERT_TRUE(ParseFileName(meta.name, &number, &type));
-  ASSERT_EQ(listener->file_temperatures.at(number), meta.temperature);
+  ASSERT_EQ(Temperature::kUnknown, metadata.levels[0].files[0].temperature);
+  ASSERT_EQ(Temperature::kWarm, metadata.levels[1].files[0].temperature);
 }

 TEST_F(DBTest2, BottommostTemperatureUniversal) {
@@ -6827,251 +6728,6 @@ TEST_F(DBTest2, BottommostTemperatureUniversal) {
      DB::Properties::kLiveSstFilesSizeAtTemperature + std::to_string(22),
      &prop));
  ASSERT_EQ(std::atoi(prop.c_str()), 0);
-
-  // Update bottommost temperature dynamically with SetOptions
-  auto s = db_->SetOptions({{"bottommost_temperature", "kCold"}});
-  ASSERT_OK(s);
-  ASSERT_EQ(db_->GetOptions().bottommost_temperature, Temperature::kCold);
-  db_->GetColumnFamilyMetaData(&metadata);
-  // Should not impact the existing files
-  ASSERT_EQ(Temperature::kWarm,
-            metadata.levels[kBottommostLevel].files[0].temperature);
-  size = GetSstSizeHelper(Temperature::kUnknown);
-  ASSERT_GT(size, 0);
-  size = GetSstSizeHelper(Temperature::kWarm);
-  ASSERT_GT(size, 0);
-  size = GetSstSizeHelper(Temperature::kCold);
-  ASSERT_EQ(size, 0);
-
-  // new generated files should have the new settings
-  ASSERT_OK(db_->CompactRange(CompactRangeOptions(), nullptr, nullptr));
-  db_->GetColumnFamilyMetaData(&metadata);
-  ASSERT_EQ(1, metadata.file_count);
-  ASSERT_EQ(Temperature::kCold,
-            metadata.levels[kBottommostLevel].files[0].temperature);
-  size = GetSstSizeHelper(Temperature::kUnknown);
-  ASSERT_EQ(size, 0);
-  size = GetSstSizeHelper(Temperature::kWarm);
-  ASSERT_EQ(size, 0);
-  size = GetSstSizeHelper(Temperature::kCold);
-  ASSERT_GT(size, 0);
-}
-
-TEST_F(DBTest2, LastLevelStatistics) {
-  Options options = CurrentOptions();
-  options.bottommost_temperature = Temperature::kWarm;
-  options.level0_file_num_compaction_trigger = 2;
-  options.level_compaction_dynamic_level_bytes = true;
-  options.statistics = CreateDBStatistics();
-  Reopen(options);
-
-  // generate 1 sst on level 0
-  ASSERT_OK(Put("foo", "bar"));
-  ASSERT_OK(Put("bar", "bar"));
-  ASSERT_OK(Flush());
-  ASSERT_EQ("bar", Get("bar"));
-
-  ASSERT_GT(options.statistics->getTickerCount(NON_LAST_LEVEL_READ_BYTES), 0);
-  ASSERT_GT(options.statistics->getTickerCount(NON_LAST_LEVEL_READ_COUNT), 0);
-  ASSERT_EQ(options.statistics->getTickerCount(LAST_LEVEL_READ_BYTES), 0);
-  ASSERT_EQ(options.statistics->getTickerCount(LAST_LEVEL_READ_COUNT), 0);
-
-  // 2nd flush to trigger compaction
-  ASSERT_OK(Put("foo", "bar"));
-  ASSERT_OK(Put("bar", "bar"));
-  ASSERT_OK(Flush());
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
-  ASSERT_EQ("bar", Get("bar"));
-
-  ASSERT_EQ(options.statistics->getTickerCount(LAST_LEVEL_READ_BYTES),
-            options.statistics->getTickerCount(WARM_FILE_READ_BYTES));
-  ASSERT_EQ(options.statistics->getTickerCount(LAST_LEVEL_READ_COUNT),
-            options.statistics->getTickerCount(WARM_FILE_READ_COUNT));
-
-  auto pre_bytes =
-      options.statistics->getTickerCount(NON_LAST_LEVEL_READ_BYTES);
-  auto pre_count =
-      options.statistics->getTickerCount(NON_LAST_LEVEL_READ_COUNT);
-
-  // 3rd flush to generate 1 sst on level 0
-  ASSERT_OK(Put("foo", "bar"));
-  ASSERT_OK(Put("bar", "bar"));
-  ASSERT_OK(Flush());
-  ASSERT_EQ("bar", Get("bar"));
-
-  ASSERT_GT(options.statistics->getTickerCount(NON_LAST_LEVEL_READ_BYTES),
-            pre_bytes);
-  ASSERT_GT(options.statistics->getTickerCount(NON_LAST_LEVEL_READ_COUNT),
-            pre_count);
-  ASSERT_EQ(options.statistics->getTickerCount(LAST_LEVEL_READ_BYTES),
-            options.statistics->getTickerCount(WARM_FILE_READ_BYTES));
-  ASSERT_EQ(options.statistics->getTickerCount(LAST_LEVEL_READ_COUNT),
-            options.statistics->getTickerCount(WARM_FILE_READ_COUNT));
-}
-
-TEST_F(DBTest2, CheckpointFileTemperature) {
-  class NoLinkTestFS : public FileTemperatureTestFS {
-    using FileTemperatureTestFS::FileTemperatureTestFS;
-
-    IOStatus LinkFile(const std::string&, const std::string&, const IOOptions&,
-                      IODebugContext*) override {
-      // return not supported to force checkpoint copy the file instead of just
-      // link
-      return IOStatus::NotSupported();
-    }
-  };
-  auto test_fs = std::make_shared<NoLinkTestFS>(env_->GetFileSystem());
-  std::unique_ptr<Env> env(new CompositeEnvWrapper(env_, test_fs));
-  Options options = CurrentOptions();
-  options.bottommost_temperature = Temperature::kWarm;
-  options.level0_file_num_compaction_trigger = 2;
-  options.env = env.get();
-  Reopen(options);
-
-  // generate a bottommost file and a non-bottommost file
-  ASSERT_OK(Put("foo", "bar"));
-  ASSERT_OK(Put("bar", "bar"));
-  ASSERT_OK(Flush());
-  ASSERT_OK(Put("foo", "bar"));
-  ASSERT_OK(Put("bar", "bar"));
-  ASSERT_OK(Flush());
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
-  ASSERT_OK(Put("foo", "bar"));
-  ASSERT_OK(Put("bar", "bar"));
-  ASSERT_OK(Flush());
-  auto size = GetSstSizeHelper(Temperature::kWarm);
-  ASSERT_GT(size, 0);
-
-  std::map<uint64_t, Temperature> temperatures;
-  std::vector<LiveFileStorageInfo> infos;
-  ASSERT_OK(
-      dbfull()->GetLiveFilesStorageInfo(LiveFilesStorageInfoOptions(), &infos));
-  for (auto info : infos) {
-    temperatures.emplace(info.file_number, info.temperature);
-  }
-
-  test_fs->PopRequestedSstFileTemperatures();
-  Checkpoint* checkpoint;
-  ASSERT_OK(Checkpoint::Create(db_, &checkpoint));
-  ASSERT_OK(
-      checkpoint->CreateCheckpoint(dbname_ + kFilePathSeparator + "tempcp"));
-
-  // checking src file src_temperature hints: 2 sst files: 1 sst is kWarm,
-  // another is kUnknown
-  std::vector<std::pair<uint64_t, Temperature>> requested_temps;
-  test_fs->PopRequestedSstFileTemperatures(&requested_temps);
-  // Two requests
-  ASSERT_EQ(requested_temps.size(), 2);
-  std::set<uint64_t> distinct_requests;
-  for (const auto& requested_temp : requested_temps) {
-    // Matching manifest temperatures
-    ASSERT_EQ(temperatures.at(requested_temp.first), requested_temp.second);
-    distinct_requests.insert(requested_temp.first);
-  }
-  // Each request to distinct file
-  ASSERT_EQ(distinct_requests.size(), requested_temps.size());
-
-  delete checkpoint;
-  Close();
-}
-
-TEST_F(DBTest2, FileTemperatureManifestFixup) {
-  auto test_fs = std::make_shared<FileTemperatureTestFS>(env_->GetFileSystem());
-  std::unique_ptr<Env> env(new CompositeEnvWrapper(env_, test_fs));
-  Options options = CurrentOptions();
-  options.bottommost_temperature = Temperature::kWarm;
-  options.level0_file_num_compaction_trigger = 2;
-  options.env = env.get();
-  std::vector<std::string> cfs = {/*"default",*/ "test1", "test2"};
-  CreateAndReopenWithCF(cfs, options);
-  // Needed for later re-opens (weird)
-  cfs.insert(cfs.begin(), kDefaultColumnFamilyName);
-
-  // Generate a bottommost file in all CFs
-  for (int cf = 0; cf < 3; ++cf) {
-    ASSERT_OK(Put(cf, "a", "val"));
-    ASSERT_OK(Put(cf, "c", "val"));
-    ASSERT_OK(Flush(cf));
-    ASSERT_OK(Put(cf, "b", "val"));
-    ASSERT_OK(Put(cf, "d", "val"));
-    ASSERT_OK(Flush(cf));
-  }
-  ASSERT_OK(dbfull()->TEST_WaitForCompact());
-
-  // verify
-  ASSERT_GT(GetSstSizeHelper(Temperature::kWarm), 0);
-  ASSERT_EQ(GetSstSizeHelper(Temperature::kUnknown), 0);
-  ASSERT_EQ(GetSstSizeHelper(Temperature::kCold), 0);
-  ASSERT_EQ(GetSstSizeHelper(Temperature::kHot), 0);
-
-  // Generate a non-bottommost file in all CFs
-  for (int cf = 0; cf < 3; ++cf) {
-    ASSERT_OK(Put(cf, "e", "val"));
-    ASSERT_OK(Flush(cf));
-  }
-
-  // re-verify
-  ASSERT_GT(GetSstSizeHelper(Temperature::kWarm), 0);
-  // Not supported: ASSERT_GT(GetSstSizeHelper(Temperature::kUnknown), 0);
-  ASSERT_EQ(GetSstSizeHelper(Temperature::kCold), 0);
-  ASSERT_EQ(GetSstSizeHelper(Temperature::kHot), 0);
-
-  // Now change FS temperature on bottommost file(s) to kCold
-  std::map<uint64_t, Temperature> current_temps;
-  test_fs->CopyCurrentSstFileTemperatures(&current_temps);
-  for (auto e : current_temps) {
-    if (e.second == Temperature::kWarm) {
-      test_fs->OverrideSstFileTemperature(e.first, Temperature::kCold);
-    }
-  }
-  // Metadata not yet updated
-  ASSERT_EQ(Get("a"), "val");
-  ASSERT_EQ(GetSstSizeHelper(Temperature::kCold), 0);
-
-  // Update with Close and UpdateManifestForFilesState, but first save cf
-  // descriptors
-  std::vector<ColumnFamilyDescriptor> column_families;
-  for (size_t i = 0; i < handles_.size(); ++i) {
-    ColumnFamilyDescriptor cfdescriptor;
-    // GetDescriptor is not implemented for ROCKSDB_LITE
-    handles_[i]->GetDescriptor(&cfdescriptor).PermitUncheckedError();
-    column_families.push_back(cfdescriptor);
-  }
-  Close();
-  experimental::UpdateManifestForFilesStateOptions update_opts;
-  update_opts.update_temperatures = true;
-
-  ASSERT_OK(experimental::UpdateManifestForFilesState(
-      options, dbname_, column_families, update_opts));
-
-  // Re-open and re-verify after update
-  ReopenWithColumnFamilies(cfs, options);
-  ASSERT_GT(GetSstSizeHelper(Temperature::kCold), 0);
-  // Not supported: ASSERT_GT(GetSstSizeHelper(Temperature::kUnknown), 0);
-  ASSERT_EQ(GetSstSizeHelper(Temperature::kWarm), 0);
-  ASSERT_EQ(GetSstSizeHelper(Temperature::kHot), 0);
-
-  // Change kUnknown to kHot
-  test_fs->CopyCurrentSstFileTemperatures(&current_temps);
-  for (auto e : current_temps) {
-    if (e.second == Temperature::kUnknown) {
-      test_fs->OverrideSstFileTemperature(e.first, Temperature::kHot);
-    }
-  }
-
-  // Update with Close and UpdateManifestForFilesState
-  Close();
-  ASSERT_OK(experimental::UpdateManifestForFilesState(
-      options, dbname_, column_families, update_opts));
-
-  // Re-open and re-verify after update
-  ReopenWithColumnFamilies(cfs, options);
-  ASSERT_GT(GetSstSizeHelper(Temperature::kCold), 0);
-  ASSERT_EQ(GetSstSizeHelper(Temperature::kUnknown), 0);
-  ASSERT_EQ(GetSstSizeHelper(Temperature::kWarm), 0);
-  ASSERT_GT(GetSstSizeHelper(Temperature::kHot), 0);
-
-  Close();
 }
 #endif  // ROCKSDB_LITE

@@ -7153,7 +6809,7 @@ TEST_F(DBTest2, GetLatestSeqAndTsForKey) {
  options.max_write_buffer_size_to_maintain = 64 << 10;
  options.create_if_missing = true;
  options.disable_auto_compactions = true;
-  options.comparator = test::BytewiseComparatorWithU64TsWrapper();
+  options.comparator = test::ComparatorWithU64Ts();
  options.statistics = CreateDBStatistics();

  Reopen(options);
@@ -7161,13 +6817,16 @@ TEST_F(DBTest2, GetLatestSeqAndTsForKey) {
  constexpr uint64_t kTsU64Value = 12;

  for (uint64_t key = 0; key < 100; ++key) {
-    std::string ts;
-    PutFixed64(&ts, kTsU64Value);
+    std::string ts_str;
+    PutFixed64(&ts_str, kTsU64Value);
+    Slice ts = ts_str;
+    WriteOptions write_opts;
+    write_opts.timestamp = &ts;

    std::string key_str;
    PutFixed64(&key_str, key);
    std::reverse(key_str.begin(), key_str.end());
-    ASSERT_OK(db_->Put(WriteOptions(), key_str, ts, "value"));
+    ASSERT_OK(Put(key_str, "value", write_opts));
  }

  ASSERT_OK(Flush());
@@ -426,6 +426,7 @@ Options DBTestBase::GetOptions(
      break;
    case kFullFilterWithNewTableReaderForCompactions:
      table_options.filter_policy.reset(NewBloomFilterPolicy(10, false));
+      options.new_table_reader_for_compaction_inputs = true;
      options.compaction_readahead_size = 10 * 1024 * 1024;
      break;
    case kPartitionedFilterWithNewTableReaderForCompactions:
@@ -433,6 +434,7 @@ Options DBTestBase::GetOptions(
      table_options.partition_filters = true;
      table_options.index_type =
          BlockBasedTableOptions::IndexType::kTwoLevelIndexSearch;
+      options.new_table_reader_for_compaction_inputs = true;
      options.compaction_readahead_size = 10 * 1024 * 1024;
      break;
    case kUncompressed:
@@ -454,6 +456,7 @@ Options DBTestBase::GetOptions(
      options.max_manifest_file_size = 50;  // 50 bytes
      break;
    case kPerfOptions:
+      options.soft_rate_limit = 2.0;
      options.delayed_write_rate = 8 * 1024 * 1024;
      options.report_bg_io_stats = true;
      // TODO(3.13) -- test more options
@@ -784,6 +787,10 @@ Status DBTestBase::SingleDelete(int cf, const std::string& k) {
  return db_->SingleDelete(WriteOptions(), handles_[cf], k);
 }

+bool DBTestBase::SetPreserveDeletesSequenceNumber(SequenceNumber sn) {
+  return db_->SetPreserveDeletesSequenceNumber(sn);
+}
+
 std::string DBTestBase::Get(const std::string& k, const Snapshot* snapshot) {
  ReadOptions options;
  options.verify_checksums = true;
@@ -1143,8 +1150,7 @@ std::vector<uint64_t> DBTestBase::GetBlobFileNumbers() {
  result.reserve(blob_files.size());

  for (const auto& blob_file : blob_files) {
-    assert(blob_file);
-    result.emplace_back(blob_file->GetBlobFileNumber());
+    result.emplace_back(blob_file.first);
  }

  return result;
@@ -14,7 +14,6 @@
 #include <algorithm>
 #include <cinttypes>
 #include <map>
-#include <memory>
 #include <set>
 #include <string>
 #include <thread>
@@ -24,15 +23,12 @@

 #include "db/db_impl/db_impl.h"
 #include "file/filename.h"
-#include "rocksdb/advanced_options.h"
 #include "rocksdb/cache.h"
 #include "rocksdb/compaction_filter.h"
 #include "rocksdb/convenience.h"
 #include "rocksdb/db.h"
 #include "rocksdb/env.h"
-#include "rocksdb/file_system.h"
 #include "rocksdb/filter_policy.h"
-#include "rocksdb/io_status.h"
 #include "rocksdb/options.h"
 #include "rocksdb/slice.h"
 #include "rocksdb/sst_file_writer.h"
@@ -691,121 +687,6 @@ class SpecialEnv : public EnvWrapper {
 };

 #ifndef ROCKSDB_LITE
-class FileTemperatureTestFS : public FileSystemWrapper {
- public:
-  explicit FileTemperatureTestFS(const std::shared_ptr<FileSystem>& fs)
-      : FileSystemWrapper(fs) {}
-
-  static const char* kClassName() { return "FileTemperatureTestFS"; }
-  const char* Name() const override { return kClassName(); }
-
-  IOStatus NewSequentialFile(const std::string& fname, const FileOptions& opts,
-                             std::unique_ptr<FSSequentialFile>* result,
-                             IODebugContext* dbg) override {
-    IOStatus s = target()->NewSequentialFile(fname, opts, result, dbg);
-    uint64_t number;
-    FileType type;
-    if (ParseFileName(GetFileName(fname), &number, &type) &&
-        type == kTableFile) {
-      MutexLock lock(&mu_);
-      requested_sst_file_temperatures_.emplace_back(number, opts.temperature);
-      if (s.ok()) {
-        *result = WrapWithTemperature<FSSequentialFileOwnerWrapper>(
-            number, std::move(*result));
-      }
-    }
-    return s;
-  }
-
-  IOStatus NewRandomAccessFile(const std::string& fname,
-                               const FileOptions& opts,
-                               std::unique_ptr<FSRandomAccessFile>* result,
-                               IODebugContext* dbg) override {
-    IOStatus s = target()->NewRandomAccessFile(fname, opts, result, dbg);
-    uint64_t number;
-    FileType type;
-    if (ParseFileName(GetFileName(fname), &number, &type) &&
-        type == kTableFile) {
-      MutexLock lock(&mu_);
-      requested_sst_file_temperatures_.emplace_back(number, opts.temperature);
-      if (s.ok()) {
-        *result = WrapWithTemperature<FSRandomAccessFileOwnerWrapper>(
-            number, std::move(*result));
-      }
-    }
-    return s;
-  }
-
-  void PopRequestedSstFileTemperatures(
-      std::vector<std::pair<uint64_t, Temperature>>* out = nullptr) {
-    MutexLock lock(&mu_);
-    if (out) {
-      *out = std::move(requested_sst_file_temperatures_);
-      assert(requested_sst_file_temperatures_.empty());
-    } else {
-      requested_sst_file_temperatures_.clear();
-    }
-  }
-
-  IOStatus NewWritableFile(const std::string& fname, const FileOptions& opts,
-                           std::unique_ptr<FSWritableFile>* result,
-                           IODebugContext* dbg) override {
-    uint64_t number;
-    FileType type;
-    if (ParseFileName(GetFileName(fname), &number, &type) &&
-        type == kTableFile) {
-      MutexLock lock(&mu_);
-      current_sst_file_temperatures_[number] = opts.temperature;
-    }
-    return target()->NewWritableFile(fname, opts, result, dbg);
-  }
-
-  void CopyCurrentSstFileTemperatures(std::map<uint64_t, Temperature>* out) {
-    MutexLock lock(&mu_);
-    *out = current_sst_file_temperatures_;
-  }
-
-  void OverrideSstFileTemperature(uint64_t number, Temperature temp) {
-    MutexLock lock(&mu_);
-    current_sst_file_temperatures_[number] = temp;
-  }
-
- protected:
-  port::Mutex mu_;
-  std::vector<std::pair<uint64_t, Temperature>>
-      requested_sst_file_temperatures_;
-  std::map<uint64_t, Temperature> current_sst_file_temperatures_;
-
-  std::string GetFileName(const std::string& fname) {
-    auto filename = fname.substr(fname.find_last_of(kFilePathSeparator) + 1);
-    // workaround only for Windows that the file path could contain both Windows
-    // FilePathSeparator and '/'
-    filename = filename.substr(filename.find_last_of('/') + 1);
-    return filename;
-  }
-
-  template <class FileOwnerWrapperT, /*inferred*/ class FileT>
-  std::unique_ptr<FileT> WrapWithTemperature(uint64_t number,
-                                             std::unique_ptr<FileT>&& t) {
-    class FileWithTemp : public FileOwnerWrapperT {
-     public:
-      FileWithTemp(FileTemperatureTestFS* fs, uint64_t number,
-                   std::unique_ptr<FileT>&& t)
-          : FileOwnerWrapperT(std::move(t)), fs_(fs), number_(number) {}
-
-      Temperature GetTemperature() const override {
-        MutexLock lock(&fs_->mu_);
-        return fs_->current_sst_file_temperatures_[number_];
-      }
-
-     private:
-      FileTemperatureTestFS* fs_;
-      uint64_t number_;
-    };
-    return std::make_unique<FileWithTemp>(this, number, std::move(t));
-  }
-};
-
 class OnFileDeletionListener : public EventListener {
 public:
  OnFileDeletionListener() : matched_count_(0), expected_file_name_("") {}
@@ -1141,6 +1022,8 @@ class DBTestBase : public testing::Test {

  Status SingleDelete(int cf, const std::string& k);

+  bool SetPreserveDeletesSequenceNumber(SequenceNumber sn);
+
  std::string Get(const std::string& k, const Snapshot* snapshot = nullptr);

  std::string Get(int cf, const std::string& k,
@@ -433,7 +433,7 @@ TEST_F(DBWALTest, RecoverWithBlob) {
  const auto& blob_files = storage_info->GetBlobFiles();
  ASSERT_EQ(blob_files.size(), 1);

-  const auto& blob_file = blob_files.front();
+  const auto& blob_file = blob_files.begin()->second;
  ASSERT_NE(blob_file, nullptr);

  ASSERT_EQ(table_file->smallest.user_key(), "key1");
@@ -1280,12 +1280,9 @@ class RecoveryTestHelper {
      ASSERT_OK(WritableFileWriter::Create(db_options.env->GetFileSystem(),
                                           fname, file_options, &file_writer,
                                           nullptr));
-      log::Writer* log_writer =
+      current_log_writer.reset(
          new log::Writer(std::move(file_writer), current_log_number,
-                          db_options.recycle_log_file_num > 0, false,
-                          db_options.wal_compression);
-      ASSERT_OK(log_writer->AddCompressionTypeRecord());
-      current_log_writer.reset(log_writer);
+                          db_options.recycle_log_file_num > 0));

      WriteBatch batch;
      for (int i = 0; i < kKeysPerWALFile; i++) {
@@ -1354,9 +1351,9 @@ class RecoveryTestHelper {
  }
 };

-class DBWALTestWithParams : public DBWALTestBase,
-                            public ::testing::WithParamInterface<
-                                std::tuple<bool, int, int, CompressionType>> {
+class DBWALTestWithParams
+    : public DBWALTestBase,
+      public ::testing::WithParamInterface<std::tuple<bool, int, int>> {
 public:
  DBWALTestWithParams() : DBWALTestBase("/db_wal_test_with_params") {}
 };
@@ -1367,14 +1364,12 @@ INSTANTIATE_TEST_CASE_P(
                       ::testing::Range(RecoveryTestHelper::kWALFileOffset,
                                        RecoveryTestHelper::kWALFileOffset +
                                            RecoveryTestHelper::kWALFilesCount,
-                                        1),
-                       ::testing::Values(CompressionType::kNoCompression,
-                                         CompressionType::kZSTD)));
+                                        1)));

 class DBWALTestWithParamsVaryingRecoveryMode
    : public DBWALTestBase,
      public ::testing::WithParamInterface<
-          std::tuple<bool, int, int, WALRecoveryMode, CompressionType>> {
+          std::tuple<bool, int, int, WALRecoveryMode>> {
 public:
  DBWALTestWithParamsVaryingRecoveryMode()
      : DBWALTestBase("/db_wal_test_with_params_mode") {}
@@ -1391,9 +1386,7 @@ INSTANTIATE_TEST_CASE_P(
        ::testing::Values(WALRecoveryMode::kTolerateCorruptedTailRecords,
                          WALRecoveryMode::kAbsoluteConsistency,
                          WALRecoveryMode::kPointInTimeRecovery,
-                          WALRecoveryMode::kSkipAnyCorruptedRecords),
-        ::testing::Values(CompressionType::kNoCompression,
-                          CompressionType::kZSTD)));
+                          WALRecoveryMode::kSkipAnyCorruptedRecords)));

 // Test scope:
 // - We expect to open the data store when there is incomplete trailing writes
@@ -1439,9 +1432,6 @@ TEST_P(DBWALTestWithParams, kAbsoluteConsistency) {
  // Corruption offset position
  int corrupt_offset = std::get<1>(GetParam());
  int wal_file_id = std::get<2>(GetParam());  // WAL file
-  // WAL compression type
-  CompressionType compression_type = std::get<3>(GetParam());
-  options.wal_compression = compression_type;

  if (trunc && corrupt_offset == 0) {
    return;
@@ -1491,6 +1481,93 @@ TEST_F(DBWALTest, kPointInTimeRecoveryCFConsistency) {
  ASSERT_NOK(TryReopenWithColumnFamilies({"default", "one", "two"}, options));
 }

+TEST_F(DBWALTest, RaceInstallFlushResultsWithWalObsoletion) {
+  Options options = CurrentOptions();
+  options.env = env_;
+  options.track_and_verify_wals_in_manifest = true;
+  // The following make sure there are two bg flush threads.
+  options.max_background_jobs = 8;
+
+  const std::string cf1_name("cf1");
+  CreateAndReopenWithCF({cf1_name}, options);
+  assert(handles_.size() == 2);
+
+  {
+    dbfull()->TEST_LockMutex();
+    ASSERT_LE(2, dbfull()->GetBGJobLimits().max_flushes);
+    dbfull()->TEST_UnlockMutex();
+  }
+
+  ASSERT_OK(dbfull()->PauseBackgroundWork());
+
+  ASSERT_OK(db_->Put(WriteOptions(), handles_[1], "foo", "value"));
+  ASSERT_OK(db_->Put(WriteOptions(), "foo", "value"));
+
+  ASSERT_OK(dbfull()->TEST_FlushMemTable(false, true, handles_[1]));
+
+  ASSERT_OK(db_->Put(WriteOptions(), "foo", "value"));
+  ASSERT_OK(dbfull()->TEST_FlushMemTable(false, true, handles_[0]));
+
+  bool called = false;
+  SyncPoint::GetInstance()->DisableProcessing();
+  SyncPoint::GetInstance()->ClearAllCallBacks();
+  // This callback will be called when the first bg flush thread reaches the
+  // point before entering the MANIFEST write queue after flushing the SST
+  // file.
+  // The purpose of the sync points here is to ensure both bg flush threads
+  // finish computing `min_wal_number_to_keep` before any of them updates the
+  // `log_number` for the column family that's being flushed.
+  SyncPoint::GetInstance()->SetCallBack(
+      "MemTableList::TryInstallMemtableFlushResults:AfterComputeMinWalToKeep",
+      [&](void* /*arg*/) {
+        dbfull()->mutex()->AssertHeld();
+        if (!called) {
+          // We are the first bg flush thread in the MANIFEST write queue.
+          // We set up the dependency between sync points for two threads that
+          // will be executing the same code.
+          // For the interleaving of events, see
+          // https://github.com/facebook/rocksdb/pull/9715.
+          // bg flush thread1 will release the db mutex while in the MANIFEST
+          // write queue. In the meantime, bg flush thread2 locks db mutex and
+          // computes the min_wal_number_to_keep (before thread1 writes to
+          // MANIFEST thus before cf1->log_number is updated). Bg thread2 joins
+          // the MANIFEST write queue afterwards and bg flush thread1 proceeds
+          // with writing to MANIFEST.
+          called = true;
+          SyncPoint::GetInstance()->LoadDependency({
+              {"VersionSet::LogAndApply:WriteManifestStart",
+               "DBWALTest::RaceInstallFlushResultsWithWalObsoletion:BgFlush2"},
+              {"DBWALTest::RaceInstallFlushResultsWithWalObsoletion:BgFlush2",
+               "VersionSet::LogAndApply:WriteManifest"},
+          });
+        } else {
+          // The other bg flush thread has already been in the MANIFEST write
+          // queue, and we are after.
+          TEST_SYNC_POINT(
+              "DBWALTest::RaceInstallFlushResultsWithWalObsoletion:BgFlush2");
+        }
+      });
+  SyncPoint::GetInstance()->EnableProcessing();
+
+  ASSERT_OK(dbfull()->ContinueBackgroundWork());
+
+  ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable(handles_[0]));
+  ASSERT_OK(dbfull()->TEST_WaitForFlushMemTable(handles_[1]));
+
+  ASSERT_TRUE(called);
+
+  Close();
+
+  SyncPoint::GetInstance()->DisableProcessing();
+  SyncPoint::GetInstance()->ClearAllCallBacks();
+
+  DB* db1 = nullptr;
+  Status s = DB::OpenForReadOnly(options, dbname_, &db1);
+  ASSERT_OK(s);
+  assert(db1);
+  delete db1;
+}
+
 // Test scope:
 // - We expect to open data store under all circumstances
 // - We expect only data upto the point where the first error was encountered
@@ -1502,12 +1579,9 @@ TEST_P(DBWALTestWithParams, kPointInTimeRecovery) {
  // Corruption offset position
  int corrupt_offset = std::get<1>(GetParam());
  int wal_file_id = std::get<2>(GetParam());  // WAL file
-  // WAL compression type
-  CompressionType compression_type = std::get<3>(GetParam());

  // Fill data for testing
  Options options = CurrentOptions();
-  options.wal_compression = compression_type;
  const size_t row_count = RecoveryTestHelper::FillData(this, &options);

  // Corrupt the wal
@@ -1556,12 +1630,9 @@ TEST_P(DBWALTestWithParams, kSkipAnyCorruptedRecords) {
  // Corruption offset position
  int corrupt_offset = std::get<1>(GetParam());
  int wal_file_id = std::get<2>(GetParam());  // WAL file
-  // WAL compression type
-  CompressionType compression_type = std::get<3>(GetParam());

  // Fill data for testing
  Options options = CurrentOptions();
-  options.wal_compression = compression_type;
  const size_t row_count = RecoveryTestHelper::FillData(this, &options);

  // Corrupt the WAL
@@ -1785,11 +1856,8 @@ TEST_P(DBWALTestWithParamsVaryingRecoveryMode,
  int corrupt_offset = std::get<1>(GetParam());
  int wal_file_id = std::get<2>(GetParam());  // WAL file
  WALRecoveryMode recovery_mode = std::get<3>(GetParam());
-  // WAL compression type
-  CompressionType compression_type = std::get<4>(GetParam());

  options.wal_recovery_mode = recovery_mode;
-  options.wal_compression = compression_type;
  // Create corrupted WAL
  RecoveryTestHelper::FillData(this, &options);
  RecoveryTestHelper::CorruptWAL(this, options, corrupt_offset * .3,
@@ -54,7 +54,7 @@ TEST_F(TimestampCompatibleCompactionTest, UserKeyCrossFileBoundary) {
  Options options = CurrentOptions();
  options.env = env_;
  options.compaction_style = kCompactionStyleLevel;
-  options.comparator = test::BytewiseComparatorWithU64TsWrapper();
+  options.comparator = test::ComparatorWithU64Ts();
  options.level0_file_num_compaction_trigger = 3;
  constexpr size_t kNumKeysPerFile = 101;
  options.memtable_factory.reset(
@@ -78,8 +78,9 @@ TEST_F(TimestampCompatibleCompactionTest, UserKeyCrossFileBoundary) {
  WriteOptions write_opts;
  for (; key < kNumKeysPerFile - 1; ++key, ++ts) {
    std::string ts_str = Timestamp(ts);
-    ASSERT_OK(
-        db_->Put(write_opts, Key1(key), ts_str, "foo_" + std::to_string(key)));
+    Slice ts_slice = ts_str;
+    write_opts.timestamp = &ts_slice;
+    ASSERT_OK(db_->Put(write_opts, Key1(key), "foo_" + std::to_string(key)));
  }
  // Write another L0 with keys 99 with newer ts.
  ASSERT_OK(Flush());
@@ -87,16 +88,18 @@ TEST_F(TimestampCompatibleCompactionTest, UserKeyCrossFileBoundary) {
  key = 99;
  for (int i = 0; i < 4; ++i, ++ts) {
    std::string ts_str = Timestamp(ts);
-    ASSERT_OK(
-        db_->Put(write_opts, Key1(key), ts_str, "bar_" + std::to_string(key)));
+    Slice ts_slice = ts_str;
+    write_opts.timestamp = &ts_slice;
+    ASSERT_OK(db_->Put(write_opts, Key1(key), "bar_" + std::to_string(key)));
  }
  ASSERT_OK(Flush());
  uint64_t saved_read_ts2 = ts++;
  // Write another L0 with keys 99, 100, 101, ..., 150
  for (; key <= 150; ++key, ++ts) {
    std::string ts_str = Timestamp(ts);
-    ASSERT_OK(
-        db_->Put(write_opts, Key1(key), ts_str, "foo1_" + std::to_string(key)));
+    Slice ts_slice = ts_str;
+    write_opts.timestamp = &ts_slice;
+    ASSERT_OK(db_->Put(write_opts, Key1(key), "foo1_" + std::to_string(key)));
  }
  ASSERT_OK(Flush());
  // Wait for compaction to finish
@@ -191,15 +191,14 @@ inline Slice ExtractUserKey(const Slice& internal_key) {

 inline Slice ExtractUserKeyAndStripTimestamp(const Slice& internal_key,
                                             size_t ts_sz) {
-  Slice ret = internal_key;
-  ret.remove_suffix(kNumInternalBytes + ts_sz);
-  return ret;
+  assert(internal_key.size() >= kNumInternalBytes + ts_sz);
+  return Slice(internal_key.data(),
+               internal_key.size() - kNumInternalBytes - ts_sz);
 }

 inline Slice StripTimestampFromUserKey(const Slice& user_key, size_t ts_sz) {
-  Slice ret = user_key;
-  ret.remove_suffix(ts_sz);
-  return ret;
+  assert(user_key.size() >= ts_sz);
+  return Slice(user_key.data(), user_key.size() - ts_sz);
 }

 inline Slice ExtractTimestampFromUserKey(const Slice& user_key, size_t ts_sz) {
@@ -207,13 +206,6 @@ inline Slice ExtractTimestampFromUserKey(const Slice& user_key, size_t ts_sz) {
  return Slice(user_key.data() + user_key.size() - ts_sz, ts_sz);
 }

-inline Slice ExtractTimestampFromKey(const Slice& internal_key, size_t ts_sz) {
-  const size_t key_size = internal_key.size();
-  assert(key_size >= kNumInternalBytes + ts_sz);
-  return Slice(internal_key.data() + key_size - ts_sz - kNumInternalBytes,
-               ts_sz);
-}
-
 inline uint64_t ExtractInternalKeyFooter(const Slice& internal_key) {
  assert(internal_key.size() >= kNumInternalBytes);
  const size_t n = internal_key.size();
@@ -9,7 +9,6 @@
 #include "db/event_helpers.h"
 #include "file/sst_file_manager_impl.h"
 #include "logging/logging.h"
-#include "port/lang.h"

 namespace ROCKSDB_NAMESPACE {

@@ -252,8 +251,6 @@ void ErrorHandler::CancelErrorRecovery() {
 #endif
 }

-STATIC_AVOID_DESTRUCTION(const Status, kOkStatus){Status::OK()};
-
 // This is the main function for looking at an error during a background
 // operation and deciding the severity, and error recovery strategy. The high
 // level algorithm is as follows -
@@ -272,11 +269,11 @@ STATIC_AVOID_DESTRUCTION(const Status, kOkStatus){Status::OK()};
 // This can also get called as part of a recovery operation. In that case, we
 // also track the error separately in recovery_error_ so we can tell in the
 // end whether recovery succeeded or not
-const Status& ErrorHandler::HandleKnownErrors(const Status& bg_err,
-                                              BackgroundErrorReason reason) {
+const Status& ErrorHandler::SetBGError(const Status& bg_err,
+                                       BackgroundErrorReason reason) {
  db_mutex_->AssertHeld();
  if (bg_err.ok()) {
-    return kOkStatus;
+    return bg_err;
  }

  if (bg_error_stats_ != nullptr) {
@@ -382,14 +379,11 @@ const Status& ErrorHandler::HandleKnownErrors(const Status& bg_err,
 //    c) all other errors are mapped to hard error.
 // 3) for other cases, SetBGError(const Status& bg_err, BackgroundErrorReason
 //    reason) will be called to handle other error cases.
-const Status& ErrorHandler::SetBGError(const Status& bg_status,
+const Status& ErrorHandler::SetBGError(const IOStatus& bg_io_err,
                                       BackgroundErrorReason reason) {
  db_mutex_->AssertHeld();
-  Status tmp_status = bg_status;
-  IOStatus bg_io_err = status_to_io_status(std::move(tmp_status));
-
  if (bg_io_err.ok()) {
-    return kOkStatus;
+    return bg_io_err;
  }
  ROCKS_LOG_WARN(db_options_.info_log, "Background IO error %s",
                 bg_io_err.ToString().c_str());
@@ -486,11 +480,7 @@ const Status& ErrorHandler::SetBGError(const Status& bg_status,
    if (bg_error_stats_ != nullptr) {
      RecordTick(bg_error_stats_.get(), ERROR_HANDLER_BG_IO_ERROR_COUNT);
    }
-    // HandleKnownErrors() will use recovery_error_, so ignore
-    // recovery_io_error_.
-    // TODO: Do some refactoring and use only one recovery_error_
-    recovery_io_error_.PermitUncheckedError();
-    return HandleKnownErrors(new_bg_io_err, reason);
+    return SetBGError(new_bg_io_err, reason);
  }
 }

@@ -635,7 +625,7 @@ const Status& ErrorHandler::StartRecoverFromRetryableBGIOError(
  if (bg_error_.ok()) {
    return bg_error_;
  } else if (io_error.ok()) {
-    return kOkStatus;
+    return io_error;
  } 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_;
@@ -53,6 +53,9 @@ class ErrorHandler {

   const Status& SetBGError(const Status& bg_err, BackgroundErrorReason reason);

+   const Status& SetBGError(const IOStatus& bg_io_err,
+                            BackgroundErrorReason reason);
+
   Status GetBGError() const { return bg_error_; }

   Status GetRecoveryError() const { return recovery_error_; }
@@ -109,8 +112,6 @@ class ErrorHandler {
    // The pointer of DB statistics.
    std::shared_ptr<Statistics> bg_error_stats_;

-    const Status& HandleKnownErrors(const Status& bg_err,
-                                    BackgroundErrorReason reason);
    Status OverrideNoSpaceError(const Status& bg_error, bool* auto_recovery);
    void RecoverFromNoSpace();
    const Status& StartRecoverFromRetryableBGIOError(const IOStatus& io_error);
@@ -2468,210 +2468,6 @@ TEST_F(DBErrorHandlingFSTest, FLushWritRetryableErrorAbortRecovery) {
  Destroy(options);
 }

-TEST_F(DBErrorHandlingFSTest, FlushReadError) {
-  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.statistics = CreateDBStatistics();
-  Status s;
-
-  listener->EnableAutoRecovery(false);
-  DestroyAndReopen(options);
-
-  ASSERT_OK(Put(Key(0), "val"));
-  SyncPoint::GetInstance()->SetCallBack(
-      "BuildTable:BeforeOutputValidation", [&](void*) {
-        IOStatus st = IOStatus::IOError();
-        st.SetRetryable(true);
-        st.SetScope(IOStatus::IOErrorScope::kIOErrorScopeFile);
-        fault_fs_->SetFilesystemActive(false, st);
-      });
-  SyncPoint::GetInstance()->SetCallBack(
-      "BuildTable:BeforeDeleteFile",
-      [&](void*) { fault_fs_->SetFilesystemActive(true, IOStatus::OK()); });
-  SyncPoint::GetInstance()->EnableProcessing();
-  s = Flush();
-  ASSERT_EQ(s.severity(), ROCKSDB_NAMESPACE::Status::Severity::kSoftError);
-  SyncPoint::GetInstance()->DisableProcessing();
-  fault_fs_->SetFilesystemActive(true);
-  ASSERT_EQ(listener->WaitForRecovery(5000000), true);
-  ASSERT_EQ(1, options.statistics->getAndResetTickerCount(
-                   ERROR_HANDLER_BG_ERROR_COUNT));
-  ASSERT_EQ(1, options.statistics->getAndResetTickerCount(
-                   ERROR_HANDLER_BG_IO_ERROR_COUNT));
-  ASSERT_EQ(1, options.statistics->getAndResetTickerCount(
-                   ERROR_HANDLER_BG_RETRYABLE_IO_ERROR_COUNT));
-  ASSERT_LE(1, options.statistics->getAndResetTickerCount(
-                   ERROR_HANDLER_AUTORESUME_COUNT));
-  ASSERT_LE(0, options.statistics->getAndResetTickerCount(
-                   ERROR_HANDLER_AUTORESUME_RETRY_TOTAL_COUNT));
-  s = dbfull()->TEST_GetBGError();
-  ASSERT_OK(s);
-
-  Reopen(GetDefaultOptions());
-  ASSERT_EQ("val", Get(Key(0)));
-}
-
-TEST_F(DBErrorHandlingFSTest, AtomicFlushReadError) {
-  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.statistics = CreateDBStatistics();
-  Status s;
-
-  listener->EnableAutoRecovery(false);
-  options.atomic_flush = true;
-  CreateAndReopenWithCF({"pikachu"}, options);
-
-  ASSERT_OK(Put(0, Key(0), "val"));
-  ASSERT_OK(Put(1, Key(0), "val"));
-  SyncPoint::GetInstance()->SetCallBack(
-      "BuildTable:BeforeOutputValidation", [&](void*) {
-        IOStatus st = IOStatus::IOError();
-        st.SetRetryable(true);
-        st.SetScope(IOStatus::IOErrorScope::kIOErrorScopeFile);
-        fault_fs_->SetFilesystemActive(false, st);
-      });
-  SyncPoint::GetInstance()->SetCallBack(
-      "BuildTable:BeforeDeleteFile",
-      [&](void*) { fault_fs_->SetFilesystemActive(true, IOStatus::OK()); });
-  SyncPoint::GetInstance()->EnableProcessing();
-  s = Flush({0, 1});
-  ASSERT_EQ(s.severity(), ROCKSDB_NAMESPACE::Status::Severity::kSoftError);
-  SyncPoint::GetInstance()->DisableProcessing();
-  fault_fs_->SetFilesystemActive(true);
-  ASSERT_EQ(listener->WaitForRecovery(5000000), true);
-  ASSERT_EQ(1, options.statistics->getAndResetTickerCount(
-                   ERROR_HANDLER_BG_ERROR_COUNT));
-  ASSERT_EQ(1, options.statistics->getAndResetTickerCount(
-                   ERROR_HANDLER_BG_IO_ERROR_COUNT));
-  ASSERT_EQ(1, options.statistics->getAndResetTickerCount(
-                   ERROR_HANDLER_BG_RETRYABLE_IO_ERROR_COUNT));
-  ASSERT_LE(1, options.statistics->getAndResetTickerCount(
-                   ERROR_HANDLER_AUTORESUME_COUNT));
-  ASSERT_LE(0, options.statistics->getAndResetTickerCount(
-                   ERROR_HANDLER_AUTORESUME_RETRY_TOTAL_COUNT));
-  s = dbfull()->TEST_GetBGError();
-  ASSERT_OK(s);
-
-  TryReopenWithColumnFamilies({kDefaultColumnFamilyName, "pikachu"},
-                              GetDefaultOptions());
-  ASSERT_EQ("val", Get(Key(0)));
-}
-
-TEST_F(DBErrorHandlingFSTest, AtomicFlushNoSpaceError) {
-  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.statistics = CreateDBStatistics();
-  Status s;
-
-  listener->EnableAutoRecovery(true);
-  options.atomic_flush = true;
-  CreateAndReopenWithCF({"pikachu"}, options);
-
-  ASSERT_OK(Put(0, Key(0), "val"));
-  ASSERT_OK(Put(1, Key(0), "val"));
-  SyncPoint::GetInstance()->SetCallBack("BuildTable:create_file", [&](void*) {
-    IOStatus st = IOStatus::NoSpace();
-    fault_fs_->SetFilesystemActive(false, st);
-  });
-  SyncPoint::GetInstance()->SetCallBack(
-      "BuildTable:BeforeDeleteFile",
-      [&](void*) { fault_fs_->SetFilesystemActive(true, IOStatus::OK()); });
-  SyncPoint::GetInstance()->EnableProcessing();
-  s = Flush({0, 1});
-  ASSERT_EQ(s.severity(), ROCKSDB_NAMESPACE::Status::Severity::kHardError);
-  SyncPoint::GetInstance()->DisableProcessing();
-  fault_fs_->SetFilesystemActive(true);
-  ASSERT_EQ(listener->WaitForRecovery(5000000), true);
-  ASSERT_LE(1, options.statistics->getAndResetTickerCount(
-                   ERROR_HANDLER_BG_ERROR_COUNT));
-  ASSERT_LE(1, options.statistics->getAndResetTickerCount(
-                   ERROR_HANDLER_BG_IO_ERROR_COUNT));
-  s = dbfull()->TEST_GetBGError();
-  ASSERT_OK(s);
-
-  TryReopenWithColumnFamilies({kDefaultColumnFamilyName, "pikachu"},
-                              GetDefaultOptions());
-  ASSERT_EQ("val", Get(Key(0)));
-}
-
-TEST_F(DBErrorHandlingFSTest, CompactionReadRetryableErrorAutoRecover) {
-  // In this test, in the first round of compaction, the FS is set to error.
-  // So the first compaction fails due to retryable IO error and it is mapped
-  // to soft error. Then, compaction is rescheduled, in the second round of
-  // 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>();
-  Options options = GetDefaultOptions();
-  options.env = fault_env_.get();
-  options.create_if_missing = true;
-  options.level0_file_num_compaction_trigger = 2;
-  options.listeners.emplace_back(listener);
-  BlockBasedTableOptions table_options;
-  table_options.no_block_cache = true;
-  options.table_factory.reset(NewBlockBasedTableFactory(table_options));
-  Status s;
-  std::atomic<bool> fail_first(false);
-  std::atomic<bool> fail_second(true);
-  Random rnd(301);
-  DestroyAndReopen(options);
-
-  IOStatus error_msg = IOStatus::IOError("Retryable IO Error");
-  error_msg.SetRetryable(true);
-
-  for (int i = 0; i < 100; ++i) {
-    ASSERT_OK(Put(Key(i), rnd.RandomString(1024)));
-  }
-  s = Flush();
-  ASSERT_OK(s);
-
-  listener->OverrideBGError(Status(error_msg, Status::Severity::kHardError));
-  listener->EnableAutoRecovery(false);
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->LoadDependency(
-      {{"DBImpl::FlushMemTable:FlushMemTableFinished",
-        "BackgroundCallCompaction:0"},
-       {"CompactionJob::FinishCompactionOutputFile1",
-        "CompactionWriteRetryableErrorAutoRecover0"}});
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
-      "DBImpl::BackgroundCompaction:Start",
-      [&](void*) { fault_fs_->SetFilesystemActive(true); });
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
-      "BackgroundCallCompaction:0", [&](void*) { fail_first.store(true); });
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->SetCallBack(
-      "CompactionJob::Run():PausingManualCompaction:2", [&](void*) {
-        if (fail_first.load() && fail_second.load()) {
-          fault_fs_->SetFilesystemActive(false, error_msg);
-          fail_second.store(false);
-        }
-      });
-  ROCKSDB_NAMESPACE::SyncPoint::GetInstance()->EnableProcessing();
-
-  ASSERT_OK(Put(Key(1), "val"));
-  s = Flush();
-  ASSERT_OK(s);
-
-  s = dbfull()->TEST_WaitForCompact();
-  ASSERT_OK(s);
-  TEST_SYNC_POINT("CompactionWriteRetryableErrorAutoRecover0");
-  SyncPoint::GetInstance()->ClearAllCallBacks();
-  SyncPoint::GetInstance()->DisableProcessing();
-
-  Reopen(GetDefaultOptions());
-}
-
 class DBErrorHandlingFencingTest : public DBErrorHandlingFSTest,
                                   public testing::WithParamInterface<bool> {};

@@ -95,8 +95,9 @@ void EventHelpers::LogAndNotifyTableFileCreationFinished(
    jwriter << "cf_name" << cf_name << "job" << job_id << "event"
            << "table_file_creation"
            << "file_number" << fd.GetNumber() << "file_size"
-            << fd.GetFileSize() << "file_checksum" << file_checksum
-            << "file_checksum_func_name" << file_checksum_func_name;
+            << fd.GetFileSize() << "file_checksum"
+            << Slice(file_checksum).ToString(true) << "file_checksum_func_name"
+            << file_checksum_func_name;

    // table_properties
    {
@@ -6,8 +6,6 @@
 #include "rocksdb/experimental.h"

 #include "db/db_impl/db_impl.h"
-#include "db/version_util.h"
-#include "logging/logging.h"

 namespace ROCKSDB_NAMESPACE {
 namespace experimental {
@@ -48,103 +46,5 @@ Status SuggestCompactRange(DB* db, const Slice* begin, const Slice* end) {
  return SuggestCompactRange(db, db->DefaultColumnFamily(), begin, end);
 }

-Status UpdateManifestForFilesState(
-    const DBOptions& db_opts, const std::string& db_name,
-    const std::vector<ColumnFamilyDescriptor>& column_families,
-    const UpdateManifestForFilesStateOptions& opts) {
-  OfflineManifestWriter w(db_opts, db_name);
-  Status s = w.Recover(column_families);
-
-  size_t files_updated = 0;
-  size_t cfs_updated = 0;
-  auto fs = db_opts.env->GetFileSystem();
-
-  for (auto cfd : *w.Versions().GetColumnFamilySet()) {
-    if (!s.ok()) {
-      break;
-    }
-    assert(cfd);
-
-    if (cfd->IsDropped() || !cfd->initialized()) {
-      continue;
-    }
-
-    const auto* current = cfd->current();
-    assert(current);
-
-    const auto* vstorage = current->storage_info();
-    assert(vstorage);
-
-    VersionEdit edit;
-    edit.SetColumnFamily(cfd->GetID());
-
-    /* SST files */
-    for (int level = 0; level < cfd->NumberLevels(); level++) {
-      if (!s.ok()) {
-        break;
-      }
-      const auto& level_files = vstorage->LevelFiles(level);
-
-      for (const auto& lf : level_files) {
-        assert(lf);
-
-        uint64_t number = lf->fd.GetNumber();
-        std::string fname =
-            TableFileName(w.IOptions().db_paths, number, lf->fd.GetPathId());
-
-        std::unique_ptr<FSSequentialFile> f;
-        FileOptions fopts;
-        fopts.temperature = lf->temperature;
-
-        IOStatus file_ios =
-            fs->NewSequentialFile(fname, fopts, &f, /*dbg*/ nullptr);
-        if (file_ios.ok()) {
-          if (opts.update_temperatures) {
-            Temperature temp = f->GetTemperature();
-            if (temp != Temperature::kUnknown && temp != lf->temperature) {
-              // Current state inconsistent with manifest
-              ++files_updated;
-              edit.DeleteFile(level, number);
-              edit.AddFile(level, number, lf->fd.GetPathId(),
-                           lf->fd.GetFileSize(), lf->smallest, lf->largest,
-                           lf->fd.smallest_seqno, lf->fd.largest_seqno,
-                           lf->marked_for_compaction, temp,
-                           lf->oldest_blob_file_number,
-                           lf->oldest_ancester_time, lf->file_creation_time,
-                           lf->file_checksum, lf->file_checksum_func_name,
-                           lf->min_timestamp, lf->max_timestamp);
-            }
-          }
-        } else {
-          s = file_ios;
-          break;
-        }
-      }
-    }
-
-    if (s.ok() && edit.NumEntries() > 0) {
-      s = w.LogAndApply(cfd, &edit);
-      if (s.ok()) {
-        ++cfs_updated;
-      }
-    }
-  }
-
-  if (cfs_updated > 0) {
-    ROCKS_LOG_INFO(db_opts.info_log,
-                   "UpdateManifestForFilesState: updated %zu files in %zu CFs",
-                   files_updated, cfs_updated);
-  } else if (s.ok()) {
-    ROCKS_LOG_INFO(db_opts.info_log,
-                   "UpdateManifestForFilesState: no updates needed");
-  }
-  if (!s.ok()) {
-    ROCKS_LOG_ERROR(db_opts.info_log, "UpdateManifestForFilesState failed: %s",
-                    s.ToString().c_str());
-  }
-
-  return s;
-}
-
 }  // namespace experimental
 }  // namespace ROCKSDB_NAMESPACE
@@ -151,9 +151,8 @@ Status ExternalSstFileIngestionJob::Prepare(
      TEST_SYNC_POINT_CALLBACK("ExternalSstFileIngestionJob::Prepare:CopyFile",
                               nullptr);
      // CopyFile also sync the new file.
-      status =
-          CopyFile(fs_.get(), path_outside_db, path_inside_db, 0,
-                   db_options_.use_fsync, io_tracer_, Temperature::kUnknown);
+      status = CopyFile(fs_.get(), path_outside_db, path_inside_db, 0,
+                        db_options_.use_fsync, io_tracer_);
    }
    TEST_SYNC_POINT("ExternalSstFileIngestionJob::Prepare:FileAdded");
    if (!status.ok()) {
@@ -213,8 +212,6 @@ Status ExternalSstFileIngestionJob::Prepare(
        std::string generated_checksum;
        std::string generated_checksum_func_name;
        std::string requested_checksum_func_name;
-        // TODO: rate limit file reads for checksum calculation during file
-        // ingestion.
        IOStatus io_s = GenerateOneFileChecksum(
            fs_.get(), files_to_ingest_[i].internal_file_path,
            db_options_.file_checksum_gen_factory.get(),
@@ -222,8 +219,7 @@ Status ExternalSstFileIngestionJob::Prepare(
            &generated_checksum_func_name,
            ingestion_options_.verify_checksums_readahead_size,
            db_options_.allow_mmap_reads, io_tracer_,
-            db_options_.rate_limiter.get(),
-            Env::IO_TOTAL /* rate_limiter_priority */);
+            db_options_.rate_limiter.get());
        if (!io_s.ok()) {
          status = io_s;
          ROCKS_LOG_WARN(db_options_.info_log,
@@ -912,14 +908,12 @@ IOStatus ExternalSstFileIngestionJob::GenerateChecksumForIngestedFile(
  std::string file_checksum;
  std::string file_checksum_func_name;
  std::string requested_checksum_func_name;
-  // TODO: rate limit file reads for checksum calculation during file ingestion.
  IOStatus io_s = GenerateOneFileChecksum(
      fs_.get(), file_to_ingest->internal_file_path,
      db_options_.file_checksum_gen_factory.get(), requested_checksum_func_name,
      &file_checksum, &file_checksum_func_name,
      ingestion_options_.verify_checksums_readahead_size,
-      db_options_.allow_mmap_reads, io_tracer_, db_options_.rate_limiter.get(),
-      Env::IO_TOTAL /* rate_limiter_priority */);
+      db_options_.allow_mmap_reads, io_tracer_, db_options_.rate_limiter.get());
  if (!io_s.ok()) {
    return io_s;
  }
@@ -136,6 +136,7 @@ FlushJob::FlushJob(
 }

 FlushJob::~FlushJob() {
+  io_status_.PermitUncheckedError();
  ThreadStatusUtil::ResetThreadStatus();
 }

@@ -169,20 +170,8 @@ void FlushJob::PickMemTable() {
  db_mutex_->AssertHeld();
  assert(!pick_memtable_called);
  pick_memtable_called = true;
-
-  // Maximum "NextLogNumber" of the memtables to flush.
-  // When mempurge feature is turned off, this variable is useless
-  // because the memtables are implicitly sorted by increasing order of creation
-  // time. Therefore mems_->back()->GetNextLogNumber() is already equal to
-  // max_next_log_number. However when Mempurge is on, the memtables are no
-  // longer sorted by increasing order of creation time. Therefore this variable
-  // becomes necessary because mems_->back()->GetNextLogNumber() is no longer
-  // necessarily equal to max_next_log_number.
-  uint64_t max_next_log_number = 0;
-
  // Save the contents of the earliest memtable as a new Table
-  cfd_->imm()->PickMemtablesToFlush(max_memtable_id_, &mems_,
-                                    &max_next_log_number);
+  cfd_->imm()->PickMemtablesToFlush(max_memtable_id_, &mems_);
  if (mems_.empty()) {
    return;
  }
@@ -197,7 +186,7 @@ void FlushJob::PickMemTable() {
  edit_->SetPrevLogNumber(0);
  // SetLogNumber(log_num) indicates logs with number smaller than log_num
  // will no longer be picked up for recovery.
-  edit_->SetLogNumber(max_next_log_number);
+  edit_->SetLogNumber(mems_.back()->GetNextLogNumber());
  edit_->SetColumnFamily(cfd_->GetID());

  // path 0 for level 0 file.
@@ -289,13 +278,17 @@ Status FlushJob::Run(LogsWithPrepTracker* prep_tracker, FileMetaData* file_meta,
  } else if (write_manifest_) {
    TEST_SYNC_POINT("FlushJob::InstallResults");
    // Replace immutable memtable with the generated Table
+    IOStatus tmp_io_s;
    s = cfd_->imm()->TryInstallMemtableFlushResults(
        cfd_, mutable_cf_options_, mems_, prep_tracker, versions_, db_mutex_,
        meta_.fd.GetNumber(), &job_context_->memtables_to_free, db_directory_,
-        log_buffer_, &committed_flush_jobs_info_,
+        log_buffer_, &committed_flush_jobs_info_, &tmp_io_s,
        !(mempurge_s.ok()) /* write_edit : true if no mempurge happened (or if aborted),
                              but 'false' if mempurge successful: no new min log number
                              or new level 0 file path to write to manifest. */);
+    if (!tmp_io_s.ok()) {
+      io_status_ = tmp_io_s;
+    }
  }

  if (s.ok() && file_meta != nullptr) {
@@ -319,11 +312,8 @@ Status FlushJob::Run(LogsWithPrepTracker* prep_tracker, FileMetaData* file_meta,

  const auto& blob_files = vstorage->GetBlobFiles();
  if (!blob_files.empty()) {
-    assert(blob_files.front());
-    stream << "blob_file_head" << blob_files.front()->GetBlobFileNumber();
-
-    assert(blob_files.back());
-    stream << "blob_file_tail" << blob_files.back()->GetBlobFileNumber();
+    stream << "blob_file_head" << blob_files.begin()->first;
+    stream << "blob_file_tail" << blob_files.rbegin()->first;
  }

  stream << "immutable_memtables" << cfd_->imm()->NumNotFlushed();
@@ -576,7 +566,6 @@ Status FlushJob::MemPurge() {
        uint64_t new_mem_id = mems_[0]->GetID();

        new_mem->SetID(new_mem_id);
-        new_mem->SetNextLogNumber(mems_[0]->GetNextLogNumber());

        // This addition will not trigger another flush, because
        // we do not call SchedulePendingFlush().
@@ -823,12 +812,6 @@ Status FlushJob::WriteLevel0Table() {
    uint64_t total_num_entries = 0, total_num_deletes = 0;
    uint64_t total_data_size = 0;
    size_t total_memory_usage = 0;
-    // Used for testing:
-    uint64_t mems_size = mems_.size();
-    (void)mems_size;  // avoids unused variable error when
-                      // TEST_SYNC_POINT_CALLBACK not used.
-    TEST_SYNC_POINT_CALLBACK("FlushJob::WriteLevel0Table:num_memtables",
-                             &mems_size);
    for (MemTable* m : mems_) {
      ROCKS_LOG_INFO(
          db_options_.info_log,
@@ -921,9 +904,9 @@ Status FlushJob::WriteLevel0Table() {
          job_context_->job_id, Env::IO_HIGH, &table_properties_, write_hint,
          full_history_ts_low, blob_callback_, &num_input_entries,
          &memtable_payload_bytes, &memtable_garbage_bytes);
-      // TODO: Cleanup io_status in BuildTable and table builders
-      assert(!s.ok() || io_s.ok());
-      io_s.PermitUncheckedError();
+      if (!io_s.ok()) {
+        io_status_ = io_s;
+      }
      if (num_input_entries != total_num_entries && s.ok()) {
        std::string msg = "Expected " + ToString(total_num_entries) +
                          " entries in memtables, but read " +
@@ -93,6 +93,9 @@ class FlushJob {
  }
 #endif  // !ROCKSDB_LITE

+  // Return the IO status
+  IOStatus io_status() const { return io_status_; }
+
 private:
  void ReportStartedFlush();
  void ReportFlushInputSize(const autovector<MemTable*>& mems);
@@ -181,6 +184,7 @@ class FlushJob {
  Version* base_;
  bool pick_memtable_called;
  Env::Priority thread_pri_;
+  IOStatus io_status_;

  const std::shared_ptr<IOTracer> io_tracer_;
  SystemClock* clock_;
@@ -530,7 +530,7 @@ class FlushJobTimestampTest : public FlushJobTestBase {
 public:
  FlushJobTimestampTest()
      : FlushJobTestBase(test::PerThreadDBPath("flush_job_ts_gc_test"),
-                         test::BytewiseComparatorWithU64TsWrapper()) {}
+                         test::ComparatorWithU64Ts()) {}

  void AddKeyValueToMemtable(MemTable* memtable, std::string key, uint64_t ts,
                             SequenceNumber seq, ValueType value_type,
--- a/Show More
+++ b/Show More